Merge pull request #124 from BalticAmadeus/123-parser-error-message-i…

…mprovement Added ParserLogger
BalticAmadeus · Dec 4, 2023 · be6f1f3 · be6f1f3
2 parents 1bdd89d + 4b2a058
commit be6f1f3
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/src/services/parser/ParserLogger.ts b/src/services/parser/ParserLogger.ts
@@ -0,0 +1,22 @@
+export class ParserLogger {
+    public static parserLogger: ParserLogger = new ParserLogger();
+    private static errors: string[] = [];
+
+    private constructor () {
+
+    }
+
+    public static logError(errorName: string, ...optionalParams: any[]) {
+        console.error(errorName, optionalParams);
+        ParserLogger.errors.push(errorName);
+    }
+
+    public static getErrors(): string[] {
+        return ParserLogger.errors;
+    }
+
+    public static resetErrors(): void {
+        ParserLogger.errors = [];
+    }
+
+}
diff --git a/src/services/parser/presentation/callTree.ts b/src/services/parser/presentation/callTree.ts
@@ -1,4 +1,5 @@
 import { CallTree, ModuleDetails } from "../../../common/PresentationData";
+import { ParserLogger } from "../ParserLogger";
 import { ProfilerRawData } from "../profilerRawData";
 import { CallTreeData } from "../raw/callTreeData";
 import { TracingData } from "../raw/tracingData";
@@ -24,7 +25,8 @@ export function calculateCallTree(rawData: ProfilerRawData, moduleDetailList: Mo
             let moduleDetails: ModuleDetails = moduleDetailList.find(({ moduleID }) => moduleID === node.ModuleID)!;
 
             if (!moduleDetails) {
-                console.error(`Module with ID ${node.ModuleID} not found`);
+                ParserLogger.logError(`Module with ID ${node.ModuleID} not found`);
+
                 break;
             }
 

diff --git a/src/services/parser/presentation/calledModules.ts b/src/services/parser/presentation/calledModules.ts
@@ -1,4 +1,5 @@
 import { CalledModules, ModuleDetails } from "../../../common/PresentationData";
+import { ParserLogger } from "../ParserLogger";
 import { ProfilerRawData } from "../profilerRawData";
 
 /**
@@ -21,13 +22,13 @@ export function calculateCalledModules(rawData: ProfilerRawData, moduleDetailLis
                 } else {
                     let callerModuleDetails: ModuleDetails = moduleDetailList.find(({ moduleID }) => moduleID === node.CallerID)!;
                     if (!callerModuleDetails) {
-                        console.error(`Module with ID ${node.CallerID} not found`);
+                        ParserLogger.logError(`Module with ID ${node.CallerID} not found`);
                         break;
                     }
 
                     let calleeModuleDetails: ModuleDetails = moduleDetailList.find(({ moduleID }) => moduleID === node.CalleeID)!;
                     if (!calleeModuleDetails) {
-                        console.error(`Module with ID ${node.CalleeID} not found`);
+                        ParserLogger.logError(`Module with ID ${node.CalleeID} not found`);
                         break;
                     }
 

diff --git a/src/services/profilerService.ts b/src/services/profilerService.ts
@@ -4,15 +4,22 @@ import { transformData } from './parser/presentationData';
 import { PresentationData } from '../common/PresentationData';
 import { collectData } from  './finder/xRefParser';
 import {findLinesWithFunction } from './finder/lineFinder';
+import { ParserLogger } from './parser/ParserLogger';
 
 export class ProfilerService {
     public parse(fileName: string): PresentationData {
+        ParserLogger.resetErrors();
+
         const readData = readFile(fileName);
         const rawData = parseProfilerData(readData);
         const transformedData = transformData(rawData);
         return transformedData;
     }
 
+    public getErrors(): string[] {
+        return ParserLogger.getErrors();
+    }
+
     public parseXRef(fileName: string, procedureName: string) {
         const readData = readFile(fileName);
         const xRefInfo = collectData(readData, procedureName);

diff --git a/src/webview/ProfilerViewer.ts b/src/webview/ProfilerViewer.ts
@@ -60,7 +60,9 @@ export class ProfilerViewer {
 
         const profilerService = new ProfilerService();
 
-        var dataString = profilerService.parse(filePath);
+        let dataString = profilerService.parse(filePath);
+
+        handleErrors(profilerService.getErrors());
 
         this.panel?.webview.postMessage(dataString);
 
@@ -132,6 +134,14 @@ function getProcedureNames(moduleName: string) {
     return xRefInfo;
 }
 
+function handleErrors(errors: string[]) {
+    if (errors.length > 0) {
+        errors.forEach((error) => {
+            vscode.window.showErrorMessage(error);
+        });
+    }
+}
+
 function replaceDots(input: string): string {
     const lastIndex = input.lastIndexOf(".");