fixes / improvements

Author: TibboddiT

src/commands/analyse.ts

@@ -9,7 +9,7 @@ import showOutput from "./showOutput";
 import stopAnalyse from "./stopAnalyse";
 import { spawn } from "child_process";
 import { Diagnostic, DiagnosticSeverity, Range, Uri } from "vscode";
-import { getFileLine } from "../utils/fs";
+import { getFileLines } from "../utils/fs";
 
 function setStatusBarProgress(ext: Ext, progress?: number) {
   let text = "$(sync~spin) PHPStan analysing...";
@@ -56,7 +56,7 @@ async function refreshDiagnostics(ext: Ext, result: PHPStanAnalyseResult) {
     }
   });
 
-  ext.log('Using paths mappings: ' + JSON.stringify(pathMaps));
+  ext.log('Using path mappings: ' + JSON.stringify(pathMaps));
 
   for (const path in result.files) {
     let realPath = path;
@@ -74,19 +74,17 @@ async function refreshDiagnostics(ext: Ext, result: PHPStanAnalyseResult) {
       }
     }
 
+    const fileLines: string[] = await getFileLines(resolve(realPath));
+
     const pathItem = result.files[path];
     const diagnostics: Diagnostic[] = [];
     for (const messageItem of pathItem.messages) {
       const line = messageItem.line ? messageItem.line - 1 : 0;
+      const lineText = messageItem.line ? (fileLines[line] ?? '') : '';
 
-      const lineText = await getFileLine(resolve(realPath), messageItem.line ?? 0);
       const startCol = Math.max(0, lineText.search(/[^\s]/g));
       const endCol = Math.max(0, lineText.search(/\s*$/g));
 
-      ext.log(JSON.stringify({
-        line, startCol, endCol
-      }));
-
       const range = new Range(line, startCol, line, endCol);
       const diagnostic = new Diagnostic(
         range,

src/utils/fs.ts

@@ -10,9 +10,9 @@ export async function checkFile(path: string): Promise<boolean> {
   }
 }
 
-export async function getFileLine(path: string, lineNumber: number): Promise<string> {
+export async function getFileLines(path: string): Promise<string[]> {
   if (!checkFile(path)) {
-    return Promise.resolve('');
+    return Promise.resolve([]);
   }
 
   return new Promise((resolve, reject) => {
@@ -23,24 +23,14 @@ export async function getFileLine(path: string, lineNumber: number): Promise<str
           input: stream,
       });
 
-      let currentLineNumber = 0;
-      let found = false;
+      const lines: string[] = [];
 
       rl.on('line', (line) => {
-        if (!found && ++currentLineNumber === lineNumber) {
-          found = true;
-          rl.close();
-          stream.close();
-          stream.push(null);
-          stream.read(0);
-          resolve(line);
-        }
+        lines.push(line);
       });
 
       rl.on('close', () => {
-        if (!found) {
-          resolve('');
-        }
+        resolve(lines);
       });
     } catch (err) {
       reject(err);

src/utils/neon.ts

@@ -1,5 +1,6 @@
 import { readFile } from "fs/promises";
 import { load } from "js-yaml";
+import { join, resolve } from "path";
 
 export function resolveNeon(contents: string, env: Record<string, string>) {
   return contents.replace(/(?:%(\w+)%)/g, (_, name) => env[name] ?? "");
@@ -9,7 +10,7 @@ export async function parseNeonFile<T = unknown>(
   path: string,
   env: Record<string, string> = {}
 ): Promise<T> {
-  const contents = (await readFile(path)).toString();
+  const contents = (await readFile(resolve(join(env.currentWorkingDirectory, path)))).toString();
   const yaml = resolveNeon(contents.replace(/\t/g, "  "), env);
   return load(yaml) as Promise<T>;
 }