@difizen/libro-cofine-editor 0.1.18 → 0.1.20

package/src/libro-e2-editor.ts

@@ -8,6 +8,7 @@ import type {
   IEditorConfig,
   IEditorOptions,
   IModel,
+  IModelContentChange,
   IPosition,
   IRange,
   SearchMatch,
@@ -16,6 +17,7 @@ import type {
 import { defaultConfig } from '@difizen/libro-code-editor';
 import type { E2Editor } from '@difizen/libro-cofine-editor-core';
 import { EditorProvider, MonacoEnvironment } from '@difizen/libro-cofine-editor-core';
+import { MIME } from '@difizen/libro-common';
 import { NotebookCommands } from '@difizen/libro-core';
 import type { LSPProvider } from '@difizen/libro-lsp';
 import {
@@ -28,12 +30,11 @@ import {
   watch,
 } from '@difizen/mana-app';
 import { Disposable, DisposableCollection, Emitter } from '@difizen/mana-app';
-import { editor, Selection } from '@difizen/monaco-editor-core';
+import { editor, KeyCode, Selection } from '@difizen/monaco-editor-core';
 import 'resize-observer-polyfill';
 import * as monaco from '@difizen/monaco-editor-core';
 import { v4 } from 'uuid';
 
-import { LSPContribution } from './language/lsp/lsp-contribution.js';
 import { LanguageSpecRegistry } from './language-specs.js';
 import { PlaceholderContentWidget } from './placeholder.js';
 import type { MonacoEditorOptions, MonacoEditorType, MonacoMatch } from './types.js';
@@ -228,7 +229,7 @@ export const libroE2DefaultConfig: Required<LibroE2EditorConfig> = {
   },
   scrollBarHeight: 12,
   mode: 'null',
-  mimetype: 'text/x-python',
+  mimetype: MIME.python,
   smartIndent: true,
   electricChars: true,
   keyMap: 'default',
@@ -278,8 +279,6 @@ export type LibroE2EditorFactory = CodeEditorFactory;
 
 export const E2EditorClassname = 'libro-e2-editor';
 
-export const LibroE2URIScheme = 'libro-e2';
-
 export type E2EditorState = monaco.editor.ITextModel | null;
 
 export const e2StateFactory: (
@@ -288,10 +287,8 @@ export const e2StateFactory: (
   const spec = languageSpecRegistry.languageSpecs.find(
     (item) => item.mime === options.model.mimeType,
   );
-  const uri = MonacoUri.from({
-    scheme: LibroE2URIScheme,
-    path: `${options.uuid}${spec?.ext[0]}`,
-  });
+
+  const uri = MonacoUri.parse(options.uuid);
   const monacoModel = monaco.editor.createModel(
     options.model.value,
     spec?.language,
@@ -317,7 +314,6 @@ export class LibroE2Editor implements IEditor {
 
   protected readonly languageSpecRegistry: LanguageSpecRegistry;
   @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
-  @inject(LSPContribution) protected lspContribution: LSPContribution;
 
   protected defaultLineHeight = 20;
 
@@ -376,6 +372,9 @@ export class LibroE2Editor implements IEditor {
     return this.monacoEditor?.getModel()?.getLineCount() || 0;
   }
 
+  protected onModelContentChangedEmitter = new Emitter<IModelContentChange[]>();
+  onModelContentChanged = this.onModelContentChangedEmitter.event;
+
   lspProvider?: LSPProvider;
 
   completionProvider?: CompletionProvider;
@@ -463,7 +462,7 @@ export class LibroE2Editor implements IEditor {
        *
        */
       // overflowWidgetsDomNode: document.getElementById('monaco-editor-overflow-widgets-root')!,
-      // fixedOverflowWidgets: true,
+      fixedOverflowWidgets: true,
       suggest: { snippetsPreventQuickSuggestions: false },
       autoClosingQuotes: editorConfig.autoClosingBrackets ? 'always' : 'never',
       autoDetectHighContrast: false,
@@ -529,10 +528,19 @@ export class LibroE2Editor implements IEditor {
 
     this._editor = editorPorvider.create(host, options);
     this.toDispose.push(
-      this.monacoEditor?.onDidChangeModelContent(() => {
+      this.monacoEditor?.onDidChangeModelContent((e) => {
         const value = this.monacoEditor?.getValue();
         this.model.value = value ?? '';
-        // this.updateEditorSize();
+        this.onModelContentChangedEmitter.fire(
+          e.changes.map((item) => {
+            return {
+              range: this.toEditorRange(item.range),
+              rangeLength: item.rangeLength,
+              rangeOffset: item.rangeOffset,
+              text: item.text,
+            };
+          }),
+        );
       }) ?? Disposable.NONE,
     );
     this.toDispose.push(
@@ -561,11 +569,6 @@ export class LibroE2Editor implements IEditor {
     //   this.monacoEditor._themeService,
     //   this.monacoEditor._themeService.getColorTheme(),
     // );
-
-    // setTimeout(() => {
-    //   this.monacoEditor?.trigger('editor', 'editor.action.formatDocument');
-    //   console.log('trigger format');
-    // }, 5000);
   }
 
   protected inspectResize() {
@@ -612,22 +615,23 @@ export class LibroE2Editor implements IEditor {
    */
   protected handleCommand(commandRegistry: CommandRegistry) {
     // need monaco 0.34
-    // editor.addKeybindingRules([
-    //   {
-    //     // disable show command center
-    //     keybinding: KeyCode.F1,
-    //     command: null,
-    //   },
-    //   {
-    //     // disable show error command
-    //     keybinding: KeyCode.F8,
-    //     command: null,
-    //   },
-    //   {
-    //     // disable toggle debugger breakpoint
-    //     keybinding: KeyCode.F9,
-    //     command: null,
-    //   },
+    editor.addKeybindingRules([
+      {
+        // disable show command center
+        keybinding: KeyCode.F1,
+        command: null,
+      },
+      {
+        // disable show error command
+        keybinding: KeyCode.F8,
+        command: null,
+      },
+      {
+        // disable toggle debugger breakpoint
+        keybinding: KeyCode.F9,
+        command: null,
+      },
+    ]);
     this.monacoEditor?.addCommand(
       9,
       () => {
@@ -817,6 +821,19 @@ export class LibroE2Editor implements IEditor {
     return monacoSelection;
   }
 
+  protected toEditorRange(range: monaco.IRange): IRange {
+    return {
+      start: {
+        line: range.startLineNumber - 1,
+        column: range.startColumn - 1,
+      },
+      end: {
+        line: range.endLineNumber - 1,
+        column: range.endColumn - 1,
+      },
+    };
+  }
+
   getSelectionValue = (range?: IRange | undefined) => {
     const selection = range ?? this.getSelection();
     return this.monacoEditor
@@ -960,6 +977,10 @@ export class LibroE2Editor implements IEditor {
     }
   };
 
+  format = () => {
+    this.monacoEditor?.trigger('libro-format', 'editor.action.formatDocument', '');
+  };
+
   protected _isDisposed = false;
   /**
    * Tests whether the editor is disposed.
@@ -973,15 +994,10 @@ export class LibroE2Editor implements IEditor {
     }
     this.placeholder.dispose();
     this.disposeResizeObserver();
-    this.disposeLSP();
     this.toDispose.dispose();
     this._isDisposed = true;
   };
 
-  disposeLSP() {
-    this.lspContribution.disposeLanguageFeature();
-  }
-
   disposeResizeObserver = () => {
     if (this.intersectionObserver) {
       getOrigin(this.intersectionObserver).disconnect();

package/src/libro-e2-preload.ts

@@ -2,7 +2,6 @@ import { MonacoEnvironment } from '@difizen/libro-cofine-editor-core';
 import type { Syringe } from '@difizen/mana-app';
 import { Deferred } from '@difizen/mana-app';
 
-import { LSPFeatureModule } from './language/lsp/module.js';
 import { PythonLanguageFeature } from './language/python/module.js';
 import { LibroE2ThemeModule } from './theme/module.js';
 
@@ -16,7 +15,6 @@ export const loadE2 = async (libroContainer: Syringe.Container) => {
     container.load(textmate.TextmateModule);
     container.load(PythonLanguageFeature);
     container.load(LibroE2ThemeModule);
-    container.load(LSPFeatureModule);
   });
   await MonacoEnvironment.init();
   E2LoadedDeferred.resolve();

package/es/language/lsp/completion-provider.d.ts

@@ -1,13 +0,0 @@
-import { languages } from '@difizen/monaco-editor-core';
-import type monaco from '@difizen/monaco-editor-core';
-import * as lsp from 'vscode-languageserver-protocol';
-import { LangaugeFeatureProvider } from './language-feature-provider.js';
-export declare class CompletionProvider extends LangaugeFeatureProvider implements monaco.languages.CompletionItemProvider {
-    triggerCharacters: ['.', '[', '"', "'"];
-    provideCompletionItems: (model: monaco.editor.ITextModel, position: monaco.Position) => Promise<monaco.languages.CompletionList | undefined>;
-    protected provideCompletionItemsFromKernel: (model: monaco.editor.ITextModel, position: monaco.Position) => Promise<monaco.languages.CompletionList | undefined>;
-    protected provideCompletionItemsFromLSPServer: (model: monaco.editor.ITextModel, position: monaco.Position) => Promise<monaco.languages.CompletionList | undefined>;
-    resolveCompletionItem: (item: monaco.languages.CompletionItem, token: monaco.CancellationToken) => Promise<monaco.languages.CompletionItem | undefined>;
-    transformCompletion(item: lsp.CompletionItem, range: monaco.IRange | monaco.languages.CompletionItemRanges): monaco.languages.CompletionItem;
-}
-//# sourceMappingURL=completion-provider.d.ts.map

package/es/language/lsp/completion-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"completion-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/completion-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,qBAAa,kBACX,SAAQ,uBACR,YAAW,MAAM,CAAC,SAAS,CAAC,sBAAsB;IAElD,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAEjC,sBAAsB,UACpB,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAGrD;IAEF,SAAS,CAAC,gCAAgC,UACjC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAuCrD;IAEF,SAAS,CAAC,mCAAmC,UACpC,OAAO,MAAM,CAAC,UAAU,YACrB,OAAO,QAAQ,KACxB,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CA8DrD;IAEF,qBAAqB,SACb,gBAAgB,CAAC,cAAc,SAC9B,OAAO,iBAAiB,KAC9B,QAAQ,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,CAarD;IAEF,mBAAmB,CACjB,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,GAC3D,MAAM,CAAC,SAAS,CAAC,cAAc;CAgDnC"}

package/es/language/lsp/completion-provider.js

@@ -1,294 +0,0 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-import { CompletionTriggerKind } from '@difizen/libro-lsp';
-import { languages } from '@difizen/monaco-editor-core';
-import * as lsp from 'vscode-languageserver-protocol';
-import { InsertReplaceEdit } from 'vscode-languageserver-protocol';
-import { LangaugeFeatureProvider } from "./language-feature-provider.js";
-import { CompletionItemKind } from "./type-concerters.js";
-export var CompletionProvider = /*#__PURE__*/function (_LangaugeFeatureProvi) {
-  _inherits(CompletionProvider, _LangaugeFeatureProvi);
-  var _super = _createSuper(CompletionProvider);
-  function CompletionProvider() {
-    var _this;
-    _classCallCheck(this, CompletionProvider);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _this.provideCompletionItems = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(model, position) {
-        var result;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return _this.provideCompletionItemsFromLSPServer(model, position);
-            case 2:
-              result = _context.sent;
-              return _context.abrupt("return", result);
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function (_x, _x2) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    _this.provideCompletionItemsFromKernel = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(model, position) {
-        var _editor$completionPro, _reply$matches;
-        var editor, reply, start, end, suggestion;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              editor = _this.getEditorByModel(model);
-              if (!(!editor || editor.getOption('lspEnabled') !== true)) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              _context2.next = 5;
-              return (_editor$completionPro = editor.completionProvider) === null || _editor$completionPro === void 0 ? void 0 : _editor$completionPro.call(editor, {
-                cursorPosition: editor.getOffsetAt({
-                  column: position.column,
-                  line: position.lineNumber
-                })
-              });
-            case 5:
-              reply = _context2.sent;
-              start = reply !== null && reply !== void 0 && reply.cursor_start ? editor.getPositionAt(reply === null || reply === void 0 ? void 0 : reply.cursor_start) : editor.getCursorPosition();
-              end = reply !== null && reply !== void 0 && reply.cursor_end ? editor.getPositionAt(reply === null || reply === void 0 ? void 0 : reply.cursor_end) : editor.getCursorPosition();
-              suggestion = ((_reply$matches = reply === null || reply === void 0 ? void 0 : reply.matches) !== null && _reply$matches !== void 0 ? _reply$matches : []).map(function (match) {
-                return {
-                  label: match,
-                  kind: languages.CompletionItemKind.Text,
-                  insertText: match,
-                  range: {
-                    startColumn: start === null || start === void 0 ? void 0 : start.column,
-                    startLineNumber: start === null || start === void 0 ? void 0 : start.line,
-                    endColumn: end === null || end === void 0 ? void 0 : end.column,
-                    endLineNumber: end === null || end === void 0 ? void 0 : end.line
-                  }
-                };
-              });
-              return _context2.abrupt("return", {
-                suggestions: suggestion
-              });
-            case 10:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3, _x4) {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    _this.provideCompletionItemsFromLSPServer = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(model, position) {
-        var provider, editor, lspConnection, docEditor, doc, virtualPos, result, items, word, range, suggestions;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return _this.getProvider(model);
-            case 2:
-              provider = _context3.sent;
-              if (provider) {
-                _context3.next = 5;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 5:
-              editor = _this.getEditorByModel(model);
-              if (!(!editor || editor.getOption('lspEnabled') !== true)) {
-                _context3.next = 8;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 8:
-              lspConnection = provider.lspConnection, docEditor = provider.editor, doc = provider.virtualDocument;
-              if (!(!lspConnection.isReady || !lspConnection.provides('completionProvider'))) {
-                _context3.next = 11;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 11:
-              virtualPos = doc.transformEditorToVirtual(docEditor, {
-                line: position.lineNumber - 1,
-                ch: position.column,
-                isEditor: true
-              });
-              if (virtualPos) {
-                _context3.next = 14;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 14:
-              _context3.next = 16;
-              return lspConnection.clientRequests['textDocument/completion'].request({
-                position: {
-                  line: virtualPos.line,
-                  character: virtualPos.ch
-                },
-                textDocument: {
-                  uri: doc.documentInfo.uri
-                },
-                context: {
-                  triggerKind: CompletionTriggerKind.Invoked
-                }
-              });
-            case 16:
-              result = _context3.sent;
-              items = 'items' in result ? result.items : result;
-              word = model.getWordUntilPosition(position);
-              range = {
-                startLineNumber: position.lineNumber,
-                endLineNumber: position.lineNumber,
-                startColumn: word.startColumn,
-                endColumn: position.column
-              };
-              suggestions = items.map(function (item) {
-                return _this.transformCompletion(item, range);
-              });
-              if (!Array.isArray(result)) {
-                _context3.next = 23;
-                break;
-              }
-              return _context3.abrupt("return", {
-                suggestions: suggestions
-              });
-            case 23:
-              return _context3.abrupt("return", {
-                incomplete: result.isIncomplete,
-                suggestions: suggestions
-              });
-            case 24:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      return function (_x5, _x6) {
-        return _ref3.apply(this, arguments);
-      };
-    }();
-    _this.resolveCompletionItem = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item, token) {
-        var original, lspConnection, itemResult, resolve;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              original = item.__original;
-              if (original) {
-                _context4.next = 3;
-                break;
-              }
-              return _context4.abrupt("return");
-            case 3:
-              _context4.next = 5;
-              return _this.getLSPConnection();
-            case 5:
-              lspConnection = _context4.sent;
-              _context4.next = 8;
-              return lspConnection.clientRequests['completionItem/resolve'].request(original);
-            case 8:
-              itemResult = _context4.sent;
-              if (!token.isCancellationRequested) {
-                _context4.next = 11;
-                break;
-              }
-              return _context4.abrupt("return");
-            case 11:
-              resolve = _this.transformCompletion(itemResult, item.range);
-              return _context4.abrupt("return", resolve);
-            case 13:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      }));
-      return function (_x7, _x8) {
-        return _ref4.apply(this, arguments);
-      };
-    }();
-    return _this;
-  }
-  _createClass(CompletionProvider, [{
-    key: "transformCompletion",
-    value: function transformCompletion(item, range) {
-      var _item$kind, _item$command;
-      var converted = _objectSpread(_objectSpread({}, item), {}, {
-        label: item.label,
-        sortText: item.sortText,
-        filterText: item.filterText,
-        insertText: item.insertText ? item.insertText : item.label,
-        kind: CompletionItemKind.from((_item$kind = item.kind) !== null && _item$kind !== void 0 ? _item$kind : lsp.CompletionItemKind.Property),
-        detail: item.detail,
-        documentation: item.documentation,
-        command: item.command ? {
-          id: item.command.command,
-          title: item.command.title,
-          arguments: (_item$command = item.command) === null || _item$command === void 0 ? void 0 : _item$command.arguments
-        } : undefined,
-        range: range,
-        additionalTextEdits: undefined
-      });
-
-      // FIXME: text edit 生成的range有可能在其他的editor上,这里似乎无法处理
-      if (item.textEdit) {
-        converted.insertText = item.textEdit.newText;
-        if (InsertReplaceEdit.is(item.textEdit)) {
-          converted.range = {
-            insert: convertRange(item.textEdit.insert),
-            replace: convertRange(item.textEdit.replace)
-          };
-        } else {
-          converted.range = convertRange(item.textEdit.range);
-        }
-      }
-      if (item.additionalTextEdits) {
-        converted.additionalTextEdits = item.additionalTextEdits.map(function (edit) {
-          return {
-            range: convertRange(edit.range),
-            text: edit.newText
-          };
-        });
-      }
-
-      // Stash a few additional pieces of information.
-      converted.__original = item;
-      return converted;
-    }
-  }]);
-  return CompletionProvider;
-}(LangaugeFeatureProvider);
-function convertRange(range) {
-  return {
-    startLineNumber: range.start.line + 1,
-    startColumn: range.start.character + 1,
-    endLineNumber: range.end.line + 1,
-    endColumn: range.end.character + 1
-  };
-}

package/es/language/lsp/diagnostic-provider.d.ts

@@ -1,27 +0,0 @@
-import type { LibroService } from '@difizen/libro-core';
-import type { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { DisposableCollection } from '@difizen/mana-app';
-import type { Disposable } from '@difizen/mana-app';
-import * as monaco from '@difizen/monaco-editor-core';
-import { LangaugeFeatureProvider } from './language-feature-provider.js';
-export declare enum MarkerSeverity {
-    Hint = 1,
-    Info = 2,
-    Warning = 4,
-    Error = 8
-}
-export declare class DiagnosticProvider extends LangaugeFeatureProvider implements Disposable {
-    protected toDispose: DisposableCollection;
-    constructor(libroService: LibroService, lspDocumentConnectionManager: ILSPDocumentConnectionManager);
-    protected diagnosticList: {
-        model: monaco.editor.ITextModel;
-        markers: monaco.editor.IMarkerData[];
-    }[];
-    protected addDiagnostic(model: monaco.editor.ITextModel, marker: monaco.editor.IMarkerData): void;
-    protected clearDiagnostic(): void;
-    protected displayDiagnostic(): void;
-    processDiagnostic(): Promise<void>;
-    disposed: boolean;
-    dispose(): void;
-}
-//# sourceMappingURL=diagnostic-provider.d.ts.map

package/es/language/lsp/diagnostic-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"diagnostic-provider.d.ts","sourceRoot":"","sources":["../../../src/language/lsp/diagnostic-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAKtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,oBAAY,cAAc;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,KAAK,IAAI;CACV;AASD,qBAAa,kBAAmB,SAAQ,uBAAwB,YAAW,UAAU;IACnF,SAAS,CAAC,SAAS,uBAA8B;gBAE/C,YAAY,EAAE,YAAY,EAC1B,4BAA4B,EAAE,6BAA6B;IAM7D,SAAS,CAAC,cAAc,EAAE;QACxB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;KACtC,EAAE,CAAM;IAET,SAAS,CAAC,aAAa,CACrB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;IAgBnC,SAAS,CAAC,eAAe;IAazB,SAAS,CAAC,iBAAiB;IAOrB,iBAAiB;IA+EvB,QAAQ,UAAS;IACjB,OAAO;CAQR"}