Change mechanism of reading local files

Signed-off-by: Liam Barry Allan <[email protected]>
codefori · Aug 3, 2022 · b075489 · b075489
1 parent f8e8764
commit b075489
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/language/generic.js b/src/language/generic.js
@@ -22,6 +22,7 @@ module.exports = class {
     let type = undefined;
 
     switch (workingUri.scheme) {
+    case `vscode-vfs`:
     case `file`:
       // Local file
       type = `file`;
@@ -66,7 +67,7 @@ module.exports = class {
         const config = instance.getConfig();
         finishedPath = path.posix.join(config.homeDirectory, getPath);
       };
-      break
+      break;
 
     case `member`:
       //Fetch member

diff --git a/src/language/parser.js b/src/language/parser.js
@@ -212,9 +212,10 @@ module.exports = class Parser {
         }
 
         if (possibleFile) {
-          content = (await vscode.workspace.fs.readFile(possibleFile)).toString();
-          uri = possibleFile;
-          lines = content.replace(new RegExp(`\\\r`, `g`), ``).split(`\n`);
+          doc = await vscode.workspace.openTextDocument(possibleFile);
+          eol = doc.eol === vscode.EndOfLine.CRLF ? `\r\n` : `\n`;
+          uri = doc.uri;
+          lines = doc.getText().split(eol);
         } else {
           found = false;
         }

diff --git a/tests/models/vscode.js b/tests/models/vscode.js
@@ -13,6 +13,10 @@ module.exports = {
   Uri,
   Position: require(`./Position`),
   Range: require(`./Range`),
+  EndOfLine: {
+    LF: 1,
+    CRLF: 2,
+  },
   workspace: {
     workspaceFolders: [
       {
@@ -25,6 +29,15 @@ module.exports = {
         return fs.readFile(uri.fsPath);
       }
     },
+    openTextDocument: async (uri) => {
+      const content = (await module.exports.workspace.fs.readFile(uri)).toString();
+
+      return {
+        uri,
+        eol: content.indexOf(`\r\n`) >= 0 ? module.exports.EndOfLine.CRLF : module.exports.EndOfLine.LF,
+        getText: () => {return content}
+      }
+    },
     findFiles: async (path) => {
       // Sync is fine here since it's just in test
       const files = glob.sync(path, {