Send refresh telemetry only if auto-refresh is off (#165)

Author: Flanker32

package-lock.json

@@ -158,7 +158,7 @@
     "compile": "tsc -watch -p ./",
     "watch": "webpack --mode development --watch --info-verbosity verbose",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-dependency-0.4.0.vsix && node ./scripts/run-vscode-tests",
+    "test": "node ./scripts/download-vscode-for-system-tests && node ./scripts/install-vsix-dependencies redhat.java && node ./scripts/install-vsix-dependencies vscode-java-dependency-0.5.0.vsix && node ./scripts/run-vscode-tests",
     "build-server": "./node_modules/.bin/gulp build_server",
     "vscode:prepublish": "tsc -p ./ && webpack --mode production"
   },

package.json

@@ -2,35 +2,48 @@
 // Licensed under the MIT license.
 
 import { commands, Disposable, FileSystemWatcher, workspace } from "vscode";
+import { instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "./commands";
 
 export class SyncHandler {
 
     public static updateFileWatcher(autoRefresh: boolean): void {
         if (autoRefresh) {
-            SyncHandler.javaFileContentWatcher = workspace.onDidChangeTextDocument((event) => {
-                if (event.document.languageId === "java") {
-                    SyncHandler.refresh();
-                }
-            });
-            SyncHandler.javaFileSystemWatcher = workspace.createFileSystemWatcher("**/*.{java}");
-            SyncHandler.javaFileSystemWatcher.onDidChange(SyncHandler.refresh);
-            SyncHandler.javaFileSystemWatcher.onDidCreate(SyncHandler.refresh);
-            SyncHandler.javaFileSystemWatcher.onDidDelete(SyncHandler.refresh);
+            instrumentOperation(SyncHandler.ENABLE_AUTO_REFRESH, () => this.enableAutoRefresh());
         } else {
-            if (SyncHandler.javaFileContentWatcher) {
-                SyncHandler.javaFileContentWatcher.dispose();
-            }
-            if (SyncHandler.javaFileSystemWatcher) {
-                SyncHandler.javaFileSystemWatcher.dispose();
-            }
+            instrumentOperation(SyncHandler.DISABLE_AUTO_REFRESH, () => this.disableAutoRefresh());
         }
     }
 
     private static javaFileContentWatcher: Disposable = null;
 
     private static javaFileSystemWatcher: FileSystemWatcher = null;
 
+    private static ENABLE_AUTO_REFRESH = "java.view.package.enableAutoRefresh";
+
+    private static DISABLE_AUTO_REFRESH = "java.view.package.disableAutoRefresh";
+
+    private static enableAutoRefresh() {
+        SyncHandler.javaFileContentWatcher = workspace.onDidChangeTextDocument((event) => {
+            if (event.document.languageId === "java") {
+                SyncHandler.refresh();
+            }
+        });
+        SyncHandler.javaFileSystemWatcher = workspace.createFileSystemWatcher("**/*.{java}");
+        SyncHandler.javaFileSystemWatcher.onDidChange(SyncHandler.refresh);
+        SyncHandler.javaFileSystemWatcher.onDidCreate(SyncHandler.refresh);
+        SyncHandler.javaFileSystemWatcher.onDidDelete(SyncHandler.refresh);
+    }
+
+    private static disableAutoRefresh() {
+        if (SyncHandler.javaFileContentWatcher) {
+            SyncHandler.javaFileContentWatcher.dispose();
+        }
+        if (SyncHandler.javaFileSystemWatcher) {
+            SyncHandler.javaFileSystemWatcher.dispose();
+        }
+    }
+
     private static refresh(): void {
         commands.executeCommand(Commands.VIEW_PACKAGE_REFRESH);
     }

src/fileWather.ts

@@ -9,6 +9,7 @@ import { instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
 import { Jdtls } from "../java/jdtls";
 import { INodeData, NodeKind } from "../java/nodeData";
+import { Settings } from "../settings";
 import { DataNode } from "./dataNode";
 import { ExplorerNode } from "./explorerNode";
 import { ProjectNode } from "./projectNode";
@@ -24,14 +25,21 @@ export class DependencyDataProvider implements TreeDataProvider<ExplorerNode> {
     private _rootItems: ExplorerNode[] = null;
 
     constructor(public readonly context: ExtensionContext) {
-        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_REFRESH,
-            instrumentOperation(Commands.VIEW_PACKAGE_REFRESH, () => this.refresh())));
+        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_REFRESH, () => this.refreshWithLog()));
         context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OPEN_FILE,
             instrumentOperation(Commands.VIEW_PACKAGE_OPEN_FILE, (_operationId, uri) => this.openFile(uri))));
         context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OUTLINE,
             instrumentOperation(Commands.VIEW_PACKAGE_OUTLINE, (_operationId, uri, range) => this.goToOutline(uri, range))));
     }
 
+    public refreshWithLog() {
+        if (Settings.autoRefresh()) {
+            this.refresh();
+        } else {
+            instrumentOperation(Commands.VIEW_PACKAGE_REFRESH, () => this.refresh())();
+        }
+    }
+
     public refresh() {
         this._rootItems = null;
         this._onDidChangeTreeData.fire();