@lvce-editor/editor-worker 3.29.0 → 3.31.0

package/dist/editorWorkerMain.js

@@ -1736,6 +1736,7 @@ const {
 const CompletionExecute = 'ExtensionHostCompletion.execute';
 const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 const HoverExecute = 'ExtensionHostHover.execute';
+const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
 const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing) => {
@@ -2999,7 +3000,7 @@ const cut = editor => {
 
 // TODO optimize this function by profiling and not allocating too many objects
 // @ts-ignore
-const getChanges$6 = (lines, selections, getDelta) => {
+const getChanges$5 = (lines, selections, getDelta) => {
   const changes = [];
   // TODO avoid closure
   const deleteSelection = (selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
@@ -3063,7 +3064,7 @@ const deleteLeftWithAutoClose = editor => {
     selections[i + 1]++;
     selections[i + 3]++;
   }
-  const changes = getChanges$6(lines, selections, twoCharactersLeft);
+  const changes = getChanges$5(lines, selections, twoCharactersLeft);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 const editorDeleteHorizontalLeft = (editor, getDelta) => {
@@ -3076,7 +3077,7 @@ const editorDeleteHorizontalLeft = (editor, getDelta) => {
     return deleteLeftWithAutoClose(editor);
   }
   if (isEverySelectionEmpty(selections)) {
-    const changes = getChanges$6(lines, selections, getDelta);
+    const changes = getChanges$5(lines, selections, getDelta);
     return scheduleDocumentAndCursorsSelections(editor, changes);
   }
   const changes = editorReplaceSelections(editor, [''], DeleteLeft);
@@ -3091,7 +3092,7 @@ const deleteAllLeft = editor => {
 // @ts-ignore
 
 // @ts-ignore
-const getChanges$5 = (editor, getDelta) => {
+const getChanges$4 = (editor, getDelta) => {
   const selections = editor.selections;
   if (isEverySelectionEmpty(selections)) {
     const changes = [];
@@ -3121,7 +3122,7 @@ const getChanges$5 = (editor, getDelta) => {
   return changes;
 };
 const editorDeleteHorizontalRight = (editor, getDelta) => {
-  const changes = getChanges$5(editor, getDelta);
+  const changes = getChanges$4(editor, getDelta);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -3817,7 +3818,7 @@ const getSelectionFromNativeRange = (editor, range) => {
 };
 
 // @ts-ignore
-const getChanges$4 = (editor, data, range) => {
+const getChanges$3 = (editor, data, range) => {
   const selection = getSelectionFromNativeRange(editor, range);
   const selectionRange = {
     start: {
@@ -3839,7 +3840,7 @@ const getChanges$4 = (editor, data, range) => {
   return changes;
 };
 const handleBeforeInputFromContentEditable = (editor, data, range) => {
-  const changes = getChanges$4(editor, data, range);
+  const changes = getChanges$3(editor, data, range);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -4195,7 +4196,7 @@ const handleTouchMove = (editor, touchEvent) => {
 };
 
 // @ts-ignore
-const getChanges$3 = selections => {
+const getChanges$2 = selections => {
   const changes = [];
   const rowsToIndentLess = [];
   for (let i = 0; i < selections.length; i += 4) {
@@ -4226,11 +4227,11 @@ const getChanges$3 = selections => {
 // @ts-ignore
 const indentLess = editor => {
   const selections = editor.selections;
-  const changes = getChanges$3(selections);
+  const changes = getChanges$2(selections);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const getChanges$2 = selections => {
+const getChanges$1 = selections => {
   const rowsToIndent = [];
   for (let i = 0; i < selections.length; i += 4) {
     const selectionStartRow = selections[i];
@@ -4261,7 +4262,7 @@ const indentMore = editor => {
   const {
     selections
   } = editor;
-  const changes = getChanges$2(selections);
+  const changes = getChanges$1(selections);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -4285,7 +4286,7 @@ const shouldIncreaseIndent = (before, increaseIndentRegex) => {
   }
   return increaseIndentRegex.test(before);
 };
-const getChanges$1 = (lines, selections, languageConfiguration) => {
+const getChanges = (lines, selections, languageConfiguration) => {
   const changes = [];
   const selectionChanges = [];
   const increaseIndentRegex = getIncreaseIndentRegex(languageConfiguration);
@@ -4357,7 +4358,7 @@ const insertLineBreak = async editor => {
   const {
     changes,
     selectionChanges
-  } = getChanges$1(lines, selections, languageConfiguration);
+  } = getChanges(lines, selections, languageConfiguration);
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
@@ -4525,6 +4526,7 @@ const create$4 = () => {
 
 const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
+const OnTabCompletion = 'onTabCompletion';
 
 // TODO add tests for this
 const activateByEvent = async event => {
@@ -4545,7 +4547,7 @@ const execute = async ({
   return result;
 };
 
-const combineResults = results => {
+const combineResults$1 = results => {
   return results[0] ?? [];
 };
 const executeCompletionProvider = (editor, offset) => {
@@ -4556,7 +4558,7 @@ const executeCompletionProvider = (editor, offset) => {
     args: [offset],
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: [],
-    combineResults
+    combineResults: combineResults$1
   });
 };
 const combineResultsResolve = items => {
@@ -4574,15 +4576,19 @@ const executeResolveCompletionItem = (editor, offset, name, completionItem) => {
   });
 };
 
-// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async editor => {
+const getOffsetAtCursor = editor => {
   const {
     selections
   } = editor;
   const rowIndex = selections[0];
   const columnIndex = selections[1];
-  // Editor.sync(editor)
-  const offset = await offsetAt(editor, rowIndex, columnIndex);
+  const offset = offsetAt(editor, rowIndex, columnIndex);
+  return offset;
+};
+
+// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
+const getCompletions = async editor => {
+  const offset = getOffsetAtCursor(editor);
   const completions = await executeCompletionProvider(editor, offset);
   return completions;
 };
@@ -4593,9 +4599,7 @@ const resolveCompletion = async (editor, name, completionItem) => {
     object(editor);
     string(name);
     object(completionItem);
-    const rowIndex = editor.selections[0];
-    const columnIndex = editor.selections[1];
-    const offset = await offsetAt(editor, rowIndex, columnIndex);
+    const offset = getOffsetAtCursor(editor);
     // @ts-ignore
     const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
     return resolvedCompletionItem;
@@ -5254,6 +5258,35 @@ const handleBlur = async state => {
   return state;
 };
 
+const refresh$1 = (editor, state, value) => {
+  const {
+    lines
+  } = editor;
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    ...state,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    value
+  };
+};
+
+const refresh = (state, value = state.value) => {
+  // TODO get focused editor
+  const {
+    editorUid
+  } = state;
+  // highlight locations that match value
+  const editor = getEditor(editorUid);
+  return refresh$1(editor, state, value);
+};
+
+const handleInput = (state, value) => {
+  return refresh(state, value);
+};
+
 const handleFindWidgetFocus = (state, focusKey) => {
   if (state.focus === focusKey) {
     return state;
@@ -5311,29 +5344,6 @@ const loadContent$1 = editorId => {
     editorUid: editor.uid
   };
 };
-const refresh = (state, value = state.value) => {
-  // TODO get focused editor
-  const {
-    editorUid
-  } = state;
-  // highlight locations that match value
-  const editor = getEditor(editorUid);
-  const {
-    lines
-  } = editor;
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    ...state,
-    matches,
-    matchIndex: 0,
-    matchCount,
-    value
-  };
-};
-const handleInput = (state, value) => {
-  return refresh(state, value);
-};
 const close$1 = async state => {
   // TODO
   // await Viewlet.closeWidget(uid)
@@ -6699,18 +6709,28 @@ const sortLinesAscending = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
+const combineResults = results => {
+  return results[0];
+};
+const executeTabCompletionProvider = (editor, offset) => {
+  return execute({
+    editor,
+    event: OnTabCompletion,
+    method: TabCompletionExecuteTabCompletionProvider,
+    args: [offset],
+    noProviderFoundMessage: 'No tab completion provider found',
+    combineResults,
+    noProviderFoundResult: undefined
+  });
+};
+
 const getTabCompletion = async editor => {
-  const {
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const offset = offsetAt(editor, rowIndex, columnIndex);
-  const tabCompletion = await invoke$3('ExtensionHostTabCompletion.executeTabCompletionProvider', editor, offset);
-  return tabCompletion;
+  const offset = getOffsetAtCursor(editor);
+  const completions = await executeTabCompletionProvider(editor, offset);
+  return completions;
 };
 
-const getChanges = (lines, selections, snippet) => {
+const getSnippetChanges = (lines, selections, snippet) => {
   // TODO verify that deleted fits in the line
   const insertedLines = splitLines$2(snippet.inserted);
   const changes = [];
@@ -6802,7 +6822,7 @@ const editorSnippet = (editor, snippet) => {
   const {
     changes,
     selectionChanges
-  } = getChanges(lines, selections, snippet);
+  } = getSnippetChanges(lines, selections, snippet);
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
@@ -7887,6 +7907,26 @@ const replaceTextOccurrences = (editor, matches, oldValue, newValue) => {
   return replaceRange(editor, ranges, [newValue], ReplaceAll$2);
 };
 
+const updateWidget = (editor, widgetId, newState) => {
+  // TODO avoid closure
+  const isWidget = widget => {
+    return widget.id === widgetId;
+  };
+  const childIndex = editor.widgets.findIndex(isWidget);
+  // TODO scroll up/down if necessary
+  const childWidget = editor.widgets[childIndex];
+  const newWidget = {
+    ...childWidget,
+    oldState: childWidget.newState,
+    newState
+  };
+  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
+};
+
 const replaceAll$1 = async editor => {
   const state = getFindState(editor);
   if (!state) {
@@ -7899,7 +7939,9 @@ const replaceAll$1 = async editor => {
   } = state;
   const edits = replaceTextOccurrences(editor, matches, value, replacement);
   const newEditor = await applyEdit(editor, edits);
-  return newEditor;
+  const newState = refresh$1(newEditor, state, value);
+  const newestEditor = updateWidget(newEditor, Find, newState);
+  return newestEditor;
 };
 
 const pending = Object.create(null);
@@ -7989,6 +8031,19 @@ const handleBeforeInput = (editor, inputType, data) => {
   }
 };
 
+const applyTabCompletion = (editor, result) => {
+  return editorSnippet(editor, result);
+};
+
+const handleTab = async editor => {
+  const result = await getTabCompletion(editor);
+  if (!result) {
+    // TODO enter tab or two spaces
+    return editor;
+  }
+  return applyTabCompletion(editor, result);
+};
+
 let enabled = false;
 const setEnabled = value => {
   enabled = value;
@@ -8887,16 +8942,8 @@ const wrapWidgetCommand = (widgetId, fn) => {
     // TODO scroll up/down if necessary
     const childWidget = editor.widgets[childIndex];
     const newState = await fn(childWidget.newState, ...args);
-    const newWidget = {
-      ...childWidget,
-      oldState: childWidget.newState,
-      newState
-    };
-    const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
-    return {
-      ...editor,
-      widgets: newWidgets
-    };
+    const newEditor = updateWidget(editor, widgetId, newState);
+    return newEditor;
   };
   return wrapped;
 };
@@ -8962,6 +9009,7 @@ const commandMap = {
   'ColorPicker.loadContent': loadContent$3,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
+  'Editor.handleTab': handleTab,
   'Editor.applyEdit': applyEdit,
   'Editor.braceCompletion': braceCompletion,
   'Editor.cancelSelection': cancelSelection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.29.0",
+  "version": "3.31.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",