Fix build issues, to enable tests

Author: K0IN

frontend/src/messaging.ts

@@ -3,8 +3,8 @@ import { vscode } from "./main";
 
 export function getComlinkChannel(): Endpoint {
   return {
-    addEventListener: (type: string, listener: any) => window.addEventListener(type, listener),
-    removeEventListener: () => { }, // todo  window.removeEventListener
-    postMessage: (object: any) => vscode.postMessage(object),
+    addEventListener: (type: string, listener: EventListenerOrEventListenerObject) => window.addEventListener(type, listener),
+    removeEventListener: (type: string, listener: EventListenerOrEventListenerObject, _options?: {}) => window.removeEventListener(type, listener),
+    postMessage: (object: unknown) => vscode.postMessage(object),
   };
 }

src/debug/callstack-extractor.ts

@@ -38,18 +38,6 @@ async function findSymbolForLine(file: Uri, zeroIndexedLine: number) {
 }
 
 
-async function convertScriptLineNumberToFunctionLineNumber(file: Uri, zeroIndexedFileLineNumber: number): Promise<number> {
-  const documentSymbols = await findSymbolForLine(file, zeroIndexedFileLineNumber);
-  if (!documentSymbols) {
-    return zeroIndexedFileLineNumber;
-  }
-  const filteredBySymbolType = documentSymbols.filter(symbol => symbol.kind === SymbolKind.Function || symbol.kind === SymbolKind.Method || symbol.kind === SymbolKind.Constructor);
-  const hasCorrection = filteredBySymbolType.length > 0;
-  const correctedLine = hasCorrection ? (zeroIndexedFileLineNumber - filteredBySymbolType[0].range.start.line) : zeroIndexedFileLineNumber;
-  return correctedLine;
-}
-
-
 async function getFunctionLocation(file: Uri, name: string, zeroIndexedLine: number): Promise<Range> {
   const documentSymbols = await findSymbolForLine(file, zeroIndexedLine);
   const allFunctions = documentSymbols
@@ -125,5 +113,5 @@ async function getCallLocation(frame: DebugProtocol.StackFrame): Promise<CallLoc
 
 export async function getStacktraceInfo(): Promise<StackTraceInfo> {
   const stackFrames = await callDebugFunction('stackTrace', { threadId: debug.activeStackItem?.threadId ?? 1 });
-  return await Promise.all(stackFrames.stackFrames.map((frame, index) => getCallLocation(frame)));
+  return await Promise.all(stackFrames.stackFrames.map((frame) => getCallLocation(frame)));
 }

src/extension.ts

@@ -1,4 +1,4 @@
-import { commands, debug, ExtensionContext, Webview, WebviewPanel, window, workspace } from 'vscode';
+import { commands, debug, ExtensionContext, WebviewPanel, window, workspace } from 'vscode';
 import { ComlinkFrontendApi } from 'shared/src/index';
 import { getMonacoTheme } from './webview/themes';
 import { createWebview, getVueFrontendPanelContent } from './webview/content';
@@ -9,40 +9,27 @@ import { FrontendApi } from './debug/frontend-functions';
 
 let currentFrontendRpcChannel: Comlink.Remote<ComlinkFrontendApi> | undefined = undefined;
 
-async function updateViewWithStackTrace(_webview: Webview, _context: ExtensionContext) {
+async function updateViewWithStackTrace() {
   try {
     if (!currentFrontendRpcChannel) {
       throw new Error("No rpc channel found");
     }
     const result = await getStacktraceInfo();
     await currentFrontendRpcChannel.setStackTrace(result);
   } catch (e: unknown) {
-    // todo remove in release build!
     window.showErrorMessage("failed to load stacktrace, due to error, please try to open view again. Error: " + e);
   }
 }
 
+
 export async function activate(context: ExtensionContext) {
   let currentPanel: WebviewPanel | undefined = undefined;
   // started debug session
-  context.subscriptions.push(debug.onDidStartDebugSession(async (e) => {
-    if (currentPanel?.webview) {
-      await updateViewWithStackTrace(currentPanel.webview, context);
-    }
-  }));
-
+  context.subscriptions.push(debug.onDidStartDebugSession(updateViewWithStackTrace));
   // step into, step out, step over, change active stack item, change active debug session, receive custom event
-  context.subscriptions.push(debug.onDidChangeActiveStackItem(async (e) => {
-    if (currentPanel?.webview) {
-      await updateViewWithStackTrace(currentPanel.webview, context);
-    }
-  }));
-
-  context.subscriptions.push(debug.onDidChangeActiveDebugSession(async (e) => {
-    if (currentPanel?.webview) {
-      await updateViewWithStackTrace(currentPanel.webview, context);
-    }
-  }));
+  context.subscriptions.push(debug.onDidChangeActiveStackItem(updateViewWithStackTrace));
+  // stopped/started/changed debug session
+  context.subscriptions.push(debug.onDidChangeActiveDebugSession(updateViewWithStackTrace));
 
   workspace.onDidChangeConfiguration(async event => {
     if (event.affectsConfiguration('workbench.colorTheme')) {
@@ -51,6 +38,13 @@ export async function activate(context: ExtensionContext) {
     }
   });
 
+  function disposeRpcChannel() {
+    if (currentFrontendRpcChannel) {
+      currentFrontendRpcChannel[Comlink.releaseProxy]();
+      currentFrontendRpcChannel = undefined;
+    }
+  }
+
   commands.registerCommand('call-graph.show-call-graph', async () => {
     try {
       if (!currentPanel?.webview) {
@@ -69,17 +63,11 @@ export async function activate(context: ExtensionContext) {
 
       currentPanel.onDidDispose(() => {
         currentPanel = undefined;
-        if (currentFrontendRpcChannel) {
-          currentFrontendRpcChannel[Comlink.releaseProxy]();
-        }
-        currentFrontendRpcChannel = undefined;
+        disposeRpcChannel();
       });
 
       // release current channel if needed
-      if (currentFrontendRpcChannel) {
-        currentFrontendRpcChannel[Comlink.releaseProxy]();
-        currentFrontendRpcChannel = undefined;
-      }
+      disposeRpcChannel();
 
       currentFrontendRpcChannel = Comlink.wrap<ComlinkFrontendApi>(getComlinkChannel(currentPanel.webview, context));
 
@@ -88,7 +76,7 @@ export async function activate(context: ExtensionContext) {
 
 
       if (debug.activeDebugSession) {
-        await updateViewWithStackTrace(currentPanel.webview, context);
+        await updateViewWithStackTrace();
       } else {
         window.showWarningMessage('No active debug session, the view will automatically update when a debug session is started');
       }
@@ -99,7 +87,7 @@ export async function activate(context: ExtensionContext) {
 
 
   window.registerWebviewPanelSerializer('graph-visualization', {
-    deserializeWebviewPanel: async function (webviewPanel: WebviewPanel, state: unknown): Promise<void> {
+    deserializeWebviewPanel: async (webviewPanel: WebviewPanel, _state: unknown) => {
       currentPanel = webviewPanel;
       await commands.executeCommand('call-graph.show-call-graph');
     }

src/inspect/index.ts

@@ -4,10 +4,10 @@ import { getValueWithEvalMethod } from "./use-eval";
 import { getValueWithLookupMethod } from "./use-lookup";
 
 export async function getCurrentValueForPosition(uri: Uri, line: number, column: number, frameId: number): Promise<ValueLookupResult | undefined> {
-  const evalValue = await getValueWithEvalMethod(uri, line, column, frameId).catch(e => undefined);
+  const evalValue = await getValueWithEvalMethod(uri, line, column, frameId).catch(() => undefined);
   if (evalValue) {
     return evalValue;
   }
-  const lookupValue = await getValueWithLookupMethod(uri, line, column, frameId).catch(e => undefined);
+  const lookupValue = await getValueWithLookupMethod(uri, line, column, frameId).catch(() => undefined);
   return lookupValue;
 }

src/inspect/typed-debug.ts

@@ -17,12 +17,12 @@ export async function getVariablesRecursive(variableRef: number, maxRecursion =
   if (maxRecursion <= 0) {
     return [];
   }
-  const variablesResponse = await callDebugFunction('variables', { variablesReference: variableRef }).catch(e => ({ variables: [] }));
+  const variablesResponse = await callDebugFunction('variables', { variablesReference: variableRef }).catch(() => ({ variables: [] }));
   const results = await Promise.all(variablesResponse.variables.map(async (variable) => ({
     name: variable.name,
     value: variable.value,
     type: variable.type,
-    subVariables: await getVariablesRecursive(variable.variablesReference, maxRecursion - 1).catch(e => [])
+    subVariables: await getVariablesRecursive(variable.variablesReference, maxRecursion - 1).catch(() => [])
   } as VariableInfo)));
   return results;
 }

src/inspect/use-lookup.ts

@@ -1,5 +1,5 @@
 import { ValueLookupResult } from "shared/src";
-import { Uri, Position, debug, workspace, DebugSession, window } from "vscode";
+import { Uri, Position, debug, workspace, DebugSession } from "vscode";
 import { callDebugFunction, getVariablesRecursive } from "./typed-debug";
 
 export async function getValueWithLookupMethod(uri: Uri, line: number, column: number, frameId: number): Promise<ValueLookupResult> {

tsconfig.json

@@ -23,5 +23,8 @@
     "frontend/**/*", // Exclude the inner project
     "shared/**/*", // Exclude the shared project 
     "node_modules"
+  ],
+  "include": [
+    "src/**/*"
   ]
 }