@coze-editor/preset-code 0.1.0-alpha.37c297 → 0.1.0-alpha.445000

package/dist/index.d.ts

@@ -1,13 +1,12 @@
 import * as _codemirror_view from '@codemirror/view';
 import * as _codemirror_state from '@codemirror/state';
 import { Extension } from '@codemirror/state';
-import * as _coze_editor_core_plugins from '@coze-editor/core-plugins';
 import * as _coze_editor_core from '@coze-editor/core';
 import { InferEditorAPIFromPlugins } from '@coze-editor/core';
 import { LanguageConfig, Transformer } from '@coze-editor/code-language-shared';
 export { Transformer } from '@coze-editor/code-language-shared';
 import { TagStyle } from '@codemirror/language';
-import { Text } from 'text-mapping';
+import { Text } from '@coze-editor/utils';
 export { tags } from '@lezer/highlight';
 
 declare const themes: any;
@@ -90,7 +89,14 @@ declare const createTheme: ({ variant, settings, styles }: Theme) => Extension;
 
 declare const transformerCreator: (processor: (text: Text) => Text) => Transformer;
 
-declare const preset: (_coze_editor_core.ExtensionPluginSpec | _coze_editor_core.OptionPluginSpec<"fontSize", number> | _coze_editor_core.OptionPluginSpec<"placeholder", string | HTMLElement> | _coze_editor_core.OptionPluginSpec<"readOnly", boolean> | _coze_editor_core.OptionPluginSpec<"editable", boolean> | _coze_editor_core.OptionPluginSpec<"lineWrapping", boolean> | _coze_editor_core.OptionPluginSpec<"height", string | number> | _coze_editor_core.OptionPluginSpec<"minHeight", string | number> | _coze_editor_core.OptionPluginSpec<"maxHeight", string | number> | _coze_editor_core.APIPluginSpec<"getValue", [], string> | _coze_editor_core.APIPluginSpec<"setValue", [value: string], void> | _coze_editor_core.APIPluginSpec<"replaceText", [options: _coze_editor_core_plugins.ReplaceTextOptions], void> | _coze_editor_core.APIPluginSpec<"getCursorPosition", [], number> | _coze_editor_core.APIPluginSpec<"setCursorPosition", [pos: number], void> | _coze_editor_core.APIPluginSpec<"focus", [], void> | _coze_editor_core.APIPluginSpec<"blur", [], void> | _coze_editor_core.APIPluginSpec<"disableKeybindings", [keys: string[]], void> | _coze_editor_core.APIPluginSpec<"updateASTDecorations", [], void> | _coze_editor_core.APIPluginSpec<"undo", [], void> | _coze_editor_core.APIPluginSpec<"redo", [], void> | _coze_editor_core.APIPluginSpec<"transformTextInSelection", [transformer: (text: string) => string | undefined], void> | _coze_editor_core.APIPluginSpec<"getSelection", [], {
+declare const preset: (_coze_editor_core.ExtensionPluginSpec | _coze_editor_core.OptionPluginSpec<"fontSize", number> | _coze_editor_core.OptionPluginSpec<"placeholder", string | HTMLElement> | _coze_editor_core.OptionPluginSpec<"readOnly", boolean> | _coze_editor_core.OptionPluginSpec<"editable", boolean> | _coze_editor_core.OptionPluginSpec<"lineWrapping", boolean> | _coze_editor_core.OptionPluginSpec<"height", string | number> | _coze_editor_core.OptionPluginSpec<"minHeight", string | number> | _coze_editor_core.OptionPluginSpec<"maxHeight", string | number> | _coze_editor_core.APIPluginSpec<"getValue", [], string> | _coze_editor_core.APIPluginSpec<"setValue", [value: string], void> | _coze_editor_core.APIPluginSpec<"replaceText", [options: {
+    from: number;
+    to: number;
+    text: string;
+    cursorOffset?: number;
+    scrollIntoView?: boolean;
+    userEvent?: string;
+}], void> | _coze_editor_core.APIPluginSpec<"getCursorPosition", [], number> | _coze_editor_core.APIPluginSpec<"setCursorPosition", [pos: number], void> | _coze_editor_core.APIPluginSpec<"focus", [], void> | _coze_editor_core.APIPluginSpec<"blur", [], void> | _coze_editor_core.APIPluginSpec<"disableKeybindings", [keys: string[]], void> | _coze_editor_core.APIPluginSpec<"updateASTDecorations", [], void> | _coze_editor_core.APIPluginSpec<"undo", [], void> | _coze_editor_core.APIPluginSpec<"redo", [], void> | _coze_editor_core.APIPluginSpec<"transformTextInSelection", [transformer: (text: string) => string | undefined], void> | _coze_editor_core.APIPluginSpec<"getSelection", [], {
     from: number;
     to: number;
     anchor: number;

package/dist/index.js

@@ -42,7 +42,7 @@ var import_extensions = require("@coze-editor/extensions");
 var import_extension_scrollbar = require("@coze-editor/extension-scrollbar");
 var import_extension_completion_icons = require("@coze-editor/extension-completion-icons");
 var import_core_plugins = require("@coze-editor/core-plugins");
-var import_core = require("@coze-editor/core");
+var import_core2 = require("@coze-editor/core");
 var import_code_language_shared2 = require("@coze-editor/code-language-shared");
 var import_view6 = require("@codemirror/view");
 var import_state6 = require("@codemirror/state");
@@ -78,11 +78,12 @@ var vscodeDark = [
 
 // src/language-registry.ts
 var import_vscode_languageserver_types2 = require("vscode-languageserver-types");
-var import_codemirror_shiki = __toESM(require("codemirror-shiki"));
+var import_microfuzz = __toESM(require("@nozbe/microfuzz"));
 var import_extension_lint = require("@coze-editor/extension-lint");
 var import_extension_links = require("@coze-editor/extension-links");
 var import_code_language_shared = require("@coze-editor/code-language-shared");
 var import_view3 = require("@codemirror/view");
+var import_theme_one_dark = require("@codemirror/theme-one-dark");
 var import_state3 = require("@codemirror/state");
 var import_language2 = require("@codemirror/language");
 var import_autocomplete = require("@codemirror/autocomplete");
@@ -97,10 +98,21 @@ var import_marked_shiki = __toESM(require("marked-shiki"));
 var import_marked = require("marked");
 
 // src/highlighter.ts
-var import_shiki = require("shiki");
-var highlighterPromise = (0, import_shiki.createHighlighter)({
-  langs: ["md", "js", "ts", "python"],
-  themes: ["github-dark", "one-dark-pro"]
+var import_oniguruma = require("shiki/engine/oniguruma");
+var import_core = require("shiki/core");
+var highlighterPromise = (0, import_core.createHighlighterCore)({
+  langs: [
+    () => import("@shikijs/langs/markdown"),
+    () => import("@shikijs/langs/javascript"),
+    () => import("@shikijs/langs/typescript"),
+    () => import("@shikijs/langs/python"),
+    () => import("@shikijs/langs/sql")
+  ],
+  themes: [
+    () => import("@shikijs/themes/github-dark"),
+    () => import("@shikijs/themes/one-dark-pro")
+  ],
+  engine: (0, import_oniguruma.createOnigurumaEngine)(import("shiki/wasm"))
 });
 
 // src/const.ts
@@ -392,6 +404,7 @@ function formatContents(contents) {
   }
   return "";
 }
+var identRe = /^[\w$]+$/;
 var LanguagesRegistry = class {
   languages = {};
   register(id, options) {
@@ -413,15 +426,7 @@ var LanguagesRegistry = class {
     const { languageService, language, extensions } = this.languages[id];
     const langaugeExtensions = [];
     langaugeExtensions.push(new import_language2.LanguageSupport(language));
-    if (id === "typescript" || id === "python") {
-      langaugeExtensions.push(
-        (0, import_codemirror_shiki.default)({
-          highlighter: highlighterPromise,
-          language: id,
-          theme: DEFAULT_SYNTAX_THEME
-        })
-      );
-    }
+    langaugeExtensions.push((0, import_language2.syntaxHighlighting)(import_theme_one_dark.oneDarkHighlightStyle));
     langaugeExtensions.push(
       import_state3.StateField.define({
         create(state) {
@@ -604,9 +609,19 @@ var LanguagesRegistry = class {
     }
     if (languageService == null ? void 0 : languageService.doComplete) {
       langaugeExtensions.push(
+        import_view3.EditorView.theme({
+          ".cm-completionInfo p": {
+            margin: 0
+          },
+          ".cm-completionMatchedText": {
+            textDecoration: "none",
+            color: "#4daafc"
+          }
+        }),
         (0, import_autocomplete.autocompletion)({
           override: [
             async function({ state, pos, view: view2 }) {
+              var _a2;
               const { textDocument, originalRangeFor, generatedRangeFor } = state.field(import_code_language_shared.textDocumentField);
               const range = generatedRangeFor({ from: pos, to: pos });
               const offset = range == null ? void 0 : range.from;
@@ -620,14 +635,73 @@ var LanguagesRegistry = class {
               if (!completionResult || !Array.isArray(completionResult.items) || completionResult.items.length === 0) {
                 return null;
               }
+              let { items } = completionResult;
+              const content = textDocument.getText();
+              const charBefore = content.slice(offset - 1, offset);
+              const triggerCharacters = languageService.triggerCharacters ?? [];
+              if (!triggerCharacters.includes(charBefore)) {
+                let i = offset - 1;
+                let query = "";
+                while (i >= 0) {
+                  const char = content.slice(i, i + 1);
+                  if (char === "\n") {
+                    break;
+                  }
+                  if (!identRe.test(char) && i + 1 <= offset) {
+                    break;
+                  }
+                  i--;
+                }
+                query = content.slice(i + 1, offset);
+                if (query) {
+                  const fuzzySearch = (0, import_microfuzz.default)(items, {
+                    key: "label"
+                  });
+                  items = fuzzySearch(query).map((v) => {
+                    const finalItem = {
+                      ...v.item,
+                      data: {
+                        matches: v.matches.reduce((memo, current) => {
+                          if (!current) {
+                            return memo;
+                          }
+                          return [
+                            ...memo,
+                            ...current.reduce(
+                              (m, c) => [...m, c[0], c[1] + 1],
+                              []
+                            )
+                          ];
+                        }, [])
+                      }
+                    };
+                    if (!finalItem.textEdit) {
+                      finalItem.textEdit = {
+                        range: {
+                          start: textDocument.positionAt(i + 1),
+                          end: textDocument.positionAt(offset)
+                        },
+                        newText: v.item.label
+                      };
+                    }
+                    return finalItem;
+                  });
+                } else if (Array.isArray(languageService.triggerCharacters)) {
+                  items = [];
+                }
+              }
               const completionOptions = [];
               const mapping = /* @__PURE__ */ new WeakMap();
-              const resolveCompletion = createResolveCompletion(
-                view2,
-                languageService,
-                mapping
-              );
-              for (const item of completionResult.items) {
+              let resolveCompletion = void 0;
+              if (typeof languageService.resolveCompletionItem === "function") {
+                resolveCompletion = createResolveCompletion(
+                  view2,
+                  languageService,
+                  mapping
+                );
+              }
+              const matchesMapping = /* @__PURE__ */ new WeakMap();
+              for (const item of items) {
                 const { kind, label, textEdit, textEditText } = item;
                 const completion = {
                   label,
@@ -635,6 +709,7 @@ var LanguagesRegistry = class {
                   detail: item.detail ?? ""
                 };
                 mapping.set(completion, item);
+                matchesMapping.set(completion, (_a2 = item.data) == null ? void 0 : _a2.matches);
                 if (textEdit) {
                   const range2 = "range" in textEdit ? textEdit.range : textEdit.replace;
                   const from = textDocument.offsetAt(range2.start);
@@ -675,7 +750,10 @@ var LanguagesRegistry = class {
               return {
                 from: pos,
                 options: completionOptions,
-                filter: false
+                filter: false,
+                getMatch(completion) {
+                  return matchesMapping.get(completion) ?? [];
+                }
               };
             }
           ]
@@ -975,9 +1053,9 @@ var import_dist = require("@coze-editor/extension-scrollbar/dist/index.css");
 var import_dist2 = require("@coze-editor/extension-completion-icons/dist/index.css");
 
 // src/transformer.ts
-var import_text_mapping = require("text-mapping");
+var import_utils2 = require("@coze-editor/utils");
 var transformerCreator = (processor) => (source) => {
-  const text = processor(new import_text_mapping.Text(source));
+  const text = processor(new import_utils2.Text(source));
   return {
     code: text.toString(),
     mapping: {
@@ -995,7 +1073,7 @@ var SVG_FOLD_CLOSE = '<svg xmlns="http://www.w3.org/2000/svg" width="1em" height
 var SVG_FOLD_OPEN = '<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 16 16"><path fill="currentColor" fill-rule="evenodd" d="m7.976 10.072l4.357-4.357l.62.618L8.284 11h-.618L3 6.333l.619-.618z" clip-rule="evenodd"/></svg>';
 var preset = [
   ...import_preset_universal.default,
-  (0, import_core.extension)([
+  (0, import_core2.extension)([
     basicSetup,
     import_extensions.matchingBrackets,
     // indentGuides(),
@@ -1040,6 +1118,9 @@ var preset = [
           minWidth: "200px",
           margin: "0 2px"
         },
+        ".cm-tooltip.cm-completionInfo": {
+          padding: "6px 9px"
+        },
         ".cm-completionInfo p:last-child": {
           display: "inline-block"
         },
@@ -1081,32 +1162,35 @@ var preset = [
           maxHeight: "360px",
           wordBreak: "break-word"
         },
+        ".cm-tooltip-hover p": {
+          margin: 0
+        },
         ".cm-tooltip-section:not(:first-child)": {
           "border-top": "solid 0.5px #666666ab"
         }
       })
     )
   ]),
-  (0, import_core.option)("tabSize", tabSize),
-  (0, import_core.option)("height", import_core_plugins.height),
-  (0, import_core.option)("minHeight", import_core_plugins.minHeight),
-  (0, import_core.option)("maxHeight", import_core_plugins.maxHeight),
-  (0, import_core.option)(
+  (0, import_core2.option)("tabSize", tabSize),
+  (0, import_core2.option)("height", import_core_plugins.height),
+  (0, import_core2.option)("minHeight", import_core_plugins.minHeight),
+  (0, import_core2.option)("maxHeight", import_core_plugins.maxHeight),
+  (0, import_core2.option)(
     "scrollBeyondLastLine",
     (use) => use ? (0, import_extensions.scrollBeyondLastLine)() : []
   ),
-  (0, import_core.option)("uri", (id) => import_code_language_shared2.uriFacet.of(id)),
-  (0, import_core.option)("theme", (themeName) => themes.get(themeName) ?? []),
-  (0, import_core.option)("languageId", (id) => [
+  (0, import_core2.option)("uri", (id) => import_code_language_shared2.uriFacet.of(id)),
+  (0, import_core2.option)("theme", (themeName) => themes.get(themeName) ?? []),
+  (0, import_core2.option)("languageId", (id) => [
     import_code_language_shared2.languageIdFacet.of(id),
     languages.getExtension(id)
   ]),
-  (0, import_core.option)(
+  (0, import_core2.option)(
     "transformer",
     (transformer) => import_code_language_shared2.transformerFacet.of(transformer)
   ),
-  (0, import_core.option)("overlayScrollbar", (enable = true) => enable ? [(0, import_extension_scrollbar.scrollbar)()] : []),
-  (0, import_core.option)(
+  (0, import_core2.option)("overlayScrollbar", (enable = true) => enable ? [(0, import_extension_scrollbar.scrollbar)()] : []),
+  (0, import_core2.option)(
     "lineNumbersGutter",
     (enable = true) => enable ? (0, import_view6.lineNumbers)({
       domEventHandlers: {
@@ -1118,7 +1202,7 @@ var preset = [
       }
     }) : []
   ),
-  (0, import_core.option)(
+  (0, import_core2.option)(
     "foldGutter",
     (enable = true) => enable ? (0, import_language6.foldGutter)({
       markerDOM(open) {
@@ -1135,11 +1219,11 @@ var preset = [
       }
     }) : []
   ),
-  (0, import_core.option)(
+  (0, import_core2.option)(
     "colorizeBrackets",
     (enable = true) => enable ? import_extensions.colorizationBrackets : []
   ),
-  (0, import_core.api)("validate", ({ view: view2 }) => () => {
+  (0, import_core2.api)("validate", ({ view: view2 }) => () => {
     view2.dispatch({
       userEvent: LINT_REFRESH_USER_EVENT
     });