Merge pull request #6 from jpoly1219/jacob/enhancement/fasterExtraction

Jacob/enhancement/faster extraction

Author: jpoly1219

package.json

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

src/app.ts

@@ -107,32 +107,30 @@ export class App {
 
       await this.init();
 
-      console.time("getHoleContext");
+      // console.time("getHoleContext");
       const holeContext = await this.languageDriver.getHoleContext(
         this.lspClient,
         this.sketchPath,
       );
-      console.timeEnd("getHoleContext");
+      // console.timeEnd("getHoleContext");
 
-      console.time("extractRelevantTypes");
+      // console.time("extractRelevantTypes");
       const relevantTypes = await this.languageDriver.extractRelevantTypes(
         this.lspClient,
-        holeContext.fullHoverResult,
+        // NOTE: sometimes fullHoverResult isn't representative of the actual file contents, especially with generic functions.
+        holeContext.trueHoleFunction ? holeContext.trueHoleFunction : holeContext.fullHoverResult,
         holeContext.functionName,
         holeContext.range.start.line,
-        holeContext.range.end.line,
         new Map<string, TypeSpanAndSourceFile>(),
         holeContext.source,
-        new Map<string, Location[]>(),
-        new Map<string, SymbolInformation[]>()
-        // new Map<string, Map<number, Range>>(),
+        new Map<string, string>()
       );
-      console.timeEnd("extractRelevantTypes");
+      // console.timeEnd("extractRelevantTypes");
 
       // console.dir(relevantTypes, { depth: null })
 
       // Postprocess the map.
-      console.time("extractRelevantTypes postprocess");
+      // console.time("extractRelevantTypes postprocess");
       if (this.language === Language.TypeScript) {
         relevantTypes.delete("_()");
         for (const [k, { typeSpan: v, sourceFile: src }] of relevantTypes.entries()) {
@@ -141,32 +139,33 @@ export class App {
       } else if (this.language === Language.OCaml) {
         relevantTypes.delete("_");
       }
-      console.timeEnd("extractRelevantTypes postprocess");
+      // console.timeEnd("extractRelevantTypes postprocess");
 
 
-      console.time("extractRelevantHeaders repo");
+      // console.time("extractRelevantHeaders repo");
       let repo: string[] = [];
       if (this.language === Language.TypeScript) {
         repo = getAllTSFiles(this.repoPath);
       } else if (this.language === Language.OCaml) {
         repo = getAllOCamlFiles(this.repoPath);
       }
-      console.timeEnd("extractRelevantHeaders repo");
+      // console.timeEnd("extractRelevantHeaders repo");
 
-      console.time("extractRelevantHeaders");
+      // console.time("extractRelevantHeaders");
       const relevantHeaders = await this.languageDriver.extractRelevantHeaders(
         this.lspClient,
         repo,
         relevantTypes,
         holeContext.functionTypeSpan
       );
-      console.timeEnd("extractRelevantHeaders");
+      // const relevantHeaders: { typeSpan: string, sourceFile: string }[] = []
+      // console.timeEnd("extractRelevantHeaders");
 
       // console.log(relevantHeaders)
       // console.log(relevantHeaders.size)
 
       // Postprocess the map.
-      console.time("extractRelevantHeaders postprocess");
+      // console.time("extractRelevantHaders postprocess");
       if (this.language === Language.TypeScript) {
         relevantTypes.delete("");
         for (const [k, { typeSpan: v, sourceFile: src }] of relevantTypes.entries()) {
@@ -176,9 +175,9 @@ export class App {
           obj.typeSpan += ";";
         }
       }
-      console.timeEnd("extractRelevantHeaders postprocess");
+      // console.timeEnd("extractRelevantHeaders postprocess");
 
-      console.time("toReturn");
+      // console.time("toReturn");
       const relevantTypesToReturn: Map<string, string[]> = new Map<string, string[]>();
       relevantTypes.forEach(({ typeSpan: v, sourceFile: src }, _) => {
         if (relevantTypesToReturn.has(src)) {
@@ -203,7 +202,7 @@ export class App {
           relevantHeadersToReturn.set(src, [v]);
         }
       })
-      console.timeEnd("toReturn");
+      // console.timeEnd("toReturn");
 
       this.result = {
         holeType: holeContext.functionTypeSpan,

src/main.ts

@@ -238,12 +238,12 @@ export const extractContext = async (
   sketchPath: string,
   repoPath: string,
 ) => {
-  console.time("extractContext")
+  // console.time("extractContext")
   const app = new App(language, sketchPath, repoPath);
   await app.run();
   const res = app.getSavedResult();
   app.close();
-  console.timeEnd("extractContext")
+  // console.timeEnd("extractContext")
   return res;
 
   // if (!getCompletion) {

src/ocaml-driver.ts

@@ -169,18 +169,16 @@ export class OcamlDriver implements LanguageDriver {
     fullHoverResult: string,
     typeName: string,
     startLine: number,
-    endLine: number,
     foundSoFar: Map<string, TypeSpanAndSourceFile>,
     currentFile: string,
-    // outputFile: fs.WriteStream,
   ) {
     if (!foundSoFar.has(typeName)) {
       foundSoFar.set(typeName, { typeSpan: fullHoverResult, sourceFile: currentFile.slice(7) });
       // outputFile.write(`${fullHoverResult};\n`);
 
       const content = fs.readFileSync(currentFile.slice(7), "utf8");
 
-      for (let linePos = startLine; linePos <= endLine; ++linePos) {
+      for (let linePos = startLine; linePos <= fullHoverResult.length; ++linePos) {
         const numOfCharsInLine = parseInt(execSync(`wc -m <<< "${content.split("\n")[linePos]}"`, { shell: "/bin/bash" }).toString());
 
         for (let charPos = 0; charPos < numOfCharsInLine; ++charPos) {
@@ -236,10 +234,8 @@ export class OcamlDriver implements LanguageDriver {
                   snippetInRange,
                   identifier,
                   matchingSymbolRange.start.line,
-                  matchingSymbolRange.end.line,
                   foundSoFar,
                   (typeDefinitionResult[0] as Location).uri,
-                  // outputFile,
                 );
 
               }

src/types.ts

@@ -73,19 +73,16 @@ interface LanguageDriver {
     holeTypeDefCharPos: number;
     range: Range;
     source: string;
+    trueHoleFunction?: string;
   }>;
   extractRelevantTypes: (
     lspClient: LspClient,
     fullHoverResult: string,
     typeName: string,
     startLine: number,
-    endLine: number,
     foundSoFar: Map<string, TypeSpanAndSourceFile>,
     currentFile: string,
-    foundTypeDefinitions: Map<string, Location[]>,
-    foundSymbols: Map<string, SymbolInformation[]>,
-    // foundSymbols: Map<string, Map<number, Range>>,
-    // outputFile: fs.WriteStream,
+    foundContents: Map<string, string>,
   ) => Promise<Map<string, TypeSpanAndSourceFile>>;
   extractRelevantHeaders: (
     lspClient: LspClient,