Merge pull request #380 from vkx86/dev-PR4

Re-ordering embeddingIgnoredGlobs addition for ignore()
twinnydotdev · Nov 10, 2024 · 8d24ff3 · 8d24ff3
2 parents 341eefb + 8006aa7
commit 8d24ff3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "twinny",
   "displayName": "twinny - AI Code Completion and Chat",
   "description": "Locally hosted AI code completion plugin for vscode",
-  "version": "3.18.10",
+  "version": "3.18.11",
   "icon": "assets/icon.png",
   "keywords": [
     "code-inference",

diff --git a/src/extension/embeddings.ts b/src/extension/embeddings.ts
@@ -97,20 +97,20 @@ export class EmbeddingDatabase extends Base {
 
     const ig = ignore()
 
+    const gitIgnoreFilePath = path.join(rootPath, ".gitignore")
+
+    if (fs.existsSync(gitIgnoreFilePath)) {
+      ig.add(fs.readFileSync(gitIgnoreFilePath).toString())
+    }
+
     const embeddingIgnoredGlobs = this.config.get(
       "embeddingIgnoredGlobs",
       [] as string[]
     )
 
     ig.add(embeddingIgnoredGlobs)
     ig.add([".git", ".gitignore"])
-
-    const gitIgnoreFilePath = path.join(rootPath, ".gitignore")
-
-    if (fs.existsSync(gitIgnoreFilePath)) {
-      ig.add(fs.readFileSync(gitIgnoreFilePath).toString())
-    }
-
+
     for (const dirent of dirents) {
       const fullPath = path.join(dirPath, dirent.name)
       const relativePath = path.relative(rootPath, fullPath)