Add enable disable command

client/src/extension.ts

@@ -1,5 +1,6 @@
 import * as path from "path";
 import { promises as fs } from "fs";
+import glob from "glob";
 
 import {
  workspace,
@@ -113,6 +114,9 @@ export class Extension {
  },
  executablePath: "",
  };
+
+ private enable = false;
+
  // get configuration of Deno
  public getConfiguration(uri?: Uri): ConfigurationField {
  const config: ConfigurationField = {};
@@ -324,14 +328,8 @@ export class Extension {
  this.statusBar.hide();
  return;
  }
-
- const uri = document.uri;
- const enabled = workspace
- .getConfiguration(this.configurationSection, uri)
- .get("enable");
-
  // if vscode-deno have been disable for workspace
- if (!enabled) {
+ if (!this.enable) {
  this.statusBar.hide();
  return;
  }
@@ -392,6 +390,34 @@ Executable ${this.denoInfo.executablePath}`;
  this.client.sendNotification(Notification.diagnostic, uri.toString());
  }
  }
+
+ private isPartOfProject(
+ config: ConfigurationField,
+ entry_path: string,
+ workspace_path?: string
+ ): boolean {
+ if (workspace_path === undefined) {
+ return false;
+ }
+
+ const includes =
+ config.include?.some((it) =>
+ glob
+ .sync(path.join(workspace_path, it))
+ .map((it) => path.normalize(it))
+ .includes(entry_path)
+ ) ?? true;
+
+ const excludes = !config.exclude?.some((it) =>
+ glob
+ .sync(path.join(workspace_path, it))
+ .map((it) => path.normalize(it))
+ .includes(entry_path)
+ );
+
+ return includes && excludes;
+ }
+
  private sync(document?: TextDocument) {
  if (document) {
  const relativeFilepath = workspace.asRelativePath(
@@ -404,12 +430,22 @@ Executable ${this.denoInfo.executablePath}`;
  ) {
  const config = this.getConfiguration(document.uri);
 
+ this.enable =
+ !!config.enable &&
+ this.isPartOfProject(
+ config,
+ document.uri.fsPath,
+ workspace.getWorkspaceFolder(document.uri)?.uri?.fsPath
+ );
+
  commands.executeCommand(
  "setContext",
  "denoExtensionActivated",
- !!config.enable
+ this.enable
  );
 
+ this.client?.sendNotification("_setEnable", this.enable);
+
  this.tsAPI.configurePlugin(TYPESCRIPT_DENO_PLUGIN_ID, config);
  this.updateDiagnostic(document.uri);
  }
@@ -478,6 +514,20 @@ Executable ${this.denoInfo.executablePath}`;
  await window.showInformationMessage(`Copied to clipboard.`);
  });
 
+ this.registerCommand("_enable_vscode_deno", async () => {
+ this.enable = true;
+ const config = workspace.getConfiguration(this.configurationSection);
+ await config.update("enable", true);
+ this.sync(window.activeTextEditor?.document);
+ });
+
+ this.registerCommand("_disable_vscode_deno", async () => {
+ this.enable = false;
+ const config = workspace.getConfiguration(this.configurationSection);
+ await config.update("enable", false);
+ this.sync(window.activeTextEditor?.document);
+ });
+
  this.registerQuickFix({
  _fetch_remote_module: async (editor, text) => {
  const config = this.getConfiguration(editor.document.uri);

core/configuration.test.ts

@@ -12,10 +12,10 @@ test("core / configuration / resolveFromVscode if it is a valid file", async ()
  configManager.resolveFromVscode(vscodeDir);
 
  expect(configManager.config).toEqual({
+ ...Configuration.defaultConfiguration,
  enable: true,
  unstable: true,
  import_map: "./import_map.json",
- lint: false,
  } as ConfigurationField);
 });
 
@@ -27,10 +27,8 @@ test("core / configuration / resolveFromVscode if valid section", async () => {
  configManager.resolveFromVscode(vscodeDir);
 
  expect(configManager.config).toEqual({
+ ...Configuration.defaultConfiguration,
  enable: true,
- unstable: false,
- import_map: null,
- lint: false,
  } as ConfigurationField);
 });
 
@@ -49,12 +47,7 @@ test("core / configuration / resolveFromVscode if config file is empty", async (
 
  configManager.resolveFromVscode(vscodeDir);
 
- expect(configManager.config).toEqual({
- enable: false,
- unstable: false,
- import_map: null,
- lint: false,
- } as ConfigurationField);
+ expect(configManager.config).toEqual(Configuration.defaultConfiguration);
 });
 
 test("core / configuration / resolveFromVscode if field is invalid", async () => {
@@ -65,10 +58,10 @@ test("core / configuration / resolveFromVscode if field is invalid", async () =>
  configManager.resolveFromVscode(vscodeDir);
 
  expect(configManager.config).toEqual({
+ ...Configuration.defaultConfiguration,
  enable: true,
  unstable: true,
  import_map: "1,2,3",
- lint: false,
  } as ConfigurationField);
 });
 
@@ -88,9 +81,7 @@ test("core / configuration / update", async () => {
  expect(hasTriggerListener).toBe(true);
 
  expect(configManager.config).toEqual({
+ ...Configuration.defaultConfiguration,
  enable: true,
- unstable: false,
- import_map: null,
- lint: false,
  } as ConfigurationField);
 });

core/configuration.ts

@@ -12,13 +12,17 @@ export const DenoPluginConfigurationField: (keyof ConfigurationField)[] = [
  "unstable",
  "import_map",
  "lint",
+ "include",
+ "exclude",
 ];
 
 export type ConfigurationField = {
  enable?: boolean;
  unstable?: boolean;
  import_map?: string | null;
  lint?: boolean;
+ include?: string[];
+ exclude?: string[];
 };
 
 interface ConfigurationInterface {
@@ -34,6 +38,8 @@ export class Configuration implements ConfigurationInterface {
  unstable: false,
  import_map: null,
  lint: false,
+ include: ["**/*.ts", "**/*.js", "**/*.tsx", "**/*.jsx", "**/*.mjs"],
+ exclude: [],
  };
 
  private readonly _configUpdatedListeners = new Set<() => void>();

package.json

@@ -59,6 +59,16 @@
  "command": "deno._clear_import_enhencement_cache",
  "title": "Clear import enhencement cache",
  "category": "deno"
+ },
+ {
+ "command": "deno._enable_vscode_deno",
+ "title": "Enable VSCode-Deno",
+ "category": "deno"
+ },
+ {
+ "command": "deno._disable_vscode_deno",
+ "title": "Disable VSCode-Deno",
+ "category": "deno"
  }
  ],
  "views": {
@@ -86,6 +96,14 @@
  {
  "command": "deno.restart_server",
  "when": "denoExtensionActivated"
+ },
+ {
+ "command": "deno._enable_vscode_deno",
+ "when": "!denoExtensionActivated"
+ },
+ {
+ "command": "deno._disable_vscode_deno",
+ "when": "denoExtensionActivated"
  }
  ]
  },
@@ -132,6 +150,38 @@
  true,
  false
  ]
+ },
+ "deno.include": {
+ "type": "array",
+ "default": [
+ "**/*.ts",
+ "**/*.js",
+ "**/*.tsx",
+ "**/*.jsx",
+ "**/*.mjs"
+ ],
+ "markdownDescription": "Controls which file/folder will inlucde in the project.",
+ "scope": "resource",
+ "examples": [
+ [
+ "**/*.ts",
+ "**/*.js",
+ "**/*.tsx",
+ "**/*.jsx",
+ "**/*.mjs"
+ ]
+ ]
+ },
+ "deno.exclude": {
+ "type": "array",
+ "default": [],
+ "markdownDescription": "Controls which file/folder will be exclude from the project.",
+ "scope": "resource",
+ "examples": [
+ [
+ "**/*.d.ts"
+ ]
+ ]
  }
  }
  },
@@ -184,11 +234,12 @@
  },
  "devDependencies": {
  "@types/deep-equal": "1.0.1",
+ "@types/glob": "^7.1.3",
  "@types/jest": "26.0.10",
  "@types/json5": "0.0.30",
  "@types/node": "14.6.2",
- "@types/which": "1.3.2",
  "@types/semver": "7.3.3",
+ "@types/which": "1.3.2",
  "@typescript-eslint/eslint-plugin": "3.10.1",
  "@typescript-eslint/parser": "3.10.1",
  "coveralls": "3.1.0",
@@ -204,6 +255,7 @@
  "dependencies": {
  "deep-equal": "2.0.3",
  "deepmerge": "^4.2.2",
+ "glob": "^7.1.6",
  "got": "^11.5.2",
  "json5": "^2.1.3",
  "semver": "7.3.2",

server/src/dependency_tree.ts

@@ -12,21 +12,33 @@ import { ImportMap } from "../../core/import_map";
 import { isHttpURL } from "../../core/util";
 import { Request } from "../../core/const";
 
+import Plugable from "./plugable";
+
 interface URLDep {
  filepath: string;
  location: { start: Position; end: Position };
 }
 
 type DependencyTreeMap = { [key: string]: URLDep[] };
 
-export class DependencyTree {
- constructor(connection: IConnection, private bridge: Bridge) {
+export class DependencyTree implements Plugable {
+ setEnabled(enabled: boolean): void {
+ this.enabled = enabled;
+ }
+
+ constructor(
+ private enabled: boolean,
+ connection: IConnection,
+ private bridge: Bridge
+ ) {
+ this.enabled = enabled;
  connection.onRequest(
  Request.analysisDependency,
  this.getDependencyTreeOfProject.bind(this)
  );
  }
  async getDependencyTreeOfProject(uriStr: string): Promise<DependencyTreeMap> {
+ if (!this.enabled) return {};
  const folderUir = URI.parse(uriStr);
  const folder = folderUir.fsPath;
 

server/src/language/code_lens.ts

@@ -10,9 +10,20 @@ import { URI } from "vscode-uri";
 import { CacheModule } from "../../../core/deno_cache";
 import { isInDeno } from "../../../core/deno";
 
-export class CodeLens {
- constructor(connection: IConnection, documents: TextDocuments<TextDocument>) {
+import Plugable from "../plugable";
+
+export class CodeLens implements Plugable {
+ setEnabled(enabled: boolean): void {
+ this.enabled = enabled;
+ }
+
+ constructor(
+ private enabled: boolean,
+ connection: IConnection,
+ documents: TextDocuments<TextDocument>
+ ) {
  connection.onCodeLens((params) => {
+ if (!this.enabled) return;
  const { textDocument } = params;
 
  const document = documents.get(textDocument.uri);

server/src/language/completion.ts

@@ -14,6 +14,8 @@ import { Cache } from "../../../core/cache";
 
 import { ImportCompletionEnhanced } from "./import_completion_enhanced";
 
+import Plugable from "../plugable";
+
 // Cache for 30 second or 30 references
 const cache = Cache.create<Deps[]>(1000 * 30, 30);
 
@@ -25,13 +27,19 @@ getAllDenoCachedDeps()
  // do nothing
  });
 
-export class Completion {
+export class Completion implements Plugable {
+ setEnabled(enabled: boolean): void {
+ this.enabled = enabled;
+ }
+
  constructor(
+ private enabled: boolean,
  connection: IConnection,
  documents: TextDocuments<TextDocument>,
  import_enhanced: ImportCompletionEnhanced
  ) {
  connection.onCompletion(async (params) => {
+ if (this.enabled) return;
  const { position, partialResultToken, textDocument } = params;
 
  const doc = documents.get(textDocument.uri);