@lvce-editor/editor-worker 10.0.0 → 10.2.0

package/dist/editorWorkerMain.js

@@ -1066,6 +1066,39 @@ const createMockRpc = ({
   return mockRpc;
 };
 
+const Backspace = 1;
+const Tab$1 = 2;
+const Enter = 3;
+const Escape = 8;
+const Space$1 = 9;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+const Delete = 18;
+const KeyA = 29;
+const KeyC = 31;
+const KeyD = 32;
+const KeyF = 34;
+const KeyH = 36;
+const KeyJ = 38;
+const KeyK = 39;
+const KeyL = 40;
+const KeyO = 43;
+const KeyV = 50;
+const KeyX = 52;
+const KeyZ = 54;
+const F2 = 58;
+const F3 = 59;
+const F4 = 60;
+const F12 = 68;
+const Period = 87;
+const Slash$1 = 88;
+const BracketLeft = 90;
+const BracketRight = 92;
+
 const CodeGenerator = 1;
 const ColorPicker$1 = 2;
 const Completion = 3;
@@ -1075,6 +1108,10 @@ const Hover = 6;
 const Rename$1 = 7;
 const SourceAction$1 = 8;
 
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+const Alt$1 = 1 << 9 >>> 0;
+
 const DebugWorker = 55;
 const EditorWorker = 99;
 const ExtensionHostWorker = 44;
@@ -2194,18 +2231,18 @@ const loadTokenizers = async languageIds => {
 
 const EmptyString = '';
 const NewLine = '\n';
-const Space$1 = ' ';
-const Tab$1 = '\t';
+const Space = ' ';
+const Tab = '\t';
 const DoubleQuote$1 = '"';
 
 const normalizeText = (text, normalize, tabSize) => {
   if (normalize) {
-    return text.replaceAll(Tab$1, Space$1.repeat(tabSize));
+    return text.replaceAll(Tab, Space.repeat(tabSize));
   }
   return text;
 };
 const shouldNormalizeText = text => {
-  return text.includes(Tab$1);
+  return text.includes(Tab);
 };
 
 // based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
@@ -2694,7 +2731,7 @@ const getSelectionPairs = (selections, i) => {
 const getTabCount = string => {
   let count = 0;
   for (const element of string) {
-    if (element === Tab$1) {
+    if (element === Tab) {
       count++;
     }
   }
@@ -3850,7 +3887,7 @@ const guessOffset = (eventX, averageCharWidth) => {
 const normalizeGuess = (line, guess, tabSize) => {
   let normalizedGuess = guess;
   for (let i = 0; i < guess; i++) {
-    if (line[i] === Tab$1) {
+    if (line[i] === Tab) {
       normalizedGuess -= tabSize - 1;
     }
   }
@@ -4519,7 +4556,7 @@ const characterRight = (line, columnIndex) => {
   return next.segment.length;
 };
 const isWhitespace = char => {
-  return char === Space$1 || char === Tab$1;
+  return char === Space || char === Tab;
 };
 const lineCharacterStart = (line, columnIndex) => {
   if (line.length === 0) {
@@ -5331,55 +5368,25 @@ const goToTypeDefinition = async (editor, explicit = true) => {
   });
 };
 
-const Editor = 3;
-
-const handleContextMenu = async (editor, button, x, y) => {
-  await invoke$9(/* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
-  return editor;
-};
-
-// @ts-ignore
-
-// match all words, including umlauts, see https://stackoverflow.com/questions/5436824/matching-accented-characters-with-javascript-regexes/#answer-11550799
-const RE_WORD_START = /^[a-z\u00C0-\u017F\d]+/i;
-const RE_WORD_END = /[a-z\u00C0-\u017F\d]+$/i;
-
-// @ts-ignore
-const getNewSelections$7 = (line, rowIndex, columnIndex) => {
-  const before = line.slice(0, columnIndex);
-  const after = line.slice(columnIndex);
-  const beforeMatch = before.match(RE_WORD_END);
-  const afterMatch = after.match(RE_WORD_START);
-  const columnStart = columnIndex - (beforeMatch ? beforeMatch[0].length : 0);
-  const columnEnd = columnIndex + (afterMatch ? afterMatch[0].length : 0);
-  const newSelections = new Uint32Array([rowIndex, columnStart, rowIndex, columnEnd]);
-  return newSelections;
-};
-
-// @ts-ignore
-const selectWord = (editor, rowIndex, columnIndex) => {
-  const line = getLine(editor, rowIndex);
-  const newSelections = getNewSelections$7(line, rowIndex, columnIndex);
-  return scheduleSelections(editor, newSelections);
-};
-
-const handleDoubleClick = (editor, modifier, x, y) => {
-  const position = at(editor, x, y);
-  return selectWord(editor, position.rowIndex, position.columnIndex);
+const isPersistentWidget = widgetId => {
+  switch (widgetId) {
+    case Find:
+      return true;
+    default:
+      return false;
+  }
 };
 
-const WhenExpressionEditorText = 12;
-const handleFocus$1 = editor => {
-  // TODO make change events functional,
-  // when rendering, send focus changes to renderer worker
-  invoke$9('Focus.setFocus', WhenExpressionEditorText);
-  return editor;
+// TODO widgets should have a persistence property:
+// 1 = close by click (e.g. completion, hover, source-actions)
+// 2 = stay open on click (e.g. find)
+const closeWidgetsMaybe = widgets => {
+  if (widgets.length === 0) {
+    return widgets;
+  }
+  return widgets.filter(isPersistentWidget);
 };
 
-const Single = 1;
-const Double = 2;
-const Triple = 3;
-
 const state$3 = {
   position: {
     rowIndex: 0,
@@ -5439,19 +5446,22 @@ const handleSingleClickWithCtrl = async (editor, position) => {
 };
 
 const Ctrl = 1;
-const Alt$1 = 2;
+const Alt = 2;
 
 const handleSingleClickDefault = (editor, position) => {
+  // TODO avoid global variables, add them to editor state
   setPosition$1(position);
+  const widgets = closeWidgetsMaybe(editor.widgets);
   return {
     ...editor,
     selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
-    focused: true
+    focused: true,
+    widgets
   };
 };
 const getClickHandler = modifier => {
   switch (modifier) {
-    case Alt$1:
+    case Alt:
       return handleSingleClickWithAlt;
     case Ctrl:
       return handleSingleClickWithCtrl;
@@ -5460,26 +5470,75 @@ const getClickHandler = modifier => {
   }
 };
 
+const handleClickAtPosition = async (editor, modifier, rowIndex, columnIndex) => {
+  object(editor);
+  number(modifier);
+  number(rowIndex);
+  number(columnIndex);
+  const fn = getClickHandler(modifier);
+  const newEditor = await fn(editor, {
+    rowIndex,
+    columnIndex
+  });
+  return newEditor;
+};
+
+const Editor = 3;
+
+const handleContextMenu = async (editor, button, x, y) => {
+  await invoke$9(/* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
+  return editor;
+};
+
+// @ts-ignore
+
+// match all words, including umlauts, see https://stackoverflow.com/questions/5436824/matching-accented-characters-with-javascript-regexes/#answer-11550799
+const RE_WORD_START = /^[a-z\u00C0-\u017F\d]+/i;
+const RE_WORD_END = /[a-z\u00C0-\u017F\d]+$/i;
+
+// @ts-ignore
+const getNewSelections$7 = (line, rowIndex, columnIndex) => {
+  const before = line.slice(0, columnIndex);
+  const after = line.slice(columnIndex);
+  const beforeMatch = before.match(RE_WORD_END);
+  const afterMatch = after.match(RE_WORD_START);
+  const columnStart = columnIndex - (beforeMatch ? beforeMatch[0].length : 0);
+  const columnEnd = columnIndex + (afterMatch ? afterMatch[0].length : 0);
+  const newSelections = new Uint32Array([rowIndex, columnStart, rowIndex, columnEnd]);
+  return newSelections;
+};
+
+// @ts-ignore
+const selectWord = (editor, rowIndex, columnIndex) => {
+  const line = getLine(editor, rowIndex);
+  const newSelections = getNewSelections$7(line, rowIndex, columnIndex);
+  return scheduleSelections(editor, newSelections);
+};
+
+const handleDoubleClick = (editor, modifier, x, y) => {
+  const position = at(editor, x, y);
+  return selectWord(editor, position.rowIndex, position.columnIndex);
+};
+
+const WhenExpressionEditorText = 12;
+const handleFocus$1 = editor => {
+  // TODO make change events functional,
+  // when rendering, send focus changes to renderer worker
+  invoke$9('Focus.setFocus', WhenExpressionEditorText);
+  return editor;
+};
+
+const Single = 1;
+const Double = 2;
+const Triple = 3;
+
 const handleSingleClick = async (editor, modifier, x, y) => {
   object(editor);
   number(modifier);
   number(x);
   number(y);
   const position = at(editor, x, y);
-  const fn = getClickHandler(modifier);
-  const newEditor = await fn(editor, position);
-  // switch (newEditor.completionState) {
-  //   case EditorCompletionState.None:
-  //   case EditorCompletionState.Visible:
-  //   case EditorCompletionState.Loading:
-  //     return {
-  //       newState: newEditor,
-  //       commands: [],
-  //     }
-  //   default:
-  //     break
-  // }
-  return newEditor;
+  return handleClickAtPosition(editor, modifier, position.rowIndex, position.columnIndex);
 };
 
 // @ts-ignore
@@ -7343,8 +7402,12 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
     textInfos,
     differences
   } = await getVisible$1(editor, syncIncremental);
+  const latest2 = getEditor(editor.uid);
+  if (!latest2) {
+    return editor;
+  }
   const newEditor4 = {
-    ...latest,
+    ...latest2,
     focused: true,
     textInfos,
     differences
@@ -8058,7 +8121,7 @@ const type = (editor, text) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const Slash$1 = '/';
+const Slash = '/';
 
 const CurlyOpen = '{';
 const CurlyClose = '}';
@@ -8173,7 +8236,7 @@ const typeWithAutoClosing = async (editor, text) => {
       }
       break;
     // case AutoClosing.ClosingAngleBracket: // TODO support auto closing when typing closing angle bracket of start tag
-    case Slash$1:
+    case Slash:
       if (isAutoClosingTagsEnabled) {
         return typeWithAutoClosingTag(editor, text);
       }
@@ -9334,43 +9397,6 @@ const ensure = async (fontName, fontUrl) => {
   setLoaded(fontName);
 };
 
-const Backspace = 1;
-const Tab = 2;
-const Enter = 3;
-const Escape = 8;
-const Space = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-const Delete = 18;
-const KeyA = 29;
-const KeyC = 31;
-const KeyD = 32;
-const KeyF = 34;
-const KeyH = 36;
-const KeyJ = 38;
-const KeyK = 39;
-const KeyL = 40;
-const KeyO = 43;
-const KeyV = 50;
-const KeyX = 52;
-const KeyZ = 54;
-const F2 = 58;
-const F3 = 59;
-const F4 = 60;
-const F12 = 68;
-const Period = 87;
-const Slash = 88;
-const BracketLeft = 90;
-const BracketRight = 92;
-
-const CtrlCmd = 1 << 11 >>> 0;
-const Shift = 1 << 10 >>> 0;
-const Alt = 1 << 9 >>> 0;
-
 const getKeyBindings = () => {
   return [{
     key: Escape,
@@ -9413,59 +9439,59 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusNext',
     when: FocusFindWidget
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusToggleReplace',
     when: FocusFindWidget
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusReplace',
     when: FocusFindWidget
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusPreviousMatchButton',
     when: FocusFindWidgetReplace
   }, {
-    key: Alt | CtrlCmd | Enter,
+    key: Alt$1 | CtrlCmd | Enter,
     command: 'FindWidget.replaceAll',
     when: FocusFindWidgetReplace
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusNextMatchButton',
     when: FocusFindWidgetPreviousMatchButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusReplace',
     when: FocusFindWidgetPreviousMatchButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusPreviousMatchButton',
     when: FocusFindWidgetNextMatchButton
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusCloseButton',
     when: FocusFindWidgetNextMatchButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusNextMatchButton',
     when: FocusFindWidgetCloseButton
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusReplaceButton',
     when: FocusFindWidgetCloseButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusFind',
     when: FocusFindWidgetReplace
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'FindWidget.focusReplaceAllButton',
     when: FocusFindWidgetReplaceButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusCloseButton',
     when: FocusFindWidgetReplaceButton
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'FindWidget.focusReplaceButton',
     when: FocusFindWidgetReplaceAllButton
   }, {
@@ -9493,7 +9519,7 @@ const getKeyBindings = () => {
     command: 'EditorCompletion.focusFirst',
     when: FocusEditorCompletions
   }, {
-    key: CtrlCmd | Space,
+    key: CtrlCmd | Space$1,
     command: 'EditorCompletion.toggleDetails',
     when: FocusEditorCompletions
   }, {
@@ -9505,11 +9531,11 @@ const getKeyBindings = () => {
     command: 'Editor.cursorWordLeft',
     when: FocusEditorText
   }, {
-    key: Alt | Backspace,
+    key: Alt$1 | Backspace,
     command: 'Editor.deleteWordPartLeft',
     when: FocusEditorText
   }, {
-    key: Alt | Delete,
+    key: Alt$1 | Delete,
     command: 'Editor.deleteWordPartRight',
     when: FocusEditorText
   }, {
@@ -9533,11 +9559,11 @@ const getKeyBindings = () => {
     command: 'Editor.showSourceActions3',
     when: FocusEditorText
   }, {
-    key: Tab,
+    key: Tab$1,
     command: 'Editor.handleTab',
     when: FocusEditorText
   }, {
-    key: Shift | Tab,
+    key: Shift | Tab$1,
     command: 'Editor.unindent',
     when: FocusEditorText
   }, {
@@ -9645,7 +9671,7 @@ const getKeyBindings = () => {
     command: 'Editor.moveLineUp',
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Space,
+    key: CtrlCmd | Space$1,
     command: 'Editor.openCompletion',
     when: FocusEditorText
   }, {
@@ -9669,7 +9695,7 @@ const getKeyBindings = () => {
     command: 'Editor.cursorEnd',
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Slash,
+    key: CtrlCmd | Slash$1,
     command: 'Editor.toggleComment',
     when: FocusEditorText
   }, {
@@ -9693,35 +9719,35 @@ const getKeyBindings = () => {
     command: 'Editor.paste',
     when: FocusEditorText
   }, {
-    key: Alt | LeftArrow,
+    key: Alt$1 | LeftArrow,
     command: 'Editor.cursorWordPartLeft',
     when: FocusEditorText
   }, {
-    key: Alt | RightArrow,
+    key: Alt$1 | RightArrow,
     command: 'Editor.cursorWordPartRight',
     when: FocusEditorText
   }, {
-    key: Alt | F3,
+    key: Alt$1 | F3,
     command: 'Editor.selectAllOccurrences',
     when: FocusEditorText
   }, {
-    key: Alt | Shift | UpArrow,
+    key: Alt$1 | Shift | UpArrow,
     command: 'Editor.addCursorAbove',
     when: FocusEditorText
   }, {
-    key: Alt | Shift | DownArrow,
+    key: Alt$1 | Shift | DownArrow,
     command: 'Editor.addCursorBelow',
     when: FocusEditorText
   }, {
-    key: Alt | Shift | F12,
+    key: Alt$1 | Shift | F12,
     command: 'Editor.findAllReferences',
     when: FocusEditorText
   }, {
-    key: Alt | Shift | KeyO,
+    key: Alt$1 | Shift | KeyO,
     command: 'Editor.organizeImports',
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | Space,
+    key: CtrlCmd | Shift | Space$1,
     command: 'Editor.selectionGrow',
     when: FocusEditor
   }];
@@ -10537,6 +10563,9 @@ const effects = [editorDiagnosticEffect];
 const wrapCommand = fn => async (editorUid, ...args) => {
   const oldInstance = get$4(editorUid);
   const newEditor = await fn(oldInstance.newState, ...args);
+  if (oldInstance.newState === newEditor) {
+    return newEditor;
+  }
   for (const effect of effects) {
     if (effect.isActive(oldInstance.newState, newEditor)) {
       effect.apply(newEditor);
@@ -10586,6 +10615,7 @@ const commandMap = {
   'Editor.compositionEnd': compositionEnd,
   'Editor.compositionStart': compositionStart,
   'Editor.compositionUpdate': compositionUpdate,
+  'Editor.handleClickAtPosition': handleClickAtPosition,
   'Editor.applyDocumentEdits': applyDocumentEdits,
   'Editor.contextMenu': handleContextMenu,
   'Editor.copy': copy,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "10.0.0",
+  "version": "10.2.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
   "main": "dist/editorWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/constants": "^1.19.0"
+    "@lvce-editor/constants": "^1.23.0"
   }
 }