Merge pull request #9 from jpoly1219/jacob/enhancement/fasterextraction/vscodeapi

Jacob/enhancement/fasterextraction/vscodeapi

Author: jpoly1219

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpoly1219/context-extractor",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Extract relevant context from an incomplete program sketch.",
   "repository": {
     "type": "git",

package.json

@@ -99,12 +99,13 @@ export async function getQueryForFile(
 async function loadLanguageForFileExt(
   fileExtension: string
 ): Promise<Parser.Language> {
-  const wasmPath = path.join(
-    __dirname,
-    "tree-sitter-files",
-    "wasms",
-    `tree-sitter-${supportedLanguages[fileExtension]}.wasm`
-  );
+  const wasmPath = require.resolve(`./tree-sitter-files/wasms/tree-sitter-${supportedLanguages[fileExtension]}.wasm`)
+  // const wasmPath = path.join(
+  //   __dirname,
+  //   "tree-sitter-files",
+  //   "wasms",
+  //   `tree-sitter-${supportedLanguages[fileExtension]}.wasm`
+  // );
   return await Parser.Language.load(wasmPath);
 }
 
@@ -266,15 +267,17 @@ export async function extractTopLevelDecls(currentFile: string) {
     throw new Error(`failed to get ast for file ${currentFile}`);
   }
   const language = getFullLanguageName(currentFile);
+  const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-get-toplevel-headers.scm`)
   const query = await getQueryForFile(
     currentFile,
-    path.join(
-      __dirname,
-      "tree-sitter-files",
-      "queries",
-      "relevant-headers-queries",
-      `${language}-get-toplevel-headers.scm`
-    )
+    queryPath
+    // path.join(
+    //   __dirname,
+    //   "tree-sitter-files",
+    //   "queries",
+    //   "relevant-headers-queries",
+    //   `${language}-get-toplevel-headers.scm`
+    // )
   );
   if (!query) {
     throw new Error(
@@ -290,15 +293,17 @@ export async function extractTopLevelDeclsWithFormatting(currentFile: string) {
     throw new Error(`failed to get ast for file ${currentFile}`);
   }
   const language = getFullLanguageName(currentFile);
+  const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-get-toplevel-headers.scm`)
   const query = await getQueryForFile(
     currentFile,
-    path.join(
-      __dirname,
-      "tree-sitter-files",
-      "queries",
-      "relevant-headers-queries",
-      `${language}-get-toplevel-headers.scm`
-    )
+    queryPath
+    // path.join(
+    //   __dirname,
+    //   "tree-sitter-files",
+    //   "queries",
+    //   "relevant-headers-queries",
+    //   `${language}-get-toplevel-headers.scm`
+    // )
   );
   if (!query) {
     throw new Error(

src/tree-sitter.ts

@@ -440,15 +440,17 @@ export class TypeScriptDriver implements LanguageDriver {
       throw new Error("failed to get ast");
     }
     const language = getFullLanguageName(sketchFilePath);
+    const queryPath = require.resolve(`./tree-sitter-files/queries/hole-queries/${language}.scm`)
     const query = await getQueryForFile(
       sketchFilePath,
-      path.join(
-        __dirname,
-        "tree-sitter-files",
-        "queries",
-        "hole-queries",
-        `${language}.scm`
-      ),
+      queryPath
+      // path.join(
+      //   __dirname,
+      //   "tree-sitter-files",
+      //   "queries",
+      //   "hole-queries",
+      //   `${language}.scm`
+      // ),
     );
     if (!query) {
       throw new Error(`failed to get query for file ${sketchFilePath} and language ${language}`);
@@ -1010,15 +1012,17 @@ export class TypeScriptDriver implements LanguageDriver {
         foundSoFar.set(typeName, { typeSpan: fullHoverResult, sourceFile: currentFile.slice(7), ast: ast });
 
         const language = getFullLanguageName(currentFile);
+        const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-types-queries/${language}-extract-identifiers.scm`)
         const query = await getQueryForFile(
           currentFile,
-          path.join(
-            __dirname,
-            "tree-sitter-files",
-            "queries",
-            "relevant-types-queries",
-            `${language}-extract-identifiers.scm`,
-          )
+          queryPath
+          // path.join(
+          //   __dirname,
+          //   "tree-sitter-files",
+          //   "queries",
+          //   "relevant-types-queries",
+          //   `${language}-extract-identifiers.scm`,
+          // )
         );
         if (!query) {
           throw new Error(`failed to get query for file ${currentFile} and language ${language}`);
@@ -1098,15 +1102,17 @@ export class TypeScriptDriver implements LanguageDriver {
         foundSoFar.set(typeName, { typeSpan: fullHoverResult, sourceFile: currentFile.slice(7), ast: ast });
 
         const language = getFullLanguageName(currentFile);
+        const queryPath = require.resolve(`./tree-sitter-files/queries/relevant-headers-queries/${language}-extract-identifiers.scm`)
         const query = await getQueryForFile(
           currentFile,
-          path.join(
-            __dirname,
-            "tree-sitter-files",
-            "queries",
-            "relevant-headers-queries",
-            `${language}-extract-identifiers.scm`,
-          )
+          queryPath
+          // path.join(
+          //   __dirname,
+          //   "tree-sitter-files",
+          //   "queries",
+          //   "relevant-headers-queries",
+          //   `${language}-extract-identifiers.scm`,
+          // )
         );
         if (!query) {
           throw new Error(`failed to get query for file ${currentFile} and language ${language}`);