@mirascript/monaco 0.1.89 → 0.1.91

package/dist/lsp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lsp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,8BAA8B,EAC9B,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,QAAQ,GACX,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,cAAc,EAAE,sBAAsB,CAAC;IACvC,mBAAmB,EAAE,2BAA2B,CAAC;IACjD,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,cAAc,EAAE,sBAAsB,CAAC;IACvC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,sBAAsB,EAAE,8BAA8B,CAAC;IACvD,aAAa,EAAE,qBAAqB,CAAC;CACxC,CAAC;AAEF,aAAa;AACb,MAAM,MAAM,iBAAiB,GAAG;KAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS;CAAE,CAAC;AAEnF,sBAAsB;AACtB,wBAAsB,WAAW,CAC7B,eAAe,EAAE,iBAAiB,GAAG,SAAS,EAC9C,QAAQ,GAAE,iBAAsB,GACjC,OAAO,CAAC,WAAW,EAAE,CAAC,CA0DxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lsp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,8BAA8B,EAC9B,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,QAAQ,GACX,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,cAAc,EAAE,sBAAsB,CAAC;IACvC,mBAAmB,EAAE,2BAA2B,CAAC;IACjD,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,cAAc,EAAE,sBAAsB,CAAC;IACvC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,sBAAsB,EAAE,8BAA8B,CAAC;IACvD,aAAa,EAAE,qBAAqB,CAAC;CACxC,CAAC;AAEF,aAAa;AACb,MAAM,MAAM,iBAAiB,GAAG;KAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS;CAAE,CAAC;AAEnF,sBAAsB;AACtB,wBAAsB,WAAW,CAC7B,eAAe,EAAE,iBAAiB,GAAG,SAAS,EAC9C,QAAQ,GAAE,iBAAsB,GACjC,OAAO,CAAC,WAAW,EAAE,CAAC,CAyDxB"}

package/dist/lsp/index.js

@@ -989,118 +989,139 @@ async function makeModelMarkers(model, result) {
 
 // src/lsp/worker-helper.ts
 var cache = /* @__PURE__ */ new Map();
-var worker = void 0;
+var worker;
+var requestSequence = 0;
 var CACHE_MAX_AGE = 3e4;
 setInterval(() => {
   const now = Date.now();
   for (const [key, { lastAccess }] of cache) {
-    if (now - lastAccess > CACHE_MAX_AGE) {
-      cache.delete(key);
-    }
+    if (now - lastAccess > CACHE_MAX_AGE) cache.delete(key);
   }
 }, CACHE_MAX_AGE);
-async function compileWorker(req) {
+function nextRequestId() {
+  requestSequence = (requestSequence + 1) % Number.MAX_SAFE_INTEGER;
+  return requestSequence;
+}
+function modeOf(model) {
+  return model.getLanguageId() === "mirascript-template" ? "Template" : "Script";
+}
+async function getWorker() {
   if (!worker) {
-    const w = new Worker(new URL("#lsp/worker", import.meta.url), {
+    const instance = new Worker(new URL("#lsp/worker", import.meta.url), {
       type: "module",
       name: "@mirascript/lsp-server"
     });
     worker = new Promise((resolve, reject) => {
-      const onError = (e) => {
+      const timeout = setTimeout(() => {
         cleanUp();
-        reject(new Error(`Worker failed to start: ${e.message}`));
+        reject(new Error("Worker did not respond in time"));
+      }, 3e4);
+      const cleanUp = () => {
+        clearTimeout(timeout);
+        instance.removeEventListener("error", onError);
+        instance.removeEventListener("message", onMessage);
       };
-      const onMessage = (e) => {
-        if (e.data === "mirascript lsp ready") {
-          cleanUp();
-          resolve(w);
-        } else if (e.data instanceof Error) {
-          cleanUp();
-          reject(e.data);
-        }
+      const onError = (event) => {
+        cleanUp();
+        reject(new Error(`Worker failed to start: ${event.message}`));
       };
-      w.addEventListener("error", onError);
-      w.addEventListener("message", onMessage);
-      const cleanUp = () => {
-        w.removeEventListener("error", onError);
-        w.removeEventListener("message", onMessage);
+      const onMessage = (event) => {
+        if (event.data !== "mirascript lsp ready") return;
+        cleanUp();
+        resolve(instance);
       };
-      setTimeout(() => {
-        onError(new ErrorEvent("error", { message: "Worker did not respond in time" }));
-      }, 3e4);
+      instance.addEventListener("error", onError);
+      instance.addEventListener("message", onMessage);
     });
   }
-  try {
-    await worker;
-  } catch (ex) {
-    console.error("Failed to initialize worker, use sync compile:", ex);
-    USE_WORKER = false;
-    return compileSync(req);
-  }
-  const instance = await worker;
-  instance.postMessage(req);
-  const [key, version, source] = req;
-  const [_key, _version, result] = await new Promise((resolve, reject) => {
-    const onMessage = (e) => {
-      if (!(e.data[0] === key && e.data[1] === version)) {
-        return;
-      }
+  return worker;
+}
+async function requestWorker(request) {
+  const instance = await getWorker();
+  return new Promise((resolve) => {
+    const onMessage = (event) => {
+      if (event.data?.id !== request.id) return;
       instance.removeEventListener("message", onMessage);
-      if (e.data[2] instanceof Error) {
-        reject(e.data[2]);
-      } else {
-        resolve(e.data);
-      }
+      resolve(event.data);
     };
     instance.addEventListener("message", onMessage);
+    instance.postMessage(request);
   });
-  return new CompileResult(key, version, source, result);
 }
 var compileImpl;
-async function compileSync(req) {
-  const [key, version, script, mode] = req;
-  if (compileImpl == null) {
-    const mod = await import("../worker-core-MG2FDDNN.js");
-    compileImpl = mod.compile;
-  }
-  const result = compileImpl(script, mode);
-  return new CompileResult(key, version, script, result);
+async function compileSync(request) {
+  compileImpl ??= (await import("../worker-core-IBUPKM67.js")).compile;
+  const result = compileImpl(request.script, request.mode);
+  return new CompileResult(request.key, request.version, request.script, result);
+}
+async function compileWorker(request) {
+  try {
+    const response = await requestWorker(request);
+    if (!response.ok) throw new Error(response.error);
+    if (response.kind !== "compile") throw new Error("Unexpected formatter response to compile request");
+    return new CompileResult(request.key, request.version, request.script, response.result);
+  } catch (error) {
+    console.error("Failed to use MiraScript worker, falling back to the current thread:", error);
+    USE_WORKER = false;
+    worker = void 0;
+    return compileSync(request);
+  }
 }
 var USE_WORKER = typeof Worker === "function";
 async function compile(model) {
   const version = model.getVersionId();
-  const mode = model.getLanguageId() === "mirascript-template" ? "Template" : "Script";
-  const cacheKey = model.id;
-  const cached = cache.get(cacheKey);
+  const mode = modeOf(model);
+  const key = model.id;
+  const cached = cache.get(key);
   if (cached?.version === version && cached.mode === mode) {
     cached.lastAccess = Date.now();
     return cached.result;
   }
-  const value = model.getValue();
-  const req = [cacheKey, version, value, mode];
-  const res = USE_WORKER ? compileWorker(req) : compileSync(req);
-  void res.then(async (result) => {
+  const script = model.getValue();
+  const request = { kind: "compile", id: nextRequestId(), key, version, script, mode };
+  const result = USE_WORKER ? compileWorker(request) : compileSync(request);
+  void result.then(async (compiled) => {
     if (model.isDisposed()) return;
     const setModelMarkers = editor?.setModelMarkers;
-    if (typeof setModelMarkers != "function") return;
-    const markers = await makeModelMarkers(model, result);
-    if (!markers) return;
-    setModelMarkers(model, "mirascript", markers);
+    if (typeof setModelMarkers !== "function") return;
+    const markers = await makeModelMarkers(model, compiled);
+    if (markers) setModelMarkers(model, "mirascript", markers);
   });
-  const item = {
-    version,
-    lastAccess: Date.now(),
-    mode,
-    result: res
-  };
-  cache.set(cacheKey, item);
-  res.catch(() => {
-    const current = cache.get(cacheKey);
-    if (current === item) {
-      cache.delete(cacheKey);
-    }
+  const item = { version, lastAccess: Date.now(), mode, result };
+  cache.set(key, item);
+  result.catch(() => {
+    if (cache.get(key) === item) cache.delete(key);
   });
-  return res;
+  return result;
+}
+var formatImpl;
+async function formatModel(model, ranges, options) {
+  const request = {
+    kind: "format",
+    id: nextRequestId(),
+    key: model.id,
+    version: model.getVersionId(),
+    script: model.getValue(),
+    mode: modeOf(model),
+    ranges,
+    options
+  };
+  if (!USE_WORKER) {
+    formatImpl ??= (await import("../worker-core-IBUPKM67.js")).formatSource;
+    return formatImpl(request.script, request.mode, request.options, request.ranges);
+  }
+  try {
+    const response = await requestWorker(request);
+    if (!response.ok) throw new Error(response.error);
+    if (response.kind !== "format") throw new Error("Unexpected compile response to format request");
+    return response.result;
+  } catch (error) {
+    console.error("Failed to use MiraScript worker, formatting on the current thread:", error);
+    USE_WORKER = false;
+    worker = void 0;
+    formatImpl ??= (await import("../worker-core-IBUPKM67.js")).formatSource;
+    return formatImpl(request.script, request.mode, request.options, request.ranges);
+  }
 }
 
 // src/lsp/providers/base.ts
@@ -2234,49 +2255,61 @@ var DocumentSymbolProvider = class extends Provider {
 };
 
 // src/lsp/providers/formatter-provider.ts
-async function format(model, ranges, options, hint, token) {
-  if (hint !== "full") return [];
-  const compiled = await Provider.getCompileResult(model);
-  if (compiled?.result.formatted == null) return [];
-  return [
-    {
-      range: model.getFullModelRange(),
-      text: compiled.result.formatted
-    }
-  ];
+import { parseDiagnostics as parseDiagnostics2 } from "@mirascript/mirascript/subtle";
+var DEFAULT_PRINT_WIDTH = 80;
+async function format(model, ranges, options, token) {
+  if (model.uri.scheme === "mirascript" || token?.isCancellationRequested) return [];
+  if (ranges?.length === 0) return [];
+  const version = model.getVersionId();
+  const offsetRanges = ranges?.map((range) => ({
+    start: model.getOffsetAt(Range.getStartPosition(range)),
+    end: model.getOffsetAt(Range.getEndPosition(range))
+  }));
+  try {
+    const result = await formatModel(model, offsetRanges, {
+      tabSize: options?.tabSize ?? 2,
+      insertSpaces: options?.insertSpaces ?? true,
+      printWidth: DEFAULT_PRINT_WIDTH
+    });
+    if (model.isDisposed() || token?.isCancellationRequested || model.getVersionId() !== version) return [];
+    if (ranges == null && parseDiagnostics2(model.getValue(), result.diagnostics).errors.length > 0) return null;
+    return result.edits.map((edit) => ({
+      range: Range.fromPositions(model.getPositionAt(edit.start), model.getPositionAt(edit.end)),
+      text: edit.text
+    }));
+  } catch (error) {
+    console.error("MiraScript formatting failed:", error);
+    return null;
+  }
 }
 var FormatterProvider = class extends Provider {
-  constructor() {
-    super(...arguments);
-    /** @inheritdoc */
-    this.autoFormatTriggerCharacters = [";", "}", "]", ")"];
-  }
-  /** 进行完整格式化 */
+  /** 返回完整格式化文本；源码已规范时返回原文本。 */
   static async format(model, options) {
-    const formatted = await format(model, [], options, "full", void 0);
-    return formatted.length === 1 ? formatted[0].text : null;
-  }
-  /** @inheritdoc */
+    const edits = await format(model, void 0, options, void 0);
+    if (edits == null) return null;
+    if (edits.length === 0) return model.getValue();
+    let output = model.getValue();
+    const offsetEdits = edits.map((edit) => ({
+      start: model.getOffsetAt(Range.getStartPosition(edit.range)),
+      end: model.getOffsetAt(Range.getEndPosition(edit.range)),
+      text: edit.text
+    })).toSorted((left, right) => right.start - left.start);
+    for (const edit of offsetEdits) {
+      output = output.slice(0, edit.start) + edit.text + output.slice(edit.end);
+    }
+    return output;
+  }
+  /** 提供整篇文档格式化编辑。 */
   provideDocumentFormattingEdits(model, options, token) {
-    return format(model, [], options, "full", token);
+    return format(model, void 0, options, token).then((edits) => edits ?? []);
   }
-  /** @inheritdoc */
+  /** 提供单个选区格式化编辑。 */
   provideDocumentRangeFormattingEdits(model, range, options, token) {
-    return format(model, [range], options, "range", token);
+    return format(model, [range], options, token).then((edits) => edits ?? []);
   }
-  /** @inheritdoc */
+  /** 提供多个选区格式化编辑。 */
   provideDocumentRangesFormattingEdits(model, ranges, options, token) {
-    return format(model, ranges, options, "range", token);
-  }
-  /** @inheritdoc */
-  provideOnTypeFormattingEdits(model, position, ch, options, token) {
-    return format(
-      model,
-      [Range.fromPositions(position, position)],
-      options,
-      ch === ";" ? "statement" : "expression",
-      token
-    );
+    return format(model, ranges, options, token).then((edits) => edits ?? []);
   }
 };
 
@@ -3052,9 +3085,8 @@ async function registerLSP(contextProvider2, features = {}) {
   registerIfEnabled("documentSymbol", DocumentSymbolProvider, languages.registerDocumentSymbolProvider);
   registerIfEnabled("formatter", FormatterProvider, (language, provider) => {
     return [
-      languages.registerDocumentFormattingEditProvider(language, provider)
-      // languages.registerDocumentRangeFormattingEditProvider(language, provider),
-      // languages.registerOnTypeFormattingEditProvider(language, provider),
+      languages.registerDocumentFormattingEditProvider(language, provider),
+      languages.registerDocumentRangeFormattingEditProvider(language, provider)
     ];
   });
   registerIfEnabled("hover", HoverProvider, languages.registerHoverProvider);