@duet3d/monacotokens 3.7.0-rc.3 → 3.7.0

package/dist/monaco-gcode.js

@@ -13,6 +13,8 @@ function generateMonarchLanguage(fdmMode) {
         flowExprKeywords: ["if", "elif", "while"],
         // Flow-control keywords that stand alone - render in the same purple as flowExprKeywords
         flowNoArgKeywords: ["else", "break", "continue"],
+        // Standalone keywords that don't affect control flow - render as regular keywords (blue)
+        noArgKeywords: ["skip"],
         varKeywords: ["global", "var"],
         symbols: /[=><!~?:&|+\-*#\/\^%]+/,
         operators: ['*', '/', '+', '-', "==", "!=", '=', "<=", '<', ">=", ">>>", ">>", '>', '!', "&&", '&', "||", '|', '^', '?', ':'],
@@ -38,6 +40,7 @@ function generateMonarchLanguage(fdmMode) {
                             "@keywords": { token: "keyword", next: "@lineExpression" },
                             "@flowExprKeywords": { token: "keyword.flow", next: "@lineExpression" },
                             "@flowNoArgKeywords": { token: "keyword.flow" },
+                            "@noArgKeywords": { token: "keyword" },
                             "@varKeywords": { token: "keyword", next: "varName" }
                         }
                     }],

package/dist/providers.js

@@ -304,25 +304,24 @@ function isInsideStringLiteral(beforeCursor) {
     }
     return inString;
 }
-/** Walk `beforeCursor` and report whether the cursor sits past an unescaped `;` line comment marker. */
-function isInsideLineComment(beforeCursor) {
-    let inString = false;
-    for (let i = 0; i < beforeCursor.length; i++) {
-        const ch = beforeCursor[i];
-        if (inString) {
-            if (ch === "\"") {
-                inString = false;
-            }
-            continue;
-        }
-        if (ch === "\"") {
-            inString = true;
-        }
-        else if (ch === ";") {
-            return true;
+/**
+ * Report whether the character at zero-based `offset` of a line is part of a comment, as classified by the
+ * language's own tokenizer - so `;` comments and the CNC-only `(...)` comments are both covered. Lines are
+ * tokenized in isolation, which is safe because every tokenizer state pops at end-of-line.
+ */
+function isCommentAt(monacoInstance, model, lineNumber, offset) {
+    if (offset < 0) {
+        return false;
+    }
+    const tokens = monacoInstance.editor.tokenize(model.getLineContent(lineNumber), model.getLanguageId())[0] ?? [];
+    let type = "";
+    for (const token of tokens) {
+        if (token.offset > offset) {
+            break;
         }
+        type = token.type;
     }
-    return false;
+    return type.startsWith("comment");
 }
 /**
  * Detect whether the cursor sits inside an RRF expression context:
@@ -385,7 +384,8 @@ const metaKeywords = [
     { keyword: "var", syntax: "var <name> = <expression>", description: "Declare a local variable" },
     { keyword: "global", syntax: "global <name> = <expression>", description: "Declare a global variable" },
     { keyword: "abort", syntax: "abort [<message>]", description: "Abort the running macro / queued moves with an optional message" },
-    { keyword: "echo", syntax: "echo <expression>", description: "Print an expression to the response channel" }
+    { keyword: "echo", syntax: "echo <expression>", description: "Print an expression to the response channel" },
+    { keyword: "skip", syntax: "skip", description: "Do nothing" }
 ];
 /**
  * Find the closest G/M/T-code to the left of `column` on the given line.
@@ -810,6 +810,10 @@ export function registerProvidersFor(monacoInstance, languageId) {
     disposables.push(monacoInstance.languages.registerCompletionItemProvider(languageId, {
         triggerCharacters: ["G", "M", "T", "g", "m", "t", " ", "{", ".", "=", "!", "\""],
         provideCompletionItems: (model, position, context) => {
+            // Trigger characters bypass Monaco's quickSuggestions.comments gate, so check the token ourselves
+            if (isCommentAt(monacoInstance, model, position.lineNumber, position.column - 2)) {
+                return { suggestions: [] };
+            }
             const lineContent = model.getLineContent(position.lineNumber);
             const beforeCursor = lineContent.substring(0, position.column - 1);
             // A manual Ctrl+Space (Invoke) always shows the list; an auto-trigger (TriggerCharacter or
@@ -1036,10 +1040,10 @@ export function registerProvidersFor(monacoInstance, languageId) {
             if (isInsideStringLiteral(beforeCursor)) {
                 return null;
             }
-            // Cursor past a `;` on the same line: we're inside a line comment (e.g. after bksp joins a line
-            // onto a previous commented line like "M106 P1 S255 ; note"). No signature help applies there,
-            // and without this guard Monaco would keep the previous parameter's tooltip floating over prose.
-            if (isInsideLineComment(beforeCursor)) {
+            // Cursor inside a comment (e.g. after bksp joins a line onto a previous commented line like
+            // "M106 P1 S255 ; note"). No signature help applies there, and without this guard Monaco would
+            // keep the previous parameter's tooltip floating over prose.
+            if (isCommentAt(monacoInstance, model, position.lineNumber, position.column - 2)) {
                 return null;
             }
             // In an expression context the only meaningful signature help is the enclosing function call -
@@ -1231,6 +1235,10 @@ export function registerProvidersFor(monacoInstance, languageId) {
         provideHover: async (model, position) => {
             const lineContent = model.getLineContent(position.lineNumber);
             const word = model.getWordAtPosition(position);
+            // Comment text may contain G/M-code letters that would otherwise match
+            if (isCommentAt(monacoInstance, model, position.lineNumber, (word ? word.startColumn : position.column) - 1)) {
+                return null;
+            }
             if (!word) {
                 // No identifier-shaped word under the cursor (e.g. cursor on `*` in `M586 C"*"`, on `?` etc.).
                 // Try to resolve the cursor as a parameter value position via findParameterAtCursor; if it
@@ -1258,12 +1266,6 @@ export function registerProvidersFor(monacoInstance, languageId) {
             // prevents `"M104 done"` style false matches lives down at the wordIsCode branch
             const beforeWordForString = lineContent.substring(0, word.startColumn - 1);
             const insideString = isInsideStringLiteral(beforeWordForString);
-            // Suppress hover inside `;` line-comments - the tokeniser colours them as comments but the hover
-            // provider runs independently and would otherwise match G/M-code letters that appear in comment text
-            const semi = lineContent.indexOf(";");
-            if (semi >= 0 && word.startColumn - 1 >= semi) {
-                return null;
-            }
             // Determine up-front whether the word sits inside an expression context - used to route hover between
             // the gcode-parameter flavour (outside expressions) and the function/constant flavour (inside)
             const beforeWord = lineContent.substring(0, word.startColumn - 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-rc.3",
+  "version": "3.7.0",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "type": "module",
   "main": "dist/index.js",
@@ -26,17 +26,17 @@
   },
   "homepage": "https://github.com/Duet3D/MonacoTokens#readme",
   "peerDependencies": {
-    "@duet3d/objectmodel": "~3.7.0-beta.2",
-    "monaco-editor-core": "^0.56.0",
-    "monaco-editor": "^0.56.0"
+    "@duet3d/objectmodel": "~3.7.0",
+    "monaco-editor-core": "^0.57.0",
+    "monaco-editor": "^0.57.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor-core": { "optional": true },
     "monaco-editor": { "optional": true }
   },
   "devDependencies": {
-    "@duet3d/objectmodel": "~3.7.0-beta.6",
-    "monaco-editor-core": "^0.56.0",
+    "@duet3d/objectmodel": "~3.7.0",
+    "monaco-editor-core": "^0.57.0",
     "typescript": "^7.0.2"
   },
   "files": [