fix: Project explorer grab the focus unexpectedly (#525)

Author: jdneo

src/commands.ts

@@ -82,6 +82,8 @@ export namespace Commands {
 
     export const JAVA_RESOLVE_BUILD_FILES = "vscode.java.resolveBuildFiles";
 
+    export const JAVA_PROJECT_LIST_SOURCE_PATHS = "java.project.listSourcePaths";
+
     /**
      * Commands from Visual Studio Code
      */

src/constants.ts

@@ -24,3 +24,7 @@ export namespace Explorer {
 export namespace Build {
     export const FILE_NAMES: string[] = ["pom.xml", "build.gradle"];
 }
+
+export namespace ExtensionName {
+    export const JAVA_LANGUAGE_SUPPORT: string = "redhat.java";
+}

src/extension.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { ExtensionContext, tasks } from "vscode";
+import { Event, Extension, ExtensionContext, extensions, tasks, Uri } from "vscode";
 import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation, sendInfo } from "vscode-extension-telemetry-wrapper";
 import { contextManager } from "../extension.bundle";
-import { Build, Context } from "./constants";
+import { Build, Context, ExtensionName } from "./constants";
 import { LibraryController } from "./controllers/libraryController";
 import { ProjectController } from "./controllers/projectController";
 import { init as initExpService } from "./ExperimentationService";
@@ -31,6 +31,31 @@ async function activateExtension(_operationId: string, context: ExtensionContext
     context.subscriptions.push(contextManager);
     context.subscriptions.push(syncHandler);
     context.subscriptions.push(tasks.registerTaskProvider(ExportJarTaskProvider.exportJarType, new ExportJarTaskProvider()));
+
+    const javaLanguageSupport: Extension<any> | undefined = extensions.getExtension(ExtensionName.JAVA_LANGUAGE_SUPPORT);
+    if (!javaLanguageSupport) {
+        return;
+    }
+    javaLanguageSupport.activate().then(() => {
+        const extensionApi: any = javaLanguageSupport.exports;
+        if (!extensionApi) {
+            return;
+        }
+
+        if (extensionApi.onDidClasspathUpdate) {
+            const onDidClasspathUpdate: Event<Uri> = extensionApi.onDidClasspathUpdate;
+            context.subscriptions.push(onDidClasspathUpdate(async () => {
+                syncHandler.updateFileWatcher(Settings.autoRefresh());
+            }));
+        }
+
+        if (extensionApi.onDidServerModeChange) {
+            const onDidServerModeChange: Event<string> = extensionApi.onDidServerModeChange;
+            context.subscriptions.push(onDidServerModeChange(async () => {
+                syncHandler.updateFileWatcher(Settings.autoRefresh());
+            }));
+        }
+    });
 }
 
 // this method is called when your extension is deactivated

src/syncHandler.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as path from "path";
-import { commands, Disposable, FileSystemWatcher, Uri, workspace } from "vscode";
+import { commands, Disposable, FileSystemWatcher, RelativePattern, Uri, workspace } from "vscode";
 import { instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "./commands";
 import { NodeKind } from "./java/nodeData";
@@ -19,10 +19,11 @@ class SyncHandler implements Disposable {
     private disposables: Disposable[] = [];
 
     public updateFileWatcher(autoRefresh?: boolean): void {
+        this.dispose();
         if (autoRefresh) {
             instrumentOperation(ENABLE_AUTO_REFRESH, () => this.enableAutoRefresh())();
         } else {
-            instrumentOperation(DISABLE_AUTO_REFRESH, () => this.dispose())();
+            instrumentOperation(DISABLE_AUTO_REFRESH, () => {})();
         }
     }
 
@@ -40,9 +41,25 @@ class SyncHandler implements Disposable {
             this.refresh();
         }));
 
-        const fileSystemWatcher: FileSystemWatcher = workspace.createFileSystemWatcher("**/{*.java,src/**}");
-        this.setupWatchers(fileSystemWatcher);
-        this.disposables.push(fileSystemWatcher);
+        try {
+            const result: IListCommandResult | undefined = await commands.executeCommand<IListCommandResult>(Commands.EXECUTE_WORKSPACE_COMMAND,
+                Commands.JAVA_PROJECT_LIST_SOURCE_PATHS);
+            if (!result || !result.status || !result.data || result.data.length === 0) {
+                throw new Error("Failed to list the source paths");
+            }
+
+            for (const sourcePathData of result.data) {
+                const normalizedPath: string = Uri.file(sourcePathData.path).fsPath;
+                const pattern: RelativePattern = new RelativePattern(normalizedPath, "**/*");
+                const watcher: FileSystemWatcher = workspace.createFileSystemWatcher(pattern);
+                this.disposables.push(watcher);
+                this.setupWatchers(watcher);
+            }
+        } catch (e) {
+            const fileSystemWatcher: FileSystemWatcher = workspace.createFileSystemWatcher("**/{*.java,src/**}");
+            this.disposables.push(fileSystemWatcher);
+            this.setupWatchers(fileSystemWatcher);
+        }
     }
 
     private setupWatchers(watcher: FileSystemWatcher): void {
@@ -100,4 +117,17 @@ class SyncHandler implements Disposable {
     }
 }
 
+interface ISourcePath {
+    path: string;
+    displayPath: string;
+    projectName: string;
+    projectType: string;
+}
+
+interface IListCommandResult {
+    status: boolean;
+    message: string;
+    data?: ISourcePath[];
+}
+
 export const syncHandler: SyncHandler = new SyncHandler();

src/views/dependencyExplorer.ts

@@ -60,7 +60,7 @@ export class DependencyExplorer implements Disposable {
                 }
             }),
             this._dataProvider.onDidChangeTreeData(() => {
-                if (window.activeTextEditor) {
+                if (this._dependencyViewer.visible && window.activeTextEditor) {
                     this.reveal(window.activeTextEditor.document.uri);
                 }
             }),