fix: locate problems correctly when there are %INC statements (#1347) (#1448)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

* fix: locate problems correctly when there are %INC statements (#1347)

Author: scnjdl

client/src/components/logViewer/ProblemProcessor.ts

@@ -537,7 +537,7 @@ function processRawLocationDesc(
   });
 
   locations.map((location) => {
-    location.lineNumber = lineNumber - offset.lineOffset;
+    location.lineNumber = lineNumber;
     location.startColumn =
       location.startColumn - offset.columnOffset + columnCorrection;
     location.endColumn =
@@ -664,8 +664,7 @@ function processGeneralLocation(
     return null;
   }
 
-  const lineNumber =
-    decomposeCodeLogLine(sourceCodeLines[0]).lineNumber - offset.lineOffset;
+  const lineNumber = decomposeCodeLogLine(sourceCodeLines[0]).lineNumber;
   const wholeLine = sourceCodeLines.reduce(
     (accumulator, line) => accumulator + line.substring(offset.columnOffset),
   );

client/src/components/logViewer/logParser.ts

@@ -9,9 +9,12 @@ import {
   isSourceCodeLineAfterLineWrapping,
 } from "./ProblemProcessor";
 
-export function parseLog(logs: LogLine[], logStartFlag: string): Problem[] {
+export function parseLog(
+  logs: LogLine[],
+  logStartFlag: string,
+): [Problem[], string[]] {
   if (logs.length === 0 || logStartFlag.trim() === "") {
-    return [];
+    return [[], []];
   }
 
   // logs cleaning
@@ -21,6 +24,7 @@ export function parseLog(logs: LogLine[], logStartFlag: string): Problem[] {
   let problemProcessor: ProblemProcessor = new ProblemProcessor();
   let offset: LocationOffset;
   const problems: Problem[] = [];
+  const codeLines: string[] = [];
 
   problemRelatedLogs.forEach((logLine) => {
     if (isProblemTypeLog(logLine)) {
@@ -42,6 +46,8 @@ export function parseLog(logs: LogLine[], logStartFlag: string): Problem[] {
       problemProcessor.appendProblemLogLine(logLine);
       return;
     } else {
+      codeLines.push(logLine.line);
+
       if (!isValidSourceCodeLog(logLine)) {
         return;
       }
@@ -79,7 +85,7 @@ export function parseLog(logs: LogLine[], logStartFlag: string): Problem[] {
 
   problemProcessor = null;
 
-  return problems;
+  return [problems, cleanCodeLines(codeLines)];
 }
 
 function getTheLatestLogs(logs: LogLine[], firstCodeLine: string): LogLine[] {
@@ -184,3 +190,24 @@ function isValidSourceCodeLog(logLine: LogLine): boolean {
 function areSameLines(line1: string, line2: string) {
   return line1 === line2;
 }
+
+// keep each line number only once
+function cleanCodeLines(codeLines: string[]): string[] {
+  if (codeLines.length === 0) {
+    return codeLines;
+  }
+
+  let previousLineNumber = -1;
+  const result = [];
+  codeLines.forEach((line) => {
+    const lineNumber = decomposeCodeLogLine(line)?.lineNumber ?? -1;
+    if (lineNumber === previousLineNumber) {
+      return;
+    } else {
+      previousLineNumber = lineNumber;
+      result.push(line);
+    }
+  });
+
+  return result;
+}

client/src/components/logViewer/sasDiagnostics.ts

@@ -77,9 +77,12 @@ async function updateDiagnostics(
     return;
   }
 
-  const problems = parseLog(logs, codeDoc.wrappedCodeLineAt(0));
+  const [problems, codeLinesInLog] = parseLog(
+    logs,
+    codeDoc.wrappedCodeLineAt(0),
+  );
 
-  updateProblemLocation(problems, codeDoc);
+  await updateProblemLocation(problems, codeDoc, codeLinesInLog);
 
   const problemsWithValidLocation = problems.filter((problem) => {
     const { lineNumber, startColumn, endColumn } = problem;
@@ -94,23 +97,30 @@ async function updateDiagnostics(
   );
 }
 
-function updateProblemLocation(problems: Problem[], codeDoc: SASCodeDocument) {
-  problems.forEach((problem) => {
+async function updateProblemLocation(
+  problems: Problem[],
+  codeDoc: SASCodeDocument,
+  codeLinesInLog: string[],
+) {
+  for (const problem of problems) {
     const { lineNumber, startColumn, endColumn } = problem;
     const {
       lineNumber: actualLineNumber,
       startColumn: actualStartColumn,
       endColumn: actualEndColumn,
-    } = codeDoc.getLocationInRawCode({
-      lineNumber,
-      startColumn,
-      endColumn,
-    });
+    } = await codeDoc.getLocationInRawCode(
+      {
+        lineNumber,
+        startColumn,
+        endColumn,
+      },
+      codeLinesInLog,
+    );
 
     problem.lineNumber = actualLineNumber;
     problem.startColumn = actualStartColumn;
     problem.endColumn = actualEndColumn;
-  });
+  }
 }
 
 function constructDiagnostics(problems: Problem[]): Diagnostic[] {