@duet3d/monacotokens 3.7.0-alpha.2 → 3.7.0-alpha.3

package/dist/register.d.ts

@@ -1,6 +1,13 @@
 import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
 /**
- * Register all Duet-specific languages (gcode-fdm, gcode-cnc, STM32, menu)
- * with a Monaco instance, attaching their tokenizers and language configurations.
+ * Register all Duet-specific languages (gcode-fdm, gcode-cnc, stm32, menu) with a Monaco instance,
+ * attaching their tokenizers, language configurations, and (for gcode) completion + hover providers.
  */
-export declare function registerDuetLanguages(monacoInstance: typeof monaco): void;
+export declare function registerDuetLanguages(monacoInstance: typeof monaco): monaco.IDisposable[];
+/**
+ * Wire up every per-editor Gcode feature in one call: the search action, signature-help watcher, deprecation
+ * decorations for codes / parameters and object-model paths, and the local-variable scanner. Intended to
+ * replace the separate attach/add calls at the call site. Returns a single IDisposable that releases all of
+ * them when disposed.
+ */
+export declare function attachGcodeFeatures(monacoInstance: typeof monaco, editor: monaco.editor.IStandaloneCodeEditor): monaco.IDisposable;

package/dist/register.js

@@ -1,12 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerDuetLanguages = registerDuetLanguages;
+exports.attachGcodeFeatures = attachGcodeFeatures;
 const monaco_gcode_1 = require("./monaco-gcode");
 const monaco_stm32_1 = require("./monaco-stm32");
 const monaco_menu_1 = require("./monaco-menu");
+const providers_1 = require("./providers");
+const local_variables_1 = require("./gcodes/local-variables");
+const search_1 = require("./gcodes/search");
 /**
- * Register all Duet-specific languages (gcode-fdm, gcode-cnc, STM32, menu)
- * with a Monaco instance, attaching their tokenizers and language configurations.
+ * Override Monaco's built-in `vs` and `vs-dark` themes to map the tokens our tokenizer emits to VSCode's
+ * TextMate-scope colours (Monaco standalone's defaults otherwise lack a dedicated "function" colour). Called
+ * once by `registerDuetLanguages`; uses `inherit: true` so the base theme's other colours stay in place.
+ */
+function applyDuetThemeOverrides(monacoInstance) {
+    monacoInstance.editor.defineTheme("vs-dark", {
+        base: "vs-dark",
+        inherit: true,
+        rules: [
+            // VSCode Dark+ entity.name.function / support.function colour
+            { token: "support.function", foreground: "DCDCAA" }
+        ],
+        colors: {}
+    });
+    monacoInstance.editor.defineTheme("vs", {
+        base: "vs",
+        inherit: true,
+        rules: [
+            // VSCode Light+ entity.name.function / support.function colour
+            { token: "support.function", foreground: "795E26" }
+        ],
+        colors: {}
+    });
+}
+/**
+ * Register all Duet-specific languages (gcode-fdm, gcode-cnc, stm32, menu) with a Monaco instance,
+ * attaching their tokenizers, language configurations, and (for gcode) completion + hover providers.
  */
 function registerDuetLanguages(monacoInstance) {
     monacoInstance.languages.register({ id: "gcode-fdm" });
@@ -15,10 +44,34 @@ function registerDuetLanguages(monacoInstance) {
     monacoInstance.languages.register({ id: "gcode-cnc" });
     monacoInstance.languages.setMonarchTokensProvider("gcode-cnc", monaco_gcode_1.gcodeCNCLanguage);
     monacoInstance.languages.setLanguageConfiguration("gcode-cnc", monaco_gcode_1.gcodeLanguageConfiguration);
-    monacoInstance.languages.register({ id: "STM32" });
-    monacoInstance.languages.setMonarchTokensProvider("STM32", monaco_stm32_1.stm32Language);
-    monacoInstance.languages.setLanguageConfiguration("STM32", monaco_stm32_1.stm32LanguageConfiguration);
+    monacoInstance.languages.register({ id: "stm32" });
+    monacoInstance.languages.setMonarchTokensProvider("stm32", monaco_stm32_1.stm32Language);
+    monacoInstance.languages.setLanguageConfiguration("stm32", monaco_stm32_1.stm32LanguageConfiguration);
     monacoInstance.languages.register({ id: "menu" });
     monacoInstance.languages.setMonarchTokensProvider("menu", monaco_menu_1.menuLanguage);
     monacoInstance.languages.setLanguageConfiguration("menu", monaco_menu_1.menuLanguageConfiguration);
+    applyDuetThemeOverrides(monacoInstance);
+    return (0, providers_1.registerDuetProviders)(monacoInstance);
+}
+/**
+ * Wire up every per-editor Gcode feature in one call: the search action, signature-help watcher, deprecation
+ * decorations for codes / parameters and object-model paths, and the local-variable scanner. Intended to
+ * replace the separate attach/add calls at the call site. Returns a single IDisposable that releases all of
+ * them when disposed.
+ */
+function attachGcodeFeatures(monacoInstance, editor) {
+    const disposables = [
+        (0, search_1.addGcodeSearchAction)(monacoInstance, editor),
+        (0, providers_1.attachGcodeSignatureHelpWatcher)(editor),
+        (0, providers_1.attachGcodeDeprecationDecorations)(editor),
+        (0, providers_1.attachObjectModelDeprecationDecorations)(editor),
+        (0, local_variables_1.attachLocalVariableScanner)(editor)
+    ];
+    return {
+        dispose() {
+            for (const d of disposables) {
+                d.dispose();
+            }
+        }
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-alpha.2",
+  "version": "3.7.0-alpha.3",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,5 +26,13 @@
   ],
   "dependencies": {
     "monaco-editor": "^0.55.1"
+  },
+  "peerDependencies": {
+    "@duet3d/objectmodel": ">=3.6.0"
+  },
+  "peerDependenciesMeta": {
+    "@duet3d/objectmodel": {
+      "optional": true
+    }
   }
 }