Merge branch 'master' of gitlab.com:senx/vscode-warpscriptlanguage

Author: pi-r-p

package.json

@@ -12,7 +12,7 @@
   "author": "SenX <contact@senx.io>",
   "icon": "images/w.png",
   "license": "Apache-2.0",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "publisher": "senx",
   "engines": {
     "vscode": "^1.87.0"
@@ -139,14 +139,14 @@
           "group": "Warp 10"
         },
         {
-          "when": "resourceLangId == warpscript && config.warpscript.traceToken && senx.warpscript-language.loaded",
+          "when": "resourceLangId == warpscript && warpscript.showProfile && senx.warpscript-language.loaded",
           "command": "extension.profile",
           "group": "Warp 10"
         }
       ],
       "editor/title": [
         {
-          "when": "resourceLangId == warpscript && config.warpscript.traceToken && senx.warpscript-language.loaded",
+          "when": "resourceLangId == warpscript && warpscript.showProfile && senx.warpscript-language.loaded",
           "command": "extension.profile",
           "group": "navigation"
         },

src/extension.ts

@@ -42,6 +42,7 @@ import WSDiagnostics from './providers/wsDiagnostics';
 import { FileAccessor } from './debug/warp10DebugRuntime';
 import { Warp10DebugSession } from './debug/warp10Debug';
 import ProfilerCommand from './features/profiler';
+import WarpScriptParser from './warpScriptParser';
 
 export class SharedMem {
   private static registry: any = {};
@@ -149,8 +150,16 @@ export function activate(context: ExtensionContext) {
     let wsDiagnostics = new WSDiagnostics(context);
     wsDiagnostics.initializeDiagnostics();
 
-    //each time focus change, we look at the file type and file name. Json + special name => stack preview.
+    // each time focus change, we look at the file type and file name. Json + special name => stack preview.
     window.onDidChangeActiveTextEditor((textEditor: TextEditor | undefined) => {
+      let load = false;
+      if(textEditor?.document?.languageId === 'warpscript') {
+        const ws = textEditor.document.getText()
+        const commentsCommands = WarpScriptParser.extractSpecialComments(ws ?? "");
+        const endpoint = commentsCommands.endpoint ?? workspace.getConfiguration().get("warpscript.Warp10URL");
+        load = !!(workspace.getConfiguration().get<any>("warpscript.TraceTokensPerWarp10URL")?? {})[endpoint];
+      }
+      commands.executeCommand('setContext', 'warpscript.showProfile', load);
       StatusbarUi.Init();
       if (!WarpScriptExtGlobals.weAreClosingFilesFlag &&
         typeof textEditor !== 'undefined' &&

src/static/profile.ts

@@ -24,7 +24,7 @@ window.addEventListener('message', event => {
       Name: getName(p),
       Calls: p[4],
       'Total time': p[5] + ' ns',
-      'Time per call': Math.round(getPerCal(profile[5], profile[4]) * 100) / 100 + ' ns'
+      'Time per call': (Math.round(getPerCal(p[5], p[4]) * 100) / 100) + ' ns'
     }));
 
   document.getElementById('profile').addEventListener('mouseout', () => unhighlight());