@lvce-editor/editor-worker 5.0.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
@@ -3190,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) {
@@ -3236,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);
@@ -3250,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)) {
@@ -3267,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;
@@ -4554,25 +4568,6 @@ 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] ?? [];
 };
@@ -5544,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);
 };
 
@@ -7889,6 +7893,8 @@ 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';
@@ -10892,7 +10898,7 @@ const getSearchFieldButtonVirtualDom = button => {
   } = button;
   return [{
     type: Div,
-    className: `SearchFieldButton ${checked ? 'SearchFieldButtonChecked' : ''}`,
+    className: mergeClassNames(SearchFieldButton, checked ? SearchFieldButtonChecked : ''),
     title,
     role: CheckBox,
     ariaChecked: checked,
@@ -10900,7 +10906,7 @@ const getSearchFieldButtonVirtualDom = button => {
     childCount: 1
   }, {
     type: Div,
-    className: `MaskIcon ${icon}`,
+    className: mergeClassNames(MaskIcon, icon),
     childCount: 0
   }];
 };

package/package.json

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