feat(enablePaths): glob support

client/package.json

@@ -16,10 +16,12 @@
   "dependencies": {
     "dotenv": "^16.4.5",
     "jsonc-parser": "^3.2.0",
+    "picomatch": "^4.0.2",
     "semver": "7.5.2",
     "vscode-languageclient": "^8.0.1"
   },
   "devDependencies": {
+    "@types/picomatch": "^3.0.2",
     "@types/semver": "7.3.9",
     "@types/vscode": "1.77.0",
     "vscode-test": "^1.6.1"

client/src/enable.ts

@@ -6,6 +6,7 @@ import * as vscode from "vscode";
 import { DenoExtensionContext, EnableSettings } from "./types";
 import * as os from "os";
 import * as path from "path";
+import { isMatch } from "picomatch";
 
 export interface WorkspaceEnabledInfo {
   folder: vscode.WorkspaceFolder;
@@ -36,13 +37,15 @@ export function isPathEnabled(
     )?.[1] ?? extensionContext.enableSettingsUnscoped ??
       { enable: null, enablePaths: null, disablePaths: [] };
   const scopesWithDenoJson = extensionContext.scopesWithDenoJson ?? new Set();
+  if (isMatch(filePath, enableSettings.disablePaths)) return false;
   for (const path of enableSettings.disablePaths) {
     if (pathStartsWith(filePath, path)) {
       return false;
     }
   }
   if (enableSettings.enablePaths) {
-    return enableSettings.enablePaths.some((p) => pathStartsWith(filePath, p));
+    return isMatch(filePath, enableSettings.enablePaths) ||
+      enableSettings.enablePaths.some((path) => pathStartsWith(filePath, path));
   }
   if (enableSettings.enable != null) {
     return enableSettings.enable;

package.json

@@ -214,7 +214,7 @@
             "type": "string"
           },
           "default": [],
-          "markdownDescription": "Disables the Deno Language Server for specific paths. This will leave the built in TypeScript/JavaScript language server enabled for those paths. Takes priority over `deno.enablePaths`.\n\n**Not recommended to be enabled in user settings.**",
+          "markdownDescription": "Disables the Deno Language Server for specific paths. This will leave the built in TypeScript/JavaScript language server enabled for those paths. Glob patterns are supported via picomatch. Takes priority over `deno.enablePaths`.\n\n**Not recommended to be enabled in user settings.**",
           "scope": "resource",
           "examples": [
             [
@@ -228,7 +228,7 @@
             "type": "string"
           },
           "default": null,
-          "markdownDescription": "Enables the Deno Language Server for specific paths, instead of for the whole workspace folder. This will disable the built in TypeScript/JavaScript language server for those paths.\n\nWhen a value is set, the value of `\"deno.enable\"` is ignored.\n\nThe workspace folder is used as the base for the supplied paths. If for example you have all your Deno code in `worker` path in your workspace, you can add an item with the value of `./worker`, and the Deno will only provide diagnostics for the files within `worker` or any of its sub paths.\n\n**Not recommended to be enabled in user settings.**",
+          "markdownDescription": "Enables the Deno Language Server for specific paths, instead of for the whole workspace folder. This will disable the built in TypeScript/JavaScript language server for those paths. Glob patterns are supported via picomatch.\n\nWhen a value is set, the value of `\"deno.enable\"` is ignored.\n\nThe workspace folder is used as the base for the supplied paths. If for example you have all your Deno code in `worker` path in your workspace, you can add an item with the value of `./worker`, and the Deno will only provide diagnostics for the files within `worker` or any of its sub paths.\n\n**Not recommended to be enabled in user settings.**",
           "scope": "resource",
           "examples": [
             [

typescript-deno-plugin/package.json

@@ -19,6 +19,10 @@
     "vscode": "^1.77.0"
   },
   "devDependencies": {
+    "@types/picomatch": "^3.0.2",
     "typescript": "^5.0.2"
+  },
+  "dependencies": {
+    "picomatch": "^4.0.2"
   }
 }

typescript-deno-plugin/src/index.ts

@@ -7,6 +7,7 @@ import * as process from "process";
 import * as os from "os";
 import { setImmediate } from "timers";
 import * as util from "util";
+import { isMatch } from "picomatch";
 
 /** Extract the return type from a maybe function. */
 // deno-lint-ignore no-explicit-any
@@ -66,15 +67,17 @@ class Plugin implements ts.server.PluginModule {
       )?.[1] ?? pluginSettings.enableSettingsUnscoped ??
         { enable: null, enablePaths: null, disablePaths: [] };
     const scopesWithDenoJson = pluginSettings.scopesWithDenoJson ?? [];
+    if (isMatch(fileName, enableSettings.disablePaths)) return false;
     for (const path of enableSettings.disablePaths) {
       if (pathStartsWith(fileName, path)) {
         return false;
       }
     }
     if (enableSettings.enablePaths) {
-      return enableSettings.enablePaths.some((path) =>
-        pathStartsWith(fileName, path)
-      );
+      return isMatch(fileName, enableSettings.enablePaths) ||
+        enableSettings.enablePaths.some((path) =>
+          pathStartsWith(fileName, path)
+        );
     }
     if (enableSettings.enable != null) {
       return enableSettings.enable;