@duet3d/monacotokens 3.7.0-alpha.12 → 3.7.0-alpha.13

package/dist/gcodes/gcodes.json

@@ -5394,51 +5394,87 @@
                 "description": "Kinematics type (name)",
                 "values": [
                     {
-                        "value": "cartesian",
+                        "value": [
+                            "cartesian",
+                            "0"
+                        ],
                         "description": "Cartesian"
                     },
                     {
-                        "value": "coreXY",
+                        "value": [
+                            "coreXY",
+                            "1"
+                        ],
                         "description": "CoreXY"
                     },
                     {
-                        "value": "coreXZ",
+                        "value": [
+                            "coreXZ",
+                            "2"
+                        ],
                         "description": "CoreXZ"
                     },
                     {
-                        "value": "linearDelta",
+                        "value": [
+                            "linearDelta",
+                            "3"
+                        ],
                         "description": "Linear delta"
                     },
                     {
-                        "value": "scara",
+                        "value": [
+                            "scara",
+                            "4"
+                        ],
                         "description": "Serial SCARA"
                     },
                     {
-                        "value": "coreXYU",
+                        "value": [
+                            "coreXYU",
+                            "5"
+                        ],
                         "description": "CoreXYU"
                     },
                     {
-                        "value": "hangprinter",
+                        "value": [
+                            "hangprinter",
+                            "6"
+                        ],
                         "description": "Hangprinter"
                     },
                     {
-                        "value": "polar",
+                        "value": [
+                            "polar",
+                            "7"
+                        ],
                         "description": "Polar"
                     },
                     {
-                        "value": "coreXYUV",
+                        "value": [
+                            "coreXYUV",
+                            "8"
+                        ],
                         "description": "CoreXYUV"
                     },
                     {
-                        "value": "fiveBarScara",
+                        "value": [
+                            "fiveBarScara",
+                            "9"
+                        ],
                         "description": "Five-bar parallel SCARA"
                     },
                     {
-                        "value": "rotaryDelta",
+                        "value": [
+                            "rotaryDelta",
+                            "10"
+                        ],
                         "description": "Rotary delta"
                     },
                     {
-                        "value": "markForged",
+                        "value": [
+                            "markForged",
+                            "11"
+                        ],
                         "description": "Markforged"
                     }
                 ]

package/dist/gcodes/index.d.ts

@@ -2,8 +2,11 @@
  * One enumerated value of a parameter (e.g. "1" for G1 H meaning "Stop on endstop")
  */
 export interface GcodeParameterValue {
-    /** Literal value as it appears in source (e.g. "0", "1", "-1") */
-    value: string;
+    /**
+     * Literal value as it appears in source (e.g. "0", "1", "-1"). An array lists equivalent literals that mean
+     * the same thing, e.g. M669 K accepts both the kinematics name and its legacy number ("coreXY" and "1").
+     */
+    value: string | string[];
     /** Human-readable meaning */
     description: string;
 }

package/dist/providers.js

@@ -80,6 +80,54 @@ function lookupParameter(info, letter) {
     const found = info.parameters.find(p => p.letter === letter);
     return found ?? makeAxisParameter(info, letter);
 }
+/**
+ * Collect the canonical parameter letters present at the top level of a code's argument segment, in order. Letters
+ * inside "..." strings or {...} expressions are skipped because they belong to a value, not to a parameter - e.g.
+ * the `g` in `M98 P"check-filament.g"` and any argument passed on to a macro must not be mistaken for parameters.
+ * A leading apostrophe is honoured so a lower-case axis (`'a`) stays distinct from the upper-case letter.
+ */
+function scanParameterLetters(segment) {
+    const letters = [];
+    let inString = false;
+    let braceDepth = 0;
+    for (let i = 0; i < segment.length; i++) {
+        const ch = segment[i];
+        if (inString) {
+            if (ch === "\"") {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === "\"") {
+            inString = true;
+            continue;
+        }
+        if (ch === "{") {
+            braceDepth++;
+            continue;
+        }
+        if (ch === "}") {
+            if (braceDepth > 0) {
+                braceDepth--;
+            }
+            continue;
+        }
+        if (braceDepth > 0) {
+            continue;
+        }
+        if (ch === ";") {
+            break;
+        }
+        if (/[A-Za-z]/.test(ch)) {
+            const prev = i > 0 ? segment[i - 1] : "";
+            const next = i + 1 < segment.length ? segment[i + 1] : "";
+            if (!/[A-Za-z]/.test(prev) && !/[A-Za-z]/.test(next)) {
+                letters.push(canonicalAxisLetter(prev === "'" ? prev + ch : ch));
+            }
+        }
+    }
+    return letters;
+}
 /**
  * Find the enclosing function call (if any) for the cursor position. Walks back from the end of `beforeCursor`
  * keeping track of paren depth so that `max(a, min(b,|` correctly reports `min` with argIndex 1, not `max`.
@@ -676,7 +724,8 @@ function buildParameterDoc(info, p) {
     if (p.values && p.values.length > 0) {
         md += "\n\n**Values:**";
         for (const v of p.values) {
-            md += `\n- \`${v.value}\` - ${v.description}`;
+            const literals = (Array.isArray(v.value) ? v.value : [v.value]).map((x) => `\`${x}\``).join(" / ");
+            md += `\n- ${literals} - ${v.description}`;
         }
     }
     const deprecationNote = p.deprecated ?? info.deprecated;
@@ -936,12 +985,7 @@ export function registerProvidersFor(monacoInstance, languageId) {
                     // just typed it, Monaco should show nothing (so the widget auto-closes) rather than list
                     // the very letter that was just typed as the only match
                     const fullTail = lineContent.substring(code.startColumn - 1 + code.code.length);
-                    const used = new Set();
-                    const re = /(?<![A-Za-z])'?[A-Za-z](?![A-Za-z])/g;
-                    let m;
-                    while ((m = re.exec(fullTail)) !== null) {
-                        used.add(canonicalAxisLetter(m[0]));
-                    }
+                    const used = new Set(scanParameterLetters(fullTail));
                     const triggerHints = { id: "editor.action.triggerParameterHints", title: "Trigger Parameter Hints" };
                     const suggestions = info.parameters
                         .filter(p => !used.has(p.letter))
@@ -1087,11 +1131,10 @@ export function registerProvidersFor(monacoInstance, languageId) {
             // for codes with a unprecedentedParameter, sit on slot 0 while the user is typing that value (no parameter letter typed yet)
             const tail = tailForDismissal;
             let activeParameter = -1;
-            const seen = tail.match(/(?<![A-Za-z])'?[A-Za-z](?![A-Za-z])/g);
+            const seen = scanParameterLetters(tail);
             const unprecedentedOffset = info.unprecedentedParameter ? 1 : 0;
-            if (seen && seen.length > 0) {
-                const rawLast = seen[seen.length - 1];
-                const last = canonicalAxisLetter(rawLast);
+            if (seen.length > 0) {
+                const last = seen[seen.length - 1];
                 const idx = info.parameters.findIndex(p => p.letter === last);
                 if (idx >= 0) {
                     activeParameter = idx + unprecedentedOffset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-alpha.12",
+  "version": "3.7.0-alpha.13",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "type": "module",
   "main": "dist/index.js",