@lvce-editor/editor-worker 1.13.0 → 1.15.0

package/dist/editorWorkerMain.js

@@ -274,7 +274,7 @@ const applyEdits = (textDocument, changes) => {
 const getLine = (textDocument, index) => {
   return textDocument.lines[index];
 };
-const getText = state => {
+const getText$1 = state => {
   return joinLines$2(state.lines);
 };
 const RE_WHITESPACE = /^\s+/;
@@ -2771,7 +2771,6 @@ const editorCursorHorizontalRight = (editor, getDelta) => {
   return scheduleSelections(editor, newSelections);
 };
 
-// @ts-ignore
 const cursorCharacterRight = editor => {
   return editorCursorHorizontalRight(editor, characterRight);
 };
@@ -3532,7 +3531,6 @@ const Alt = 2;
 
 // TODO first change cursor position, then run go to definition
 // cursor should appear at mousedown position immediately
-// @ts-ignore
 const handleSingleClickWithAlt = async (editor, position) => {
   const {
     rowIndex,
@@ -3547,8 +3545,6 @@ const handleSingleClickWithAlt = async (editor, position) => {
   const newEditor2 = await goToDefinition(newEditor);
   return newEditor2;
 };
-
-// @ts-ignore
 const handleSingleClickWithCtrl = async (editor, position) => {
   const selections = editor.selections;
   for (let i = 0; i < selections.length; i += 4) {
@@ -3572,8 +3568,6 @@ const handleSingleClickWithCtrl = async (editor, position) => {
   newSelections[insertIndex + 3] = position.columnIndex;
   return scheduleSelections(editor, newSelections);
 };
-
-// @ts-ignore
 const handleSingleClickDefault = (editor, position) => {
   setPosition$1(position);
   return {
@@ -3582,8 +3576,6 @@ const handleSingleClickDefault = (editor, position) => {
     focused: true
   };
 };
-
-// @ts-ignore
 const getFn = modifier => {
   switch (modifier) {
     case Alt:
@@ -3594,8 +3586,6 @@ const getFn = modifier => {
       return handleSingleClickDefault;
   }
 };
-
-// @ts-ignore
 const handleSingleClick = async (editor, modifier, x, y) => {
   object(editor);
   number$1(modifier);
@@ -3647,7 +3637,6 @@ const handleTripleClick = (editor, modifier, x, y) => {
   };
 };
 
-// @ts-ignore
 const handleMouseDown = (state, modifier, x, y, detail) => {
   switch (detail) {
     case Single:
@@ -4468,6 +4457,25 @@ const openFind = async state => {
   return state;
 };
 
+const getEditor = editorUid => {
+  const instance = get$6(editorUid);
+  if (!instance) {
+    throw new Error(`editor ${editorUid} not found`);
+  }
+  const {
+    newState
+  } = instance;
+  return newState;
+};
+
+const getText = editorUid => {
+  const editor = getEditor(editorUid);
+  const {
+    lines
+  } = editor;
+  return lines.join('\n');
+};
+
 const organizeImports = async editor => {
   // TODO ask extension host worker directly
   const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
@@ -4624,7 +4632,7 @@ const save = async editor => {
   try {
     const uri = editor.uri;
     const newEditor = await getNewEditor(editor);
-    const content = getText(newEditor);
+    const content = getText$1(newEditor);
     await invoke$3('FileSystem.writeFile', uri, content);
     return newEditor;
   } catch (error) {
@@ -5181,17 +5189,6 @@ const setDecorations = (editor, decorations, diagnostics) => {
   };
 };
 
-const getEditor = editorUid => {
-  const instance = get$6(editorUid);
-  if (!instance) {
-    throw new Error(`editor ${editorUid} not found`);
-  }
-  const {
-    newState
-  } = instance;
-  return newState;
-};
-
 /**
  * @enum number
  */
@@ -6874,6 +6871,14 @@ const ensure = async (fontName, fontUrl) => {
   setLoaded(fontName);
 };
 
+const getSelections = editorUid => {
+  const editor = getEditor(editorUid);
+  const {
+    selections
+  } = editor;
+  return selections;
+};
+
 const executeHoverProvider = (editor, offset) => {
   object(editor);
   number$1(offset);
@@ -7867,6 +7872,11 @@ const renderFocus = {
     return oldState.focused === newState.focused;
   },
   apply(oldState, newState) {
+    // TODO avoid side effect
+    if (newState.focused) {
+      const FocusEditorText = 12;
+      invoke$3('Focus.setFocus', FocusEditorText);
+    }
     return [/* method */'setFocused', newState.focused];
   }
 };
@@ -7919,7 +7929,7 @@ const renderEditor = async id => {
   return commands;
 };
 
-const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Initialize.initialize', 'EditorCompletion.advance', 'EditorCompletion.handleEditorBlur', 'EditorCompletion.handleEditorClick', 'EditorCompletion.handleEditorDeleteLeft', 'EditorCompletion.handleEditorType', 'EditorCompletion.loadContent', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'ColorPicker.render', 'Hover.render', 'Hover.loadContent', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp'];
+const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'ColorPicker.render', 'Editor.getText', 'Editor.getSelections', 'EditorCompletion.advance', 'EditorCompletion.handleEditorBlur', 'EditorCompletion.handleEditorClick', 'EditorCompletion.handleEditorDeleteLeft', 'EditorCompletion.handleEditorType', 'EditorCompletion.loadContent', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
 
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
@@ -8137,9 +8147,6 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
     childCount: 0,
     onPointerDown: HandleSashPointerDown
   });
-  console.log({
-    dom
-  });
   return dom;
 };
 
@@ -8228,6 +8235,7 @@ const commandMap = {
   'Editor.findAllReferences': findAllReferences,
   'Editor.format': format,
   'Editor.getWordAt': getWordAt,
+  'Editor.getText': getText,
   'Editor.getWordBefore': getWordBefore,
   'Editor.goToDefinition': goToDefinition,
   'Editor.goToTypeDefinition': goToTypeDefinition,
@@ -8304,6 +8312,7 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
+  'Editor.getSelections': getSelections,
   'EditorCompletion.advance': advance,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",