@lvce-editor/editor-worker 4.13.0 → 5.1.0

package/dist/editorWorkerMain.js

@@ -273,6 +273,17 @@ const joinLines$2 = lines => {
   return lines.join('\n');
 };
 
+const RE_WHITESPACE = /^\s+/;
+
+// TODO this doesn't belong here
+const getIndent = line => {
+  const whitespaceMatch = line.match(RE_WHITESPACE);
+  if (!whitespaceMatch) {
+    return '';
+  }
+  return whitespaceMatch[0];
+};
+
 // TODO have function for single edit (most common, avoid one array)
 const applyEdits = (textDocument, changes) => {
   object(textDocument);
@@ -330,7 +341,7 @@ const applyEdits = (textDocument, changes) => {
       // TODO only do this once after all edits, not inside loop
       textDocument.maxLineY = Math.min(textDocument.numberOfVisibleLines, textDocument.lines.length);
     }
-    linesDelta += Math.max(inserted.length - deleted.length, 0);
+    linesDelta += inserted.length - deleted.length;
   }
   return newLines;
 };
@@ -340,16 +351,6 @@ const getLine = (textDocument, index) => {
 const getText$1 = state => {
   return joinLines$2(state.lines);
 };
-const RE_WHITESPACE = /^\s+/;
-
-// TODO this doesn't belong here
-const getIndent = line => {
-  const whitespaceMatch = line.match(RE_WHITESPACE);
-  if (!whitespaceMatch) {
-    return '';
-  }
-  return whitespaceMatch[0];
-};
 
 // TDOO this doesn;t belong here
 const getSelectionText = (textDocument, range) => {
@@ -416,11 +417,6 @@ const positionAt = (textDocument, offset) => {
   } else {
     columnIndex = currentOffset - offset;
   }
-  console.log({
-    rowIndex,
-    columnIndex
-  });
-  // TODO
   return {
     rowIndex,
     columnIndex
@@ -531,11 +527,8 @@ const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing,
   const letterSpacingString = getLetterSpacingString(letterSpacing);
   const fontString = getFontString(fontWeight, fontSize, fontFamily);
   const ctx = getContext();
-  // @ts-ignore
   ctx.letterSpacing = letterSpacingString;
-  // @ts-ignore
   ctx.font = fontString;
-  // @ts-ignore
   const metrics = ctx.measureText(text);
   const width = metrics.width;
   return width;
@@ -1415,7 +1408,7 @@ const preparePrettyError = error => {
 const logError$1 = error => {
   // handled in renderer worker
 };
-const handleMessage = event => {
+const handleMessage = async event => {
   return handleJsonRpcMessage(event.target, event.data, execute$1, resolve, preparePrettyError, logError$1, requiresSocket);
 };
 
@@ -1468,7 +1461,7 @@ const set$4 = ipc => {
   state$8.ipc = ipc;
 };
 
-const invoke$4 = (method, ...params) => {
+const invoke$4 = async (method, ...params) => {
   const ipc = get$4();
   return invoke$5(ipc, method, ...params);
 };
@@ -1711,7 +1704,7 @@ const createRpc = method => {
     handleIpc(ipc);
     _ipc = ipc;
   };
-  const invoke = (method, ...params) => {
+  const invoke = async (method, ...params) => {
     return invoke$5(_ipc, method, ...params);
   };
   return {
@@ -2205,7 +2198,7 @@ const editorShowMessage = async (editor, rowIndex, columnIndex, message, isError
  * @returns
  */
 // @ts-ignore
-const showErrorMessage = (editor, rowIndex, columnIndex, message) => {
+const showErrorMessage = async (editor, rowIndex, columnIndex, message) => {
   return editorShowMessage(editor, rowIndex, columnIndex, message, /* isError */true);
 };
 
@@ -2268,8 +2261,7 @@ const cancelSelection = editor => {
 };
 
 const getIndex = (widgets, id) => {
-  for (let i = 0; i < widgets.length; i++) {
-    const widget = widgets[i];
+  for (const [i, widget] of widgets.entries()) {
     if (widget.id === id) {
       return i;
     }
@@ -2324,7 +2316,8 @@ const closeFind = editor => {
   const newWidgets = removeEditorWidget(widgets, Find);
   return {
     ...editor,
-    widgets: newWidgets
+    widgets: newWidgets,
+    focused: true
   };
 };
 
@@ -2405,12 +2398,8 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   };
   const newWidgets = [...widgets, latestWidget];
   // TODO avoid side effect, apply focus shift during render
-  if (fullFocus) {
-    await setFocus(focusKey);
-  } else {
-    await setAdditionalFocus(focusKey);
-  }
-  const newFocus = fullFocus ? false : true;
+  await (fullFocus ? setFocus(focusKey) : setAdditionalFocus(focusKey));
+  const newFocus = !fullFocus;
   const newEditor = {
     ...editor,
     widgets: newWidgets,
@@ -3021,7 +3010,7 @@ const cutSelectedText = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
-const cut = editor => {
+const cut = async editor => {
   const {
     selections
   } = editor;
@@ -3197,28 +3186,41 @@ const findAllReferences = async editor => {
   return editor;
 };
 
-// TODO format should be executed in parallel with saving
-// -> fast save, no need to wait for formatting
-// -> fast formatting, no need to wait for save
-
-// TODO should format on save when closing/switching editor?
+// TODO add tests for this
+const activateByEvent = async event => {
+  await invoke$3('ExtensionHostManagement.activateByEvent', event);
+};
 
-// TODO format with cursor
-// TODO should be in editor folder
+const execute = async ({
+  editor,
+  args,
+  event,
+  method,
+  noProviderFoundMessage,
+  noProviderFoundResult = undefined
+}) => {
+  const fullEvent = `${event}:${editor.languageId}`;
+  await activateByEvent(fullEvent);
+  const result = await invoke$2(method, editor.uid, ...args);
+  return result;
+};
 
-const format$1 = async editor => {
-  const edits = await invoke$3('Format.format', editor);
+const getFormattingEdits = async editor => {
+  const edits = await execute({
+    editor,
+    event: 'onFormatting',
+    method: 'ExtensionHostFormatting.executeFormattingProvider',
+    args: []
+  });
   return edits;
 };
 
-const warn = (...args) => {
-  console.warn(...args);
-};
-const error = (...args) => {
-  console.error(...args);
+const expectedErrorMessage$1 = 'Failed to execute formatting provider: FormattingError:';
+const isFormattingError = error => {
+  // @ts-ignore
+  return error && error instanceof Error && error.message.startsWith(expectedErrorMessage$1);
 };
 
-// @ts-ignore
 const getDocumentEdits = (editor, edits) => {
   const documentEdits = [];
   for (const edit of edits) {
@@ -3243,7 +3245,13 @@ const getDocumentEdits = (editor, edits) => {
   return documentEdits;
 };
 
-// @ts-ignore
+const warn = (...args) => {
+  console.warn(...args);
+};
+const error = (...args) => {
+  console.error(...args);
+};
+
 const applyDocumentEdits = (editor, edits) => {
   if (!Array.isArray(edits)) {
     warn('something is wrong with format on save', edits);
@@ -3257,14 +3265,11 @@ const applyDocumentEdits = (editor, edits) => {
 };
 
 const expectedErrorMessage = 'Failed to execute formatting provider: FormattingError:';
-const isFormattingError = error => {
-  return error && error instanceof Error && error.message.startsWith(expectedErrorMessage);
-};
 
 // TODO also format with cursor
 const format = async editor => {
   try {
-    const edits = await format$1(editor);
+    const edits = await getFormattingEdits(editor);
     return applyDocumentEdits(editor, edits);
   } catch (error) {
     if (isFormattingError(error)) {
@@ -3274,6 +3279,8 @@ const format = async editor => {
       return editor;
     }
     console.error(error);
+
+    // TODO configure editor message as widget
     const displayErrorMessage = `${error}`;
     await editorShowMessage(editor, 0, 0, displayErrorMessage, true);
     return editor;
@@ -3487,13 +3494,9 @@ const getErrorMessage$3 = error => {
 
 // @ts-ignore
 const isNoProviderFoundError$1 = error => {
-  return error &&
-  // @ts-ignore
-  error.message &&
-  // @ts-ignore
-  error.message.startsWith('Failed to execute definition provider: No definition provider found');
+  return error?.message?.startsWith('Failed to execute definition provider: No definition provider found');
 };
-const goToDefinition = editor => {
+const goToDefinition = async editor => {
   return goTo({
     editor,
     getLocation: getLocation$1,
@@ -3536,13 +3539,9 @@ const getErrorMessage$2 = error => {
   return `${error}`;
 };
 const isNoProviderFoundError = error => {
-  return error &&
-  // @ts-ignore
-  error.message &&
-  // @ts-ignore
-  error.message.startsWith('Failed to execute type definition provider: No type definition provider found');
+  return error?.message?.startsWith('Failed to execute type definition provider: No type definition provider found');
 };
-const goToTypeDefinition = (editor, explicit = true) => {
+const goToTypeDefinition = async (editor, explicit = true) => {
   return goTo({
     editor,
     getLocation,
@@ -4097,6 +4096,29 @@ const handleScrollBarPointerDown = (state, eventY) => {
   };
 };
 
+// const LONG_TOUCH_THRESHOLD = 150
+
+// @ts-ignore
+const handleTouchEnd = (editor, touchEvent) => {
+  // if (touchEvent.changedTouches.length === 0) {
+  //   return
+  // }
+  // const firstTouch = touchEvent.changedTouches[0]
+  // const position = EditorPosition.at(editor, firstTouch.x, firstTouch.y)
+  // @ts-ignore
+  // if (EditorMoveSelection.state.position.rowIndex === position.rowIndex && EditorMoveSelection.state.position.columnIndex === position.columnIndex) {
+  //   // @ts-ignore
+  //   if (Date.now() - EditorHandleTouchStart.state.date > LONG_TOUCH_THRESHOLD) {
+  //     EditorSelectWord.selectWord(editor, position.rowIndex, position.columnIndex)
+  //   } else {
+  //     // @ts-ignore
+  //     EditorCursorSet.cursorSet(editor, position)
+  //   }
+  // } else {
+  //   console.log('different position')
+  // }
+};
+
 const state$2 = {
   touchOffsetY: 0,
   deltaY: 0
@@ -4115,89 +4137,6 @@ const handleTouchStart = (editor, touchEvent) => {
   // state.date = Date.now()
 };
 
-const LessThan = -1;
-const Equal = 0;
-const GreaterThan = 1;
-
-// @ts-ignore
-
-// @ts-ignore
-const compare = (positionA, positionB) => {
-  if (positionA.rowIndex > positionB.rowIndex) {
-    return GreaterThan;
-  }
-  if (positionA.rowIndex === positionB.rowIndex) {
-    if (positionA.columnIndex > positionB.columnIndex) {
-      return GreaterThan;
-    }
-    if (positionA.columnIndex < positionB.columnIndex) {
-      return LessThan;
-    }
-    return Equal;
-  }
-  return LessThan;
-};
-
-// @ts-ignore
-const editorMoveSelectionBackwards = (anchor, position) => {
-  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const editorMoveSelectionEqual = (anchor, position) => {
-  return new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const editorMoveSelectionForwards = (anchor, position) => {
-  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const getNewSelections$5 = (anchor, position) => {
-  switch (compare(position, anchor)) {
-    case LessThan:
-      return editorMoveSelectionBackwards(anchor, position);
-    case Equal:
-      return editorMoveSelectionEqual(anchor, position);
-    case GreaterThan:
-      return editorMoveSelectionForwards(anchor, position);
-    default:
-      throw new Error('unexpected comparison result');
-  }
-};
-
-// @ts-ignore
-const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition$1();
-  const newSelections = getNewSelections$5(anchor, position);
-  // TODO if selection equals previous selection -> do nothing
-  return scheduleSelections(editor, newSelections);
-};
-
-const LONG_TOUCH_THRESHOLD = 150;
-
-// @ts-ignore
-const handleTouchEnd = (editor, touchEvent) => {
-  if (touchEvent.changedTouches.length === 0) {
-    return;
-  }
-  const firstTouch = touchEvent.changedTouches[0];
-  const position = at(editor, firstTouch.x, firstTouch.y);
-  // @ts-ignore
-  if (undefined.position.rowIndex === position.rowIndex && undefined.position.columnIndex === position.columnIndex) {
-    // @ts-ignore
-    if (Date.now() - state$2.date > LONG_TOUCH_THRESHOLD) {
-      selectWord(editor, position.rowIndex, position.columnIndex);
-    } else {
-      // @ts-ignore
-      cursorSet(editor, position);
-    }
-  } else {
-    console.log('different position');
-  }
-};
-
 // @ts-ignore
 const setDeltaY$1 = (editor, deltaY) => {
   return setDeltaY$2(editor, deltaY);
@@ -4309,7 +4248,7 @@ const indentMore = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const getLanguageConfiguration = editor => {
+const getLanguageConfiguration = async editor => {
   return invoke$3('Languages.getLanguageConfiguration', {
     uri: editor.uri,
     languageId: editor.languageId
@@ -4317,7 +4256,7 @@ const getLanguageConfiguration = editor => {
 };
 
 const getIncreaseIndentRegex = languageConfiguration => {
-  if (languageConfiguration && languageConfiguration.indentationRules && languageConfiguration.indentationRules.increaseIndentPattern && typeof languageConfiguration.indentationRules.increaseIndentPattern === 'string') {
+  if (languageConfiguration?.indentationRules?.increaseIndentPattern && typeof languageConfiguration.indentationRules.increaseIndentPattern === 'string') {
     const regex = new RegExp(languageConfiguration.indentationRules.increaseIndentPattern);
     return regex;
   }
@@ -4405,39 +4344,96 @@ const insertLineBreak = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
+const moveRectangleSelection = (editor, position) => {
+  // @ts-ignore
+  // const anchor = EditorMoveSelection.state.position
+  // const startRowIndex = anchor.rowIndex
+  // const startColumnIndex = anchor.columnIndex
+  // const endRowIndex = position.rowIndex
+  // const endColumnIndex = position.columnIndex
+  // const selectionEdits: any[] = []
+  // for (let i = startRowIndex; i <= endRowIndex; i++) {
+  //   selectionEdits.push({
+  //     start: {
+  //       rowIndex: i,
+  //       columnIndex: startColumnIndex,
+  //     },
+  //     end: {
+  //       rowIndex: i,
+  //       columnIndex: endColumnIndex,
+  //     },
+  //   })
+  // }
+  // // @ts-ignore
+  // const cursorEdits = [selectionEdits.at(-1).end]
+  // // @ts-ignore
+  // Editor.scheduleCursorsAndSelections(editor, cursorEdits, selectionEdits)
+  return editor;
+};
+
+// @ts-ignore
+const moveRectangleSelectionPx = (editor, x, y) => {
+  at(editor, x, y);
+};
+
+const LessThan = -1;
+const Equal = 0;
+const GreaterThan = 1;
+
 // @ts-ignore
 
 // @ts-ignore
-const moveRectangleSelection = (editor, position) => {
-  // @ts-ignore
-  const anchor = undefined.position;
-  const startRowIndex = anchor.rowIndex;
-  const startColumnIndex = anchor.columnIndex;
-  const endRowIndex = position.rowIndex;
-  const endColumnIndex = position.columnIndex;
-  const selectionEdits = [];
-  for (let i = startRowIndex; i <= endRowIndex; i++) {
-    selectionEdits.push({
-      start: {
-        rowIndex: i,
-        columnIndex: startColumnIndex
-      },
-      end: {
-        rowIndex: i,
-        columnIndex: endColumnIndex
-      }
-    });
+const compare = (positionA, positionB) => {
+  if (positionA.rowIndex > positionB.rowIndex) {
+    return GreaterThan;
   }
-  // @ts-ignore
-  const cursorEdits = [selectionEdits.at(-1).end];
-  // @ts-ignore
-  undefined(editor, cursorEdits, selectionEdits);
+  if (positionA.rowIndex === positionB.rowIndex) {
+    if (positionA.columnIndex > positionB.columnIndex) {
+      return GreaterThan;
+    }
+    if (positionA.columnIndex < positionB.columnIndex) {
+      return LessThan;
+    }
+    return Equal;
+  }
+  return LessThan;
 };
 
 // @ts-ignore
-const moveRectangleSelectionPx = (editor, x, y) => {
-  const position = at(editor, x, y);
-  moveRectangleSelection(editor, position);
+const editorMoveSelectionBackwards = (anchor, position) => {
+  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const editorMoveSelectionEqual = (anchor, position) => {
+  return new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const editorMoveSelectionForwards = (anchor, position) => {
+  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const getNewSelections$5 = (anchor, position) => {
+  switch (compare(position, anchor)) {
+    case LessThan:
+      return editorMoveSelectionBackwards(anchor, position);
+    case Equal:
+      return editorMoveSelectionEqual(anchor, position);
+    case GreaterThan:
+      return editorMoveSelectionForwards(anchor, position);
+    default:
+      throw new Error('unexpected comparison result');
+  }
+};
+
+// @ts-ignore
+const editorMoveSelection = (editor, position) => {
+  const anchor = getPosition$1();
+  const newSelections = getNewSelections$5(anchor, position);
+  // TODO if selection equals previous selection -> do nothing
+  return scheduleSelections(editor, newSelections);
 };
 
 const requestAnimationFrame = fn => {
@@ -4572,29 +4568,10 @@ const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
 
-// TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$3('ExtensionHostManagement.activateByEvent', event);
-};
-
-const execute = async ({
-  editor,
-  args,
-  event,
-  method,
-  noProviderFoundMessage,
-  noProviderFoundResult = undefined
-}) => {
-  const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent);
-  const result = await invoke$2(method, editor.uid, ...args);
-  return result;
-};
-
 const combineResults$2 = results => {
   return results[0] ?? [];
 };
-const executeCompletionProvider = (editor, offset) => {
+const executeCompletionProvider = async (editor, offset) => {
   return execute({
     editor,
     event: OnCompletion,
@@ -4608,7 +4585,7 @@ const executeCompletionProvider = (editor, offset) => {
 const combineResultsResolve = items => {
   return items[0] ?? undefined;
 };
-const executeResolveCompletionItem = (editor, offset, name, completionItem) => {
+const executeResolveCompletionItem = async (editor, offset, name, completionItem) => {
   return execute({
     editor,
     event: OnCompletion,
@@ -5135,7 +5112,7 @@ const getSearchRegex = searchString => {
 
 const findRegexMatches = (lines, regex) => {
   if (!regex.global) {
-    throw new Error(`regex must be global`);
+    throw new Error('regex must be global');
   }
   const {
     length
@@ -5562,9 +5539,18 @@ const openRename = async editor => {
   return addWidgetToEditor(Rename, FocusEditorRename, editor, create$4, newStateGenerator, fullFocus);
 };
 
+const getOrganizeImportEdits = async editor => {
+  const edits = await execute({
+    editor,
+    event: 'onLanguage',
+    method: 'ExtensionHostOrganizeImports.execute',
+    args: []
+  });
+  return edits;
+};
+
 const organizeImports = async editor => {
-  // TODO ask extension host worker directly
-  const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
+  const edits = await getOrganizeImportEdits(editor);
   return applyDocumentEdits(editor, edits);
 };
 
@@ -6357,7 +6343,6 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   } catch (error) {
     // TODO better error handling
     console.error(error);
-    return;
   }
 };
 const getTokenizer = languageId => {
@@ -6479,7 +6464,7 @@ const create$3 = () => {
   return widget;
 };
 
-const executeHoverProvider = (editor, offset) => {
+const executeHoverProvider = async (editor, offset) => {
   object(editor);
   number$1(offset);
   return execute({
@@ -6511,7 +6496,7 @@ const invoke = async (method, ...args) => {
   return invoke$5(_ipc, method, ...args);
 };
 
-const measureTextBlockHeight = (text, fontFamily, fontSize, lineHeight, width) => {
+const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
   return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
 };
 
@@ -6562,7 +6547,7 @@ const warnDeprecatedArrayReturn = (languageId, fn) => {
 const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
   try {
     const lineState = tokenizeLine(line, lineStateAtStart);
-    if (!lineState || !lineState.tokens || !lineState.state) {
+    if (!lineState?.tokens || !lineState.state) {
       throw new Error('invalid tokenization result');
     }
     if (!hasArrayReturn) {
@@ -6713,7 +6698,7 @@ const loadHoverContent = async state => {
   };
 };
 
-const newStateGenerator$1 = state => {
+const newStateGenerator$1 = async state => {
   return loadHoverContent(state);
 };
 const showHover2 = async editor => {
@@ -6799,7 +6784,7 @@ const create$2 = () => {
 };
 
 const showSourceActions = async editor => {
-  const newStateGenerator = state => {
+  const newStateGenerator = async state => {
     return loadSourceActions(editor, state);
   };
   return addWidgetToEditor(SourceAction, SourceActions, editor, create$2, newStateGenerator);
@@ -6867,7 +6852,7 @@ const sortLinesAscending = editor => {
 const combineResults$1 = results => {
   return results[0];
 };
-const executeTabCompletionProvider = (editor, offset) => {
+const executeTabCompletionProvider = async (editor, offset) => {
   return execute({
     editor,
     event: OnTabCompletion,
@@ -7004,7 +6989,7 @@ const tabCompletion = async editor => {
 
 const getBlockComment = async editor => {
   const languageConfiguration = await getLanguageConfiguration(editor);
-  if (!languageConfiguration || !languageConfiguration.comments || !languageConfiguration.comments.blockComment) {
+  if (!languageConfiguration?.comments?.blockComment) {
     return undefined;
   }
   return languageConfiguration.comments.blockComment;
@@ -7212,7 +7197,7 @@ const toggleBlockComment = async editor => {
 
 const getLineComment = async editor => {
   const languageConfiguration = await getLanguageConfiguration(editor);
-  if (!languageConfiguration || !languageConfiguration.comments || !languageConfiguration.comments.lineComment) {
+  if (!languageConfiguration?.comments?.lineComment) {
     return undefined;
   }
   return languageConfiguration.comments.lineComment;
@@ -7476,96 +7461,98 @@ const undo = state => {
 };
 
 // @ts-ignore
-const INDENT = '  ';
+
+// const INDENT = '  '
 
 // @ts-ignore
 const editorUnindent = editor => {
-  if (hasSelection(editor)) {
-    const documentEdits = [];
-    const cursorEdits = [];
-    const selectionEdits = [];
-    // @ts-ignore
-    const canUnindentSelection = selection => {
-      for (let i = selection.start.rowIndex; i <= selection.end.rowIndex; i++) {
-        if (editor.lines[i].startsWith(INDENT)) {
-          return true;
-        }
-      }
-      return false;
-    };
-    // TODO replace check with flag that indicates whether change occurred
-    // -> only iterate once over selection lines
-
-    if (!editor.selections.some(canUnindentSelection)) {
-      return;
-    }
-    // @ts-ignore
-    const indentLineMaybe = rowIndex => {
-      if (editor.lines[rowIndex].startsWith(INDENT)) {
-        documentEdits.push({
-          type: /* singleLineEdit */1,
-          rowIndex,
-          columnIndex: INDENT.length,
-          deleted: INDENT.length,
-          inserted: ''
-        });
-      }
-    };
-    let previousRowIndex = -1;
-    for (const selection of editor.selections) {
-      let startRowIndex = selection.start.rowIndex;
-      const endRowIndex = selection.end.rowIndex;
-      if (startRowIndex === previousRowIndex) {
-        startRowIndex++;
-      }
-      for (let i = startRowIndex; i <= endRowIndex; i++) {
-        indentLineMaybe(i);
-      }
-      let start = selection.start;
-      let end = selection.end;
-      if (editor.lines[start.rowIndex].startsWith(INDENT)) {
-        start = {
-          rowIndex: start.rowIndex,
-          columnIndex: Math.max(start.columnIndex - INDENT.length, 0)
-        };
-      }
-      if (editor.lines[end.rowIndex].startsWith(INDENT)) {
-        end = {
-          rowIndex: end.rowIndex,
-          columnIndex: Math.max(end.columnIndex - INDENT.length, 0)
-        };
-      }
-      cursorEdits.push(end);
-      selectionEdits.push({
-        start,
-        end
-      });
-      previousRowIndex = endRowIndex;
-    }
-    // @ts-ignore
-    undefined(editor, documentEdits, cursorEdits, selectionEdits);
-    return;
-  }
-  const documentEdits = [];
-  const cursorEdits = [];
-  if (!editor.lines[editor.cursor.rowIndex].startsWith(INDENT)) {
-    return;
-  }
-  // @ts-ignore
-  documentEdits.push({
-    type: /* singleLineEdit */1,
-    rowIndex: editor.cursor.rowIndex,
-    inserted: '',
-    columnIndex: 2,
-    deleted: 2
-  });
-  // @ts-ignore
-  cursorEdits.push({
-    rowIndex: editor.cursor.rowIndex,
-    columnIndex: editor.cursor.columnIndex - 2
-  });
-  // @ts-ignore
-  undefined(editor, documentEdits, cursorEdits);
+  // if (Editor.hasSelection(editor)) {
+  //   const documentEdits: any[] = []
+  //   const cursorEdits: any[] = []
+  //   const selectionEdits: any[] = []
+  //   // @ts-ignore
+  //   const canUnindentSelection = (selection) => {
+  //     for (let i = selection.start.rowIndex; i <= selection.end.rowIndex; i++) {
+  //       if (editor.lines[i].startsWith(INDENT)) {
+  //         return true
+  //       }
+  //     }
+  //     return false
+  //   }
+  //   // TODO replace check with flag that indicates whether change occurred
+  //   // -> only iterate once over selection lines
+
+  //   if (!editor.selections.some(canUnindentSelection)) {
+  //     return
+  //   }
+  //   // @ts-ignore
+  //   const indentLineMaybe = (rowIndex) => {
+  //     if (editor.lines[rowIndex].startsWith(INDENT)) {
+  //       documentEdits.push({
+  //         type: /* singleLineEdit */ 1,
+  //         rowIndex,
+  //         columnIndex: INDENT.length,
+  //         deleted: INDENT.length,
+  //         inserted: '',
+  //       })
+  //     }
+  //   }
+  //   let previousRowIndex = -1
+  //   for (const selection of editor.selections) {
+  //     let startRowIndex = selection.start.rowIndex
+  //     const endRowIndex = selection.end.rowIndex
+  //     if (startRowIndex === previousRowIndex) {
+  //       startRowIndex++
+  //     }
+  //     for (let i = startRowIndex; i <= endRowIndex; i++) {
+  //       indentLineMaybe(i)
+  //     }
+  //     let start = selection.start
+  //     let end = selection.end
+  //     if (editor.lines[start.rowIndex].startsWith(INDENT)) {
+  //       start = {
+  //         rowIndex: start.rowIndex,
+  //         columnIndex: Math.max(start.columnIndex - INDENT.length, 0),
+  //       }
+  //     }
+  //     if (editor.lines[end.rowIndex].startsWith(INDENT)) {
+  //       end = {
+  //         rowIndex: end.rowIndex,
+  //         columnIndex: Math.max(end.columnIndex - INDENT.length, 0),
+  //       }
+  //     }
+  //     cursorEdits.push(end)
+  //     selectionEdits.push({
+  //       start,
+  //       end,
+  //     })
+  //     previousRowIndex = endRowIndex
+  //   }
+  //   // @ts-ignore
+  //   Editor.scheduleDocumentAndCursorsAndSelections(editor, documentEdits, cursorEdits, selectionEdits)
+  //   return
+  // }
+  // const documentEdits = []
+  // const cursorEdits = []
+  // if (!editor.lines[editor.cursor.rowIndex].startsWith(INDENT)) {
+  //   return
+  // }
+  // // @ts-ignore
+  // documentEdits.push({
+  //   type: /* singleLineEdit */ 1,
+  //   rowIndex: editor.cursor.rowIndex,
+  //   inserted: '',
+  //   columnIndex: 2,
+  //   deleted: 2,
+  // })
+  // // @ts-ignore
+  // cursorEdits.push({
+  //   rowIndex: editor.cursor.rowIndex,
+  //   columnIndex: editor.cursor.columnIndex - 2,
+  // })
+  // // @ts-ignore
+  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
+  return editor;
 };
 // const editor = {
 //   textDocument: {
@@ -7863,6 +7850,7 @@ const handleSashPointerUp = (state, eventX, eventY) => {
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';
+const CodeGeneratorMessage = 'CodeGeneratorMessage';
 const CodeGeneratorWidget = 'CodeGeneratorWidget';
 const ColoredMaskIcon = 'ColoredMaskIcon';
 const ColorPicker = 'ColorPicker';
@@ -7872,7 +7860,6 @@ const ColorPickerLight = 'ColorPickerLight';
 const ColorPickerRectangle = 'ColorPickerRectangle';
 const ColorPickerSlider = 'ColorPickerSlider';
 const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
-const CodeGeneratorMessage = 'CodeGeneratorMessage';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
@@ -7903,10 +7890,14 @@ const IconClose = 'IconClose';
 const InputBox = 'InputBox';
 const Label = 'Label';
 const MaskIcon = 'MaskIcon';
+const MaskIconSymbolFile = 'MaskIconSymbolFile';
 const MultilineInputBox = 'MultilineInputBox';
 const SearchField = 'SearchField';
+const SearchFieldButton = 'SearchFieldButton';
+const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
 const SearchFieldButtons = 'SearchFieldButtons';
 const SourceActionHeading = 'SourceActionHeading';
+const SourceActionIcon = 'SourceActionIcon';
 const SourceActionItem = 'SourceActionItem';
 const SourceActionItemFocused = 'SourceActionItemFocused';
 const Viewlet = 'Viewlet';
@@ -8067,7 +8058,7 @@ const renderHover = (oldState, newState) => {
 const combineResults = results => {
   return results[0] ?? [];
 };
-const executeRenameProvider = (editor, offset, newName) => {
+const executeRenameProvider = async (editor, offset, newName) => {
   return execute({
     editor,
     event: OnRename,
@@ -8084,7 +8075,7 @@ const getRenameState = editor => {
 };
 
 const getRenameChanges = (editor, result) => {
-  if (!result || !result.edits) {
+  if (!result?.edits) {
     return [];
   }
   const changes = [];
@@ -8329,25 +8320,28 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
 // TODO multiple cursors -> vscode removes multiple cursors
 // TODO with selection -> vscode moves whole selection
 const moveLineDown = editor => {
-  const rowIndex = editor.cursor.rowIndex;
-  if (rowIndex === editor.lines.length - 1) {
-    return;
-  }
-  const documentEdits = [{
-    type: /* splice */2,
-    rowIndex: rowIndex,
-    count: 2,
-    newLines: [getLine(editor.textDocument, rowIndex + 1), getLine(editor.textDocument, rowIndex)]
-  }];
-  // @ts-ignore
-  const cursorEdits = undefined(editor, (editor, cursor) => {
-    return {
-      rowIndex: cursor.rowIndex + 1,
-      columnIndex: cursor.columnIndex
-    };
-  });
+  // const rowIndex = editor.cursor.rowIndex
+  // if (rowIndex === editor.lines.length - 1) {
+  //   return
+  // }
+  // const documentEdits = [
+  //   {
+  //     type: /* splice */ 2,
+  //     rowIndex: rowIndex,
+  //     count: 2,
+  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex + 1), TextDocument.getLine(editor.textDocument, rowIndex)],
+  //   },
+  // ]
+  // // @ts-ignore
+  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
+  //   return {
+  //     rowIndex: cursor.rowIndex + 1,
+  //     columnIndex: cursor.columnIndex,
+  //   }
+  // })
   // @ts-ignore
-  undefined(editor, documentEdits, cursorEdits);
+  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
+  return editor;
 };
 
 const create = () => {
@@ -8395,26 +8389,29 @@ const openCodeGenerator = async editor => {
 
 // TODO handle multiple cursors
 const moveLineUp = editor => {
-  const rowIndex = editor.cursor.rowIndex;
-  if (rowIndex === 0) {
-    return;
-  }
-  const documentEdits = [{
-    type: /* splice */2,
-    rowIndex: rowIndex - 1,
-    count: 2,
-    newLines: [getLine(editor.textDocument, rowIndex), getLine(editor.textDocument, rowIndex - 1)]
-  }];
-  // @ts-ignore
-  const cursorEdits = undefined(editor, (editor, cursor) => {
-    return {
-      // TODO handle bottom 0
-      rowIndex: cursor.rowIndex - 1,
-      columnIndex: cursor.columnIndex
-    };
-  });
-  // @ts-ignore
-  undefined(editor, documentEdits, cursorEdits);
+  // const rowIndex = editor.cursor.rowIndex
+  // if (rowIndex === 0) {
+  //   return
+  // }
+  // const documentEdits = [
+  //   {
+  //     type: /* splice */ 2,
+  //     rowIndex: rowIndex - 1,
+  //     count: 2,
+  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex), TextDocument.getLine(editor.textDocument, rowIndex - 1)],
+  //   },
+  // ]
+  // // @ts-ignore
+  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
+  //   return {
+  //     // TODO handle bottom 0
+  //     rowIndex: cursor.rowIndex - 1,
+  //     columnIndex: cursor.columnIndex,
+  //   }
+  // })
+  // // @ts-ignore
+  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
+  return editor;
 };
 
 const Link$1 = 'Link';
@@ -8627,7 +8624,7 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
 const sentLines = Object.create(null);
 
 // TODO only send changed lines to renderer process instead of all lines in viewport
-const getTokensViewport2 = (editor, startLineIndex, endLineIndex, syncIncremental) => {
+const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncremental) => {
   if (getEnabled$1()) {
     if (syncIncremental) {
       const {
@@ -8828,7 +8825,7 @@ const getLineInfo = (line, tokenResults, embeddedResults, decorations, TokenMap,
   } = getOffsets(deltaX, width, averageCharWidth);
   if (embeddedResults.length > 0 && tokenResults.embeddedResultIndex !== undefined) {
     const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
-    if (embeddedResult && embeddedResult.isFull) {
+    if (embeddedResult?.isFull) {
       return getLineInfoEmbeddedFull(embeddedResults, tokenResults, line, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
     }
   }
@@ -9039,14 +9036,14 @@ const addWidget$1 = widget => {
 const renderWidget = widget => {
   const module = get$7(widget.id);
   if (!module) {
-    throw new Error(`unsupported widget`);
+    throw new Error('unsupported widget');
   }
   return module.render(widget);
 };
 const removeWidget$1 = widget => {
   const module = get$7(widget.id);
   if (!module) {
-    throw new Error(`unsupported widget`);
+    throw new Error('unsupported widget');
   }
   return module.remove(widget);
 };
@@ -9243,7 +9240,8 @@ const closeCodeGenerator = editor => {
   const newWidgets = removeEditorWidget(widgets, CodeGenerator);
   return {
     ...editor,
-    widgets: newWidgets
+    widgets: newWidgets,
+    focused: true
   };
 };
 
@@ -9325,7 +9323,13 @@ const wrapCommands = commands => {
   }
 };
 
+const codeGeneratorAccept = state => {
+  // TODO close code generator widget
+  return state;
+};
+
 const commandMap = {
+  'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.handleSliderPointerDown': handleSliderPointerDown,
   'ColorPicker.handleSliderPointerMove': handleSliderPointerMove,
   'ColorPicker.loadContent': loadContent$3,
@@ -10808,23 +10812,41 @@ const getFindWidgetButtonsEnabled = (matchCount, value) => {
 const getFindWidgetFocusSelector = focus => {
   switch (focus) {
     case FindWidget:
-      return `[name="${SearchValue}"]`;
+      {
+        return `[name="${SearchValue}"]`;
+      }
     case FocusFindWidgetReplace:
-      return `[name="${ReplaceValue}"]`;
+      {
+        return `[name="${ReplaceValue}"]`;
+      }
     case FocusFindWidgetReplaceAllButton:
-      return `[name="${ReplaceAll}"]`;
+      {
+        return `[name="${ReplaceAll}"]`;
+      }
     case FocusFindWidgetCloseButton:
-      return `[name="${Close}"]`;
+      {
+        return `[name="${Close}"]`;
+      }
     case FocusFindWidgetToggleReplace:
-      return `[name="${ToggleReplace}"]`;
+      {
+        return `[name="${ToggleReplace}"]`;
+      }
     case FocusFindWidgetNextMatchButton:
-      return `[name="${FocusNext}"]`;
+      {
+        return `[name="${FocusNext}"]`;
+      }
     case FocusFindWidgetPreviousMatchButton:
-      return `[name="${FocusPrevious}"]`;
+      {
+        return `[name="${FocusPrevious}"]`;
+      }
     case FocusFindWidgetReplaceButton:
-      return `[name="${Replace}"]`;
+      {
+        return `[name="${Replace}"]`;
+      }
     default:
-      return '';
+      {
+        return '';
+      }
   }
 };
 
@@ -10876,7 +10898,7 @@ const getSearchFieldButtonVirtualDom = button => {
   } = button;
   return [{
     type: Div,
-    className: `SearchFieldButton ${checked ? 'SearchFieldButtonChecked' : ''}`,
+    className: mergeClassNames(SearchFieldButton, checked ? SearchFieldButtonChecked : ''),
     title,
     role: CheckBox,
     ariaChecked: checked,
@@ -10884,7 +10906,7 @@ const getSearchFieldButtonVirtualDom = button => {
     childCount: 1
   }, {
     type: Div,
-    className: `MaskIcon ${icon}`,
+    className: mergeClassNames(MaskIcon, icon),
     childCount: 0
   }];
 };
@@ -11249,7 +11271,7 @@ const getSourceActionListItemVirtualDom = sourceAction => {
     childCount: 2
   }, {
     type: Div,
-    className: 'SourceActionIcon MaskIcon MaskIconSymbolFile'
+    className: mergeClassNames(SourceActionIcon, MaskIcon, MaskIconSymbolFile)
   }, text(name)];
 };
 

package/package.json

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