⚡️ Switch to picomatch to improve exclude performance

SpyglassMC · Jan 3, 2025 · 468a27f · 468a27f
1 parent da865cd
commit 468a27f
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -19,7 +19,7 @@
     "chokidar": "^3.5.2",
     "decompress": "^4.2.1",
     "follow-redirects": "^1.14.8",
-    "micromatch": "^4.0.8",
+    "picomatch": "^4.0.2",
     "pako": "^2.0.4",
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/decompress": "^4.2.3",
     "@types/follow-redirects": "^1.14.1",
-    "@types/micromatch": "^4.0.9",
+    "@types/picomatch": "^3.0.1",
     "@types/pako": "^2.0.0",
     "@types/whatwg-url": "^11.0.4"
   },

diff --git a/packages/core/src/service/Config.ts b/packages/core/src/service/Config.ts
@@ -336,7 +336,11 @@ export const VanillaConfig: Config = {
 	env: {
 		dataSource: 'GitHub',
 		dependencies: ['@vanilla-datapack', '@vanilla-resourcepack', '@vanilla-mcdoc'],
-		exclude: ['.*/**'],
+		exclude: [
+			'/.*/',
+			'/node_modules/',
+			'/__pycache__/',
+		],
 		customResources: {},
 		feature: {
 			codeActions: true,

diff --git a/packages/core/src/service/Project.ts b/packages/core/src/service/Project.ts
@@ -1,4 +1,3 @@
-import * as micromatch from 'micromatch'
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver-textdocument'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import type { ExternalEventEmitter, Externals, FsWatcher, IntervalId } from '../common/index.js'
@@ -968,15 +967,7 @@ export class Project implements ExternalEventEmitter {
 	}
 
 	public shouldExclude(uri: string): boolean {
-		if (this.config.env.exclude.length === 0) {
-			return false
-		}
-		for (const rel of fileUtil.getRels(uri, this.projectRoots)) {
-			if (micromatch.any(rel, this.config.env.exclude)) {
-				return true
-			}
-		}
-		return false
+		return fileUtil.match(this.config.env.exclude, uri)
 	}
 
 	private tryClearingCache(uri: string): void {

diff --git a/packages/core/src/service/fileUtil.ts b/packages/core/src/service/fileUtil.ts
@@ -1,3 +1,4 @@
+import picomatch from 'picomatch'
 import type { Externals, FsLocation } from '../common/index.js'
 import { bufferToString, Uri } from '../common/index.js'
 
@@ -109,6 +110,15 @@ export namespace fileUtil {
 		return uri.startsWith('file:')
 	}
 
+	export function match(patterns: string[], uri: string) {
+		const options: picomatch.PicomatchOptions = {
+			contains: true,
+			dot: true,
+			posixSlashes: false,
+		}
+		return picomatch(patterns, options)(uri)
+	}
+
 	/**
 	 * @returns The part from the last `.` to the end of the URI, or `undefined` if no dots exist. No special treatment for leading dots.
 	 */