fix: Fix issues with config files when using live-share (#3339)

streetsidesoftware · Jun 3, 2024 · 8f1ff01 · 8f1ff01
1 parent 3fdaf0f
commit 8f1ff01
Show file tree

Hide file tree

Showing 5 changed files with 301 additions and 47 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/_server/package.json b/packages/_server/package.json
@@ -40,15 +40,15 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^8.8.3",
-    "@cspell/cspell-pipe": "^8.8.3",
-    "@cspell/cspell-types": "^8.8.3",
+    "@cspell/cspell-bundled-dicts": "^8.8.4",
+    "@cspell/cspell-pipe": "^8.8.4",
+    "@cspell/cspell-types": "^8.8.4",
     "@internal/common-utils": "file:../__utils",
-    "cspell-config-lib": "^8.8.3",
-    "cspell-gitignore": "^8.8.3",
-    "cspell-glob": "^8.8.3",
-    "cspell-io": "^8.8.3",
-    "cspell-lib": "^8.8.3",
+    "cspell-config-lib": "^8.8.4",
+    "cspell-gitignore": "^8.8.4",
+    "cspell-glob": "^8.8.4",
+    "cspell-io": "^8.8.4",
+    "cspell-lib": "^8.8.4",
     "gensequence": "^7.0.0",
     "json-rpc-api": "file:../json-rpc-api",
     "rxjs": "^7.8.1",

diff --git a/packages/_server/src/config/documentSettings.mts b/packages/_server/src/config/documentSettings.mts
@@ -799,7 +799,10 @@ export function isIncluded(settings: ExtSettings, uri: Uri): boolean {
 }
 
 export function isExcluded(settings: ExtSettings, uri: Uri): boolean {
-    return !canCheckAgainstGlob(uri) || settings.excludeGlobMatcher.match(uriToGlobPath(uri));
+    if (!canCheckAgainstGlob(uri)) {
+        return false;
+    }
+    return settings.excludeGlobMatcher.match(uriToGlobPath(uri));
 }
 
 async function filterUrl(uri: Uri): Promise<Uri | undefined> {