Revert "Use file content cache for detecting empty record"

This reverts commit 2265806.

Author: mediremi

package-lock.json

@@ -259,8 +259,5 @@
     "esbuild": "^0.20.1",
     "semver": "^7.3.7",
     "typescript": "^4.7.3"
-  },
-  "dependencies": {
-    "vscode-languageserver-textdocument": "^1.0.12"
   }
 }

package.json

@@ -2,7 +2,6 @@
 // actions available in the extension, but they are derived via the analysis
 // OCaml binary.
 import * as p from "vscode-languageserver-protocol";
-import { TextDocument } from "vscode-languageserver-textdocument";
 import * as utils from "./utils";
 import { fileURLToPath } from "url";
 
@@ -17,7 +16,6 @@ interface findCodeActionsConfig {
   diagnosticMessage: string[];
   file: string;
   range: p.Range;
-  fileContentCache: Map<string, string>;
   addFoundActionsHere: filesCodeActions;
 }
 
@@ -148,7 +146,6 @@ export let findCodeActionsInDiagnosticsMessage = ({
   diagnosticMessage,
   file,
   range,
-  fileContentCache,
   addFoundActionsHere: codeActions,
 }: findCodeActionsConfig) => {
   diagnosticMessage.forEach((line, index, array) => {
@@ -177,7 +174,6 @@ export let findCodeActionsInDiagnosticsMessage = ({
           index,
           line,
           range,
-          fileContentCache,
         });
       } catch (e) {
         console.error(e);
@@ -198,7 +194,6 @@ interface codeActionExtractorConfig {
   range: p.Range;
   diagnostic: p.Diagnostic;
   codeActions: filesCodeActions;
-  fileContentCache: Map<string, string>;
 }
 
 type codeActionExtractor = (config: codeActionExtractorConfig) => boolean;
@@ -324,14 +319,12 @@ let handleUndefinedRecordFieldsAction = ({
   file,
   range,
   diagnostic,
-  fileContentCache
 }: {
   recordFieldNames: string[];
   codeActions: filesCodeActions;
   file: string;
   range: p.Range;
   diagnostic: p.Diagnostic;
-  fileContentCache: Map<string, string>;
 }) => {
   if (recordFieldNames != null) {
     codeActions[file] = codeActions[file] || [];
@@ -386,19 +379,8 @@ let handleUndefinedRecordFieldsAction = ({
       // Let's put the end brace back where it was (we still have it to the direct right of us).
       newText += `${paddingContentEndBrace}`;
     } else {
-      let insertLeadingComma = true
-      const fileContent = fileContentCache.get(file.replace("file://", ""))
-      if (fileContent) {
-        const textDocument = TextDocument.create(file, "text", 0, fileContent)
-        if (textDocument.getText(range) == "{}") {
-          insertLeadingComma = false
-        }
-      }
-
       // A single line record definition body is a bit easier - we'll just add the new fields on the same line.
-      if (insertLeadingComma) {
-        newText += ", ";
-      }
+      newText += ", ";
       newText += recordFieldNames
         .map((fieldName) => `${fieldName}: failwith("TODO")`)
         .join(", ");
@@ -439,7 +421,6 @@ let addUndefinedRecordFieldsV10: codeActionExtractor = ({
   index,
   line,
   range,
-  fileContentCache,
 }) => {
   if (line.startsWith("Some record fields are undefined:")) {
     let recordFieldNames = line
@@ -459,7 +440,6 @@ let addUndefinedRecordFieldsV10: codeActionExtractor = ({
       diagnostic,
       file,
       range,
-      fileContentCache,
     });
   }
 
@@ -474,7 +454,6 @@ let addUndefinedRecordFieldsV11: codeActionExtractor = ({
   index,
   line,
   range,
-  fileContentCache
 }) => {
   if (line.startsWith("Some required record fields are missing:")) {
     let theLine = line;
@@ -507,7 +486,6 @@ let addUndefinedRecordFieldsV11: codeActionExtractor = ({
       diagnostic,
       file,
       range,
-      fileContentCache,
     });
   }
 

server/src/codeActions.ts

@@ -644,13 +644,8 @@ async function compileContents(
           }
           // Reset compilation status as this compilation finished
           entry.compilation = null;
-
-          const fileContentCache = new Map();
-          fileContentCache.set(entry.file.incrementalFilePath, fileContent)
-
           const { result, codeActions } = utils.parseCompilerLogOutput(
-            `${stderr}\n#Done()`,
-            fileContentCache
+            `${stderr}\n#Done()`
           );
 
           const actions = Object.values(codeActions)[0] ?? [];

server/src/incrementalCompilation.ts

@@ -102,7 +102,7 @@ let sendUpdatedDiagnostics = () => {
       result: filesAndErrors,
       codeActions,
       linesWithParseErrors,
-    } = utils.parseCompilerLogOutput(content, stupidFileContentCache);
+    } = utils.parseCompilerLogOutput(content);
 
     if (linesWithParseErrors.length > 0) {
       let params: p.ShowMessageParams = {

server/src/server.ts

@@ -509,8 +509,7 @@ type parsedCompilerLogResult = {
   linesWithParseErrors: string[];
 };
 export let parseCompilerLogOutput = (
-  content: string,
-  fileContentCache: Map<string, string>
+  content: string
 ): parsedCompilerLogResult => {
   type parsedDiagnostic = {
     code: number | undefined;
@@ -681,7 +680,6 @@ export let parseCompilerLogOutput = (
       diagnosticMessage,
       file,
       range,
-      fileContentCache,
     });
 
     result[file].push(diagnostic);