@lvce-editor/editor-worker 4.8.0 → 4.10.0

package/dist/editorWorkerMain.js

@@ -144,6 +144,7 @@ const IndentMore = 'indentMore';
 const InsertLineBreak = 'insertLineBreak';
 const ReplaceAll$2 = 'replaceAll';
 const ToggleBlockComment = 'toggleBlockComment';
+const Rename$1 = 'rename';
 
 const map$1 = Object.create(null);
 const set$7 = (id, widget) => {
@@ -398,23 +399,27 @@ const offsetAt = (textDocument, positionRowIndex, positionColumnIndex) => {
   return offset;
 };
 const positionAt = (textDocument, offset) => {
+  const {
+    lines
+  } = textDocument;
   let rowIndex = 0;
   let columnIndex = 0;
   let currentOffset = 0;
-  while (rowIndex < textDocument.lines.length && currentOffset < offset) {
-    currentOffset += textDocument.lines[rowIndex].length + 1;
+  while (rowIndex < lines.length && currentOffset < offset) {
+    currentOffset += lines[rowIndex].length + 1;
     rowIndex++;
   }
   if (currentOffset > offset) {
     rowIndex--;
-    currentOffset -= textDocument.lines[rowIndex].length + 1;
+    currentOffset -= lines[rowIndex].length + 1;
     columnIndex = offset - currentOffset;
   } else {
     columnIndex = currentOffset - offset;
   }
-  // for (let i = 0; i < textDocument.lines.length; i++) {
-  // if(currentOffset)
-  // }
+  console.log({
+    rowIndex,
+    columnIndex
+  });
   // TODO
   return {
     rowIndex,
@@ -3012,7 +3017,6 @@ const cutLine = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
-// @ts-ignore
 const cutSelectedText = async editor => {
   const {
     selections
@@ -7952,6 +7956,13 @@ const HandleFocusIn = 'handleFocusIn';
 const HandleClick = 'handleClick';
 const HandleInput = 'handleInput';
 const HandleFocus = 'handleFocus';
+const HandleClickPreviousMatch = 'handleClickPreviousMatch';
+const HandleClickNextMatch = 'handleClickNextMatch';
+const HandleClickClose = 'handleClickClose';
+const HandleClickReplace = 'handleClickReplace';
+const HandleClickReplaceAll = 'handleClickReplaceAll';
+const HandleReplaceInput = 'handleReplaceInput';
+const HandleReplaceFocus = 'handleReplaceFocus';
 
 const hoverProblemMessage = {
   type: Span,
@@ -8068,6 +8079,35 @@ const getRenameState = editor => {
   return getWidgetState(editor, Rename);
 };
 
+const getRenameChanges = (editor, result) => {
+  if (!result || !result.edits) {
+    return [];
+  }
+  const changes = [];
+  console.log({
+    result
+  });
+  for (const edit of result.edits) {
+    const position = positionAt(editor, edit.offset);
+    const start = position;
+    const end = {
+      ...position,
+      columnIndex: start.columnIndex + edit.deleted
+    };
+    const selection = {
+      start,
+      end
+    };
+    changes.push({
+      start,
+      end,
+      inserted: [result.inserted],
+      deleted: getSelectionText(editor, selection),
+      origin: Rename$1
+    });
+  }
+  return changes;
+};
 const accept = async editor => {
   const child = getRenameState(editor);
   if (!child) {
@@ -8080,8 +8120,9 @@ const accept = async editor => {
   // TODO
   const offset = getOffsetAtCursor(editor);
   const result = await executeRenameProvider(editor, offset, child.newValue);
+  const changes = getRenameChanges(editor, result);
   console.log({
-    result
+    changes
   });
   // 1. ask extension host for rename edits
   // 2. apply rename edit across editor (and whole workspace)
@@ -10560,37 +10601,37 @@ const FocusNext = 'FocusNext';
 const FocusPrevious = 'FocusPrevious';
 const Replace = 'Replace';
 
-const getFindWidgetButtons = buttonsEnabled => {
+const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
   const findButtons = [{
     label: previousMatch(),
     icon: ArrowUp,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickPreviousMatch',
+    disabled: !findButtonsEnabled,
+    onClick: HandleClickPreviousMatch,
     name: FocusPrevious
   }, {
     label: nextMatch(),
     icon: ArrowDown,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickNextMatch',
+    disabled: !findButtonsEnabled,
+    onClick: HandleClickNextMatch,
     name: FocusNext
   }, {
     label: close(),
     icon: Close$1,
     disabled: false,
-    onClick: 'handleClickClose',
+    onClick: HandleClickClose,
     name: Close
   }];
   const replaceButtons = [{
     label: replace(),
     icon: Replace$1,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickReplace',
+    disabled: !replaceButtonsEnabled,
+    onClick: HandleClickReplace,
     name: Replace
   }, {
     label: replaceAll(),
     icon: ReplaceAll$1,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickReplaceAll',
+    disabled: !replaceButtonsEnabled,
+    onClick: HandleClickReplaceAll,
     name: ReplaceAll
   }];
   return {
@@ -10599,6 +10640,15 @@ const getFindWidgetButtons = buttonsEnabled => {
   };
 };
 
+const getFindWidgetButtonsEnabled = (matchCount, value) => {
+  const findButtonsEnabled = matchCount > 0;
+  const replaceButtonsEnabled = value.length > 0;
+  return {
+    findButtonsEnabled,
+    replaceButtonsEnabled
+  };
+};
+
 // TODO always focus element by name
 const getFindWidgetFocusSelector = focus => {
   switch (focus) {
@@ -10623,8 +10673,8 @@ const getFindWidgetFocusSelector = focus => {
   }
 };
 
-const getFindMatchCountClassName = matchCount => {
-  if (matchCount === 0) {
+const getFindMatchCountClassName = (matchCount, value) => {
+  if (value && matchCount === 0) {
     return mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
   }
   return FindWidgetMatchCount;
@@ -10712,7 +10762,7 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
-const getFindWidgetFindVirtualDom = (matchCountText, buttons, matchCount) => {
+const getFindWidgetFindVirtualDom = (matchCountText, buttons, matchCount, value) => {
   const dom = [];
   dom.push({
     type: Div,
@@ -10720,7 +10770,7 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons, matchCount) => {
     childCount: 5
   });
   dom.push(...getSearchFieldVirtualDom('search-value', find(), HandleInput, [], [], HandleFocus));
-  const findClassName = getFindMatchCountClassName(matchCount);
+  const findClassName = getFindMatchCountClassName(matchCount, value);
   dom.push({
     type: Div,
     className: findClassName,
@@ -10736,7 +10786,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
       type: Div,
       className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
-    }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
+    }, ...getSearchFieldVirtualDom('replace-value', replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
@@ -10760,7 +10810,7 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
   }];
 };
 
-const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, replaceButtons, matchCase, matchWholeWord, useRegularExpression, matchCount) => {
+const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, replaceButtons, matchCase, matchWholeWord, useRegularExpression, matchCount, value) => {
   const dom = [];
   dom.push({
     type: Div,
@@ -10774,7 +10824,7 @@ const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, r
     className: FindWidgetRight,
     childCount: replaceExpanded ? 2 : 1
   });
-  dom.push(...getFindWidgetFindVirtualDom(matchCountText, findButtons, matchCount));
+  dom.push(...getFindWidgetFindVirtualDom(matchCountText, findButtons, matchCount, value));
   if (replaceExpanded) {
     dom.push(...getFindWidgetReplaceVirtualDom(replaceExpanded, replaceButtons));
   }
@@ -10798,16 +10848,19 @@ const renderValue = {
 };
 const renderDetails = {
   isEqual(oldState, newState) {
-    return oldState.matchIndex === newState.matchIndex && oldState.matchCount === newState.matchCount && oldState.replaceExpanded === newState.replaceExpanded;
+    return oldState.matchIndex === newState.matchIndex && oldState.matchCount === newState.matchCount && oldState.replaceExpanded === newState.replaceExpanded && oldState.value === newState.value;
   },
   apply(oldState, newState) {
     const matchCountText = getMatchCountText(newState.matchIndex, newState.matchCount);
-    const buttonsEnabled = newState.matchCount > 0;
+    const {
+      findButtonsEnabled,
+      replaceButtonsEnabled
+    } = getFindWidgetButtonsEnabled(newState.matchCount, newState.value);
     const {
       findButtons,
       replaceButtons
-    } = getFindWidgetButtons(buttonsEnabled);
-    const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, findButtons, replaceButtons, newState.matchCase, newState.matchWholeWord, newState.useRegularExpression, newState.matchCount);
+    } = getFindWidgetButtons(findButtonsEnabled, replaceButtonsEnabled);
+    const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, findButtons, replaceButtons, newState.matchCase, newState.matchWholeWord, newState.useRegularExpression, newState.matchCount, newState.value);
     return ['Viewlet.setDom2', dom];
   }
 };

package/package.json

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