@mirascript/monaco 0.1.44 → 0.1.45

package/dist/lsp/index.js

@@ -8,7 +8,7 @@ import {
   REG_ORDINAL_FULL,
   RESERVED_KEYWORDS,
   isKeyword
-} from "../chunk-QENEDDTR.js";
+} from "../chunk-LZVIYOSD.js";
 import {
   Emitter,
   MarkerSeverity,
@@ -18,7 +18,7 @@ import {
   Uri,
   editor,
   languages
-} from "../chunk-B45DYEY5.js";
+} from "../chunk-NAOKM25O.js";
 
 // src/lsp/providers/base.ts
 import { DefaultVmContext } from "@mirascript/mirascript/subtle";
@@ -49,11 +49,12 @@ import {
   parseDiagnostics,
   DiagnosticCode
 } from "@mirascript/mirascript/subtle";
-var LocalFunctionType = [DiagnosticCode.LocalFunction];
 var LocalVariableType = [
   DiagnosticCode.LocalMutable,
   DiagnosticCode.LocalImmutable,
-  DiagnosticCode.LocalConst
+  DiagnosticCode.LocalConst,
+  DiagnosticCode.LocalFunction,
+  DiagnosticCode.LocalModule
 ];
 var ParameterExplicitType = [
   DiagnosticCode.ParameterMutable,
@@ -77,7 +78,7 @@ var ParameterPlaceholderType = [
   ...ParameterPatternType,
   ...ParameterItType
 ];
-var LocalDefinitionType = [...LocalVariableType, ...LocalFunctionType, ...ParameterDefinitionType];
+var LocalDefinitionType = [...LocalVariableType, ...ParameterDefinitionType];
 var CompileResult = class {
   constructor(cacheKey, version, source, result) {
     this.cacheKey = cacheKey;
@@ -407,7 +408,7 @@ var CompileResult = class {
 };
 
 // src/lsp/diagnostics.ts
-import { DiagnosticCode as DiagnosticCode3, getDiagnosticMessage } from "@mirascript/mirascript/subtle";
+import { DiagnosticCode as DiagnosticCode3, getDiagnosticMessage, formatDiagnosticMessage } from "@mirascript/mirascript/subtle";
 
 // src/lsp/utils.ts
 import { DiagnosticCode as DiagnosticCode2 } from "@mirascript/constants";
@@ -745,25 +746,33 @@ function valueDoc(name, value, type, parent) {
     prefix = `${name}: `;
   }
   if (isVmModule(value)) {
-    const doc = `模块 \`${value.name}\``;
     let script;
     if (type === "declare") {
       const exports = value.keys();
-      script = "\n";
-      for (const k of exports) {
-        const v = value.get(k);
-        const vDoc = valueDoc(k, v, isVmModule(v) ? "field" : "declare", value);
-        const code = [...docComment(vDoc.doc), "pub " + vDoc.script, "", ""];
-        script += code.join("\n");
-      }
-      script = script.trimEnd();
+      if (!exports.length) {
+        script = `mod ${value.name} { }`;
+      } else {
+        script = `mod ${value.name} {
+`;
+        for (const k of exports) {
+          const v = value.get(k);
+          const vDoc = valueDoc(k, v, "declare", value);
+          const code = [...docComment(vDoc.doc), "pub " + vDoc.script];
+          const lines = code.flatMap((line) => line.split("\n"));
+          for (const line of lines) {
+            script += line ? "  " + line + "\n" : "\n";
+          }
+          script += "\n";
+        }
+        script = script.trimEnd() + "\n}";
+      }
     } else {
-      script = `(module) ${value.name}`;
+      script = `mod ${value.name}`;
       if (value.name !== name) {
         script = `${prefix}${script}`;
       }
     }
-    return { script, doc: doc ? [doc] : [] };
+    return { script, doc: [`模块 \`${value.name}\``] };
   }
   let valueStr = UNKNOWN_REPR;
   if (value !== void 0) {
@@ -838,12 +847,12 @@ function isDeprecatedGlobal(globals, name) {
 }
 
 // src/lsp/diagnostics.ts
-var formatMessage = (model, template, $0) => {
-  if (template.includes(`$0`)) {
-    const replacement = typeof $0 == "string" ? $0 : $0 ? model.getValueInRange($0) : "";
-    template = template.replaceAll(`$0`, replacement.replaceAll("$", "$$$$"));
-  }
-  return template;
+var formatMessage = (model, code, $0) => {
+  return formatDiagnosticMessage(code, () => {
+    if (!$0) return void 0;
+    if (typeof $0 == "string") return $0;
+    return model.getValueInRange($0);
+  });
 };
 var makeMarkerData = (model, range, code, message, severity, tags) => {
   const { startLineNumber, startColumn, endLineNumber, endColumn } = range;
@@ -851,8 +860,7 @@ var makeMarkerData = (model, range, code, message, severity, tags) => {
     if (typeof code != "number") {
       message = "";
     } else {
-      const template = getDiagnosticMessage(code);
-      message = template ? formatMessage(model, template, range) : "Unknown diagnostic";
+      message = formatMessage(model, code, range);
     }
   }
   const marker = {
@@ -941,9 +949,7 @@ async function makeModelMarkers(model, result) {
     for (const g of globals) {
       const { name } = g;
       if (!context.has(name)) {
-        const template = getDiagnosticMessage(DiagnosticCode3.GlobalVariableNotDeclared);
-        if (!template) continue;
-        const message = formatMessage(model, template, name);
+        const message = formatMessage(model, DiagnosticCode3.GlobalVariableNotDeclared, name);
         for (const ref of g.references) {
           markers.push(
             makeMarkerData(
@@ -961,9 +967,7 @@ async function makeModelMarkers(model, result) {
       if (deprecated) {
         const replacement = deprecated.use;
         if (replacement) {
-          const template = getDiagnosticMessage(deprecated.message);
-          if (!template) continue;
-          const message = formatMessage(model, template, replacement);
+          const message = formatMessage(model, deprecated.message, replacement);
           for (const ref of g.references) {
             markers.push(
               makeMarkerData(model, ref.range, deprecated.message, message, MarkerSeverity.Hint, [
@@ -1072,6 +1076,7 @@ async function compile(model) {
   const req = [cacheKey, version, value, mode];
   const res = USE_WORKER ? compileWorker(req) : compileSync(req);
   void res.then(async (result) => {
+    if (model.isDisposed()) return;
     const setModelMarkers = editor?.setModelMarkers;
     if (typeof setModelMarkers != "function") return;
     const markers = await makeModelMarkers(model, result);
@@ -1168,11 +1173,16 @@ async function getContextImpl(model, clearCache) {
 }
 var cachedContext = null;
 var Provider = class _Provider {
-  constructor() {
+  constructor(enabled = () => true) {
+    this.enabled = enabled;
     this.displayName = "MiraScript LSP";
     this._debugDisplayName = "MiraScript LSP";
     this._onDidChange = null;
   }
+  /** 是否启用 */
+  get isEnabled() {
+    return this.enabled();
+  }
   /** 设置全局变量提供者 */
   static setContextProvider(provider) {
     contextProvider = provider;
@@ -1187,6 +1197,7 @@ var Provider = class _Provider {
   }
   /** 获取编译结果 */
   async getCompileResult(model) {
+    if (!this.isEnabled) return void 0;
     return _Provider.getCompileResult(model);
   }
   /** 获取执行上下文（全局变量） */
@@ -1422,7 +1433,7 @@ var CodeLensProvider = class extends Provider {
     if (!result) return void 0;
     const lenses = [];
     for (const { definition, references } of result.groupedTags(model).locals) {
-      if (definition.code === DiagnosticCode5.LocalFunction) {
+      if (definition.code === DiagnosticCode5.LocalFunction || definition.code === DiagnosticCode5.LocalModule) {
         lenses.push({
           range: definition.range,
           command: {
@@ -1728,13 +1739,34 @@ var CompletionItemProvider = class extends Provider {
     this.triggerCharacters = [".", ":"];
   }
   /** 查找全局变量 */
-  async completeGlobal(model, char, locals, range) {
+  async completeGlobal(model, char, locals, range, hasGlobalPrefix) {
     const global = await this.getContext(model);
     const suggestions = [];
     const localKeys = new Set(locals.map((item) => item.insertText));
     for (const key of new Set(global.keys())) {
       if (!global.has(key)) continue;
       const element = global.get(key);
+      let prefix = key;
+      const edits = [];
+      if (!REG_IDENTIFIER_FULL.test(key)) {
+        const kStr = serialize2(key);
+        if (hasGlobalPrefix) {
+          prefix = `[${kStr}]`;
+          edits.push({
+            range: {
+              startLineNumber: range.replace.startLineNumber,
+              startColumn: range.replace.startColumn - 1,
+              endLineNumber: range.replace.endLineNumber,
+              endColumn: range.replace.endColumn
+            },
+            text: ""
+          });
+        } else {
+          prefix = `global[${serialize2(key)}]`;
+        }
+      } else if (!hasGlobalPrefix && (localKeys.has(key) || isKeyword(key))) {
+        prefix = `global.${key}`;
+      }
       if (isVmModule2(element)) {
         for (const f of element.keys()) {
           if (char && !f.toLowerCase().includes(char)) {
@@ -1743,9 +1775,10 @@ var CompletionItemProvider = class extends Provider {
           const field = element.get(f);
           if (field === void 0) continue;
           suggestions.push({
-            insertText: localKeys.has(key) || isKeyword(key) ? `global.${key}.${f}` : `${key}.${f}`,
+            insertText: `${prefix}.${f}`,
             filterText: filterText(f, char),
             range,
+            additionalTextEdits: edits,
             vmParent: element,
             ...completion(model, DESC_GLOBAL, `${key}.${f}`, field, void 0, true)
           });
@@ -1758,9 +1791,10 @@ var CompletionItemProvider = class extends Provider {
         continue;
       }
       suggestions.push({
-        insertText: localKeys.has(key) || isKeyword(key) ? `global.${key}` : REG_IDENTIFIER_FULL.test(key) ? key : `global[${serialize2(key)}]`,
+        insertText: prefix,
         filterText: filterText(key, char),
         range,
+        additionalTextEdits: edits,
         vmParent: global,
         ...completion(model, DESC_GLOBAL, key, element, void 0, false)
       });
@@ -1780,12 +1814,18 @@ var CompletionItemProvider = class extends Provider {
         if (char && !name.toLowerCase().includes(char)) continue;
         if (locals.has(name)) continue;
         locals.add(name);
-        suggestions.push({
+        const suggestion = {
           insertText: name,
           filterText: filterText(name, char),
           range,
           ...completion(model, DESC_LOCAL, name, void 0, fn, false)
-        });
+        };
+        if (definition.code === DiagnosticCode7.LocalModule) {
+          suggestion.kind = languages.CompletionItemKind.Module;
+        } else if (definition.code === DiagnosticCode7.LocalFunction) {
+          suggestion.kind = languages.CompletionItemKind.Function;
+        }
+        suggestions.push(suggestion);
       }
       if (!scope.parent) break;
       scope = scope.parent;
@@ -1849,7 +1889,13 @@ var CompletionItemProvider = class extends Provider {
           model,
           void 0,
           [],
-          void 0
+          this.toCompletionItemRanges(position, {
+            startLineNumber: position.lineNumber,
+            startColumn: position.column,
+            endLineNumber: position.lineNumber,
+            endColumn: position.column
+          }),
+          true
         );
         return { suggestions: globals2 };
       }
@@ -1907,7 +1953,7 @@ var CompletionItemProvider = class extends Provider {
     }
     const suggestions = COMMON_GLOBAL_SUGGESTIONS(completionRange, prev === "::");
     const locals = await this.completeLocal(model, position, char, completionRange);
-    const globals = await this.completeGlobal(model, char, locals, completionRange);
+    const globals = await this.completeGlobal(model, char, locals, completionRange, false);
     suggestions.push(...locals, ...globals);
     return { suggestions };
   }
@@ -1933,23 +1979,22 @@ ${def.doc.join("\n")}`
 
 // src/lsp/providers/definition-reference-provider.ts
 var DefinitionReferenceProvider = class extends Provider {
-  constructor(globalModel = editor.createModel(
-    ``,
-    "mirascript-doc",
-    Uri.parse("mirascript:///lib/global.mira")
-  )) {
-    super();
-    this.globalModel = globalModel;
+  /** 全局模型 */
+  get globalModel() {
+    if (!this._globalModel || this._globalModel.isDisposed()) {
+      this._globalModel = editor.createModel(``, "mirascript-doc", Uri.parse("mirascript:///lib/global.mira"));
+    }
+    return this._globalModel;
   }
   /** 准备要显示的定义 */
   async prepareGlobal(model, path) {
-    const { globalModel } = this;
     const globals = await this.getContext(model);
     const [name, ...access] = path;
     const [parent, value] = getDeep(globals, name, access);
     if (value === void 0) return void 0;
     const { script, doc } = valueDoc(path.at(-1), value, "declare", parent);
-    const code = ["", ...docComment(doc), script, ""];
+    const code = [...docComment(doc), script, ""];
+    const { globalModel } = this;
     globalModel.setValue(code.join("\n"));
     return {
       uri: globalModel.uri,
@@ -2303,6 +2348,11 @@ var HoverProvider = class extends Provider {
           };
           break;
         }
+        case DiagnosticCode10.LocalModule:
+          content = {
+            value: codeblock(`\0mod ${model.getValueInRange(tag.range)}`)
+          };
+          break;
         case DiagnosticCode10.LocalImmutable:
           content = {
             value: codeblock(`\0let ${model.getValueInRange(tag.range)}`)
@@ -2734,6 +2784,10 @@ var DocumentSemanticTokensProvider = class extends Provider {
           tokenType = 4 /* FUNCTION */;
           break;
         }
+        case DiagnosticCode13.LocalModule: {
+          tokenType = 5 /* MODULE */;
+          break;
+        }
         case DiagnosticCode13.ParameterMutable:
         case DiagnosticCode13.ParameterSubPatternMutable:
         case DiagnosticCode13.ParameterMutableRest: {
@@ -2789,6 +2843,9 @@ var DocumentSemanticTokensProvider = class extends Provider {
         });
       }
       for (const ref of references) {
+        if (ref.code === DiagnosticCode13.ExportedLocal) {
+          continue;
+        }
         data.push({
           row: ref.range.startLineNumber - 1,
           col: ref.range.startColumn - 1,
@@ -2933,45 +2990,52 @@ var SignatureHelpProvider = class extends Provider {
 };
 
 // src/lsp/index.ts
-async function registerLSP(contextProvider2) {
+async function registerLSP(contextProvider2, features = {}) {
   Provider.setContextProvider(contextProvider2);
   const { loadModule } = await import("@mirascript/bindings/wasm");
   await loadModule();
-  const codeActionProvider = new CodeActionProvider();
-  const codeLensProvider = new CodeLensProvider();
-  const colorProvider = new ColorProvider();
-  const completionItemProvider = new CompletionItemProvider();
-  const definitionReferenceProvider = new DefinitionReferenceProvider();
-  const documentHighlightProvider = new DocumentHighlightProvider();
-  const documentSymbolProvider = new DocumentSymbolProvider();
-  const formatterProvider = new FormatterProvider();
-  const hoverProvider = new HoverProvider();
-  const inlayHintsProvider = new InlayHintsProvider();
-  const rangeProvider = new RangeProvider();
-  const renameProvider = new RenameProvider();
-  const documentSemanticTokensProvider = new DocumentSemanticTokensProvider();
-  const signatureHelpProvider = new SignatureHelpProvider();
-  const language = ["mirascript", "mirascript-template"];
-  return [
-    languages.registerCodeActionProvider(language, codeActionProvider),
-    languages.registerCodeLensProvider(language, codeLensProvider),
-    languages.registerColorProvider(language, colorProvider),
-    languages.registerDefinitionProvider(language, definitionReferenceProvider),
-    languages.registerReferenceProvider(language, definitionReferenceProvider),
-    languages.registerDocumentHighlightProvider(language, documentHighlightProvider),
-    languages.registerDocumentSymbolProvider(language, documentSymbolProvider),
-    languages.registerDocumentFormattingEditProvider(language, formatterProvider),
-    // languages.registerDocumentRangeFormattingEditProvider(language, formatterProvider),
-    // languages.registerOnTypeFormattingEditProvider(language, formatterProvider),
-    languages.registerHoverProvider(language, hoverProvider),
-    languages.registerInlayHintsProvider(language, inlayHintsProvider),
-    languages.registerFoldingRangeProvider(language, rangeProvider),
-    languages.registerSelectionRangeProvider(language, rangeProvider),
-    languages.registerDocumentSemanticTokensProvider(language, documentSemanticTokensProvider),
-    languages.registerRenameProvider(language, renameProvider),
-    languages.registerCompletionItemProvider(language, completionItemProvider),
-    languages.registerSignatureHelpProvider(language, signatureHelpProvider)
-  ];
+  const disposables = [];
+  const registerIfEnabled = (feature, provider, register) => {
+    const providerInstance = new provider(() => features[feature] !== false);
+    const d = register(["mirascript", "mirascript-template"], providerInstance);
+    if (Array.isArray(d)) disposables.push(...d);
+    else disposables.push(d);
+  };
+  registerIfEnabled("codeAction", CodeActionProvider, languages.registerCodeActionProvider);
+  registerIfEnabled("codeLens", CodeLensProvider, languages.registerCodeLensProvider);
+  registerIfEnabled("color", ColorProvider, languages.registerColorProvider);
+  registerIfEnabled("definitionReference", DefinitionReferenceProvider, (language, provider) => {
+    return [
+      languages.registerDefinitionProvider(language, provider),
+      languages.registerReferenceProvider(language, provider)
+    ];
+  });
+  registerIfEnabled("documentHighlight", DocumentHighlightProvider, languages.registerDocumentHighlightProvider);
+  registerIfEnabled("documentSymbol", DocumentSymbolProvider, languages.registerDocumentSymbolProvider);
+  registerIfEnabled("formatter", FormatterProvider, (language, provider) => {
+    return [
+      languages.registerDocumentFormattingEditProvider(language, provider)
+      // languages.registerDocumentRangeFormattingEditProvider(language, provider),
+      // languages.registerOnTypeFormattingEditProvider(language, provider),
+    ];
+  });
+  registerIfEnabled("hover", HoverProvider, languages.registerHoverProvider);
+  registerIfEnabled("inlayHints", InlayHintsProvider, languages.registerInlayHintsProvider);
+  registerIfEnabled("range", RangeProvider, (language, provider) => {
+    return [
+      languages.registerFoldingRangeProvider(language, provider),
+      languages.registerSelectionRangeProvider(language, provider)
+    ];
+  });
+  registerIfEnabled(
+    "documentSemanticTokens",
+    DocumentSemanticTokensProvider,
+    languages.registerDocumentSemanticTokensProvider
+  );
+  registerIfEnabled("rename", RenameProvider, languages.registerRenameProvider);
+  registerIfEnabled("completionItem", CompletionItemProvider, languages.registerCompletionItemProvider);
+  registerIfEnabled("signatureHelp", SignatureHelpProvider, languages.registerSignatureHelpProvider);
+  return disposables;
 }
 export {
   CodeActionProvider,