@lvce-editor/editor-worker 3.15.0 → 3.17.0

package/dist/editorWorkerMain.js

@@ -595,14 +595,10 @@ const getSelectionPairs = (selections, i) => {
   return [first, second, third, fourth, 0];
 };
 
-const Dash = '-';
-const Dot = '.';
-const EmptyString = '';
-const Space = ' ';
+const EmptyString$1 = '';
+const Space$1 = ' ';
 const Tab = '\t';
-const Underline = '_';
 const DoubleQuote$1 = '"';
-const T = 't';
 
 const getTabCount = string => {
   let count = 0;
@@ -675,7 +671,7 @@ const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing,
 
 const normalizeText = (text, normalize, tabSize) => {
   if (normalize) {
-    return text.replaceAll(Tab, Space.repeat(tabSize));
+    return text.replaceAll(Tab, Space$1.repeat(tabSize));
   }
   return text;
 };
@@ -2431,6 +2427,9 @@ const setAdditionalFocus = async focusKey => {
 };
 
 const setFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
   await invoke$3('Focus.setFocus', focusKey);
 };
 
@@ -2825,7 +2824,7 @@ const characterRight = (line, columnIndex) => {
   return next.segment.length;
 };
 const isWhitespace = char => {
-  return char === Space || char === Tab;
+  return char === Space$1 || char === Tab;
 };
 const lineCharacterStart = (line, columnIndex) => {
   if (line.length === 0) {
@@ -3342,7 +3341,7 @@ const getWordAt$1 = (line, columnIndex) => {
   const matchBefore = before.match(RE_WORD_END$1);
   const after = line.slice(columnIndex);
   const matchAfter = after.match(RE_WORD_START$1);
-  let word = EmptyString;
+  let word = EmptyString$1;
   if (matchBefore) {
     word += matchBefore[0];
   }
@@ -3359,7 +3358,7 @@ const getWordBefore$1 = (line, columnIndex) => {
   if (matchBefore) {
     return matchBefore[0];
   }
-  return EmptyString;
+  return EmptyString$1;
 };
 
 const getWordAt = (editor, rowIndex, columnIndex) => {
@@ -4682,8 +4681,6 @@ const resolveCompletion = async (editor, name, completionItem) => {
 
 const None$1 = 1;
 
-const EmptyMatches = [];
-
 const Diagonal = 1;
 const Left = 2;
 
@@ -4697,11 +4694,16 @@ const createTable = size => {
   }
   return table;
 };
-
+const EmptyMatches$1 = [];
+const Dash = '-';
+const Dot = '.';
+const EmptyString = '';
+const Space = ' ';
+const Underline = '_';
+const T = 't';
 const isLowerCase = char => {
   return char === char.toLowerCase();
 };
-
 const isUpperCase = char => {
   return char === char.toUpperCase();
 };
@@ -4724,7 +4726,7 @@ const isGap = (columnCharBefore, columnChar) => {
 };
 
 // based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const getScore = (rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, column, wordLength, isDiagonalMatch) => {
+const getScore = (rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, isDiagonalMatch) => {
   if (rowCharLow !== columnCharLow) {
     return -1;
   }
@@ -4791,13 +4793,13 @@ const traceHighlights = (table, arrows, patternLength, wordLength) => {
 const gridSize = 128;
 const table = createTable(gridSize);
 const arrows = createTable(gridSize);
-const filterCompletionItem = (pattern, word) => {
+const fuzzySearch = (pattern, word) => {
   const patternLength = Math.min(pattern.length, gridSize - 1);
   const wordLength = Math.min(word.length, gridSize - 1);
   const patternLower = pattern.toLowerCase();
   const wordLower = word.toLowerCase();
   if (!isPatternInWord(patternLower, 0, patternLength, wordLower, 0, wordLength)) {
-    return EmptyMatches;
+    return EmptyMatches$1;
   }
   let strongMatch = false;
   for (let row = 1; row < patternLength + 1; row++) {
@@ -4808,7 +4810,7 @@ const filterCompletionItem = (pattern, word) => {
       const columnCharLow = wordLower[column - 1];
       const columnCharBefore = word[column - 2] || '';
       const isDiagonalMatch = arrows[row - 1][column - 1] === Diagonal;
-      const score = getScore(rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, column, wordLength, isDiagonalMatch);
+      const score = getScore(rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, isDiagonalMatch);
       if (row === 1 && score > 5) {
         strongMatch = true;
       }
@@ -4827,7 +4829,7 @@ const filterCompletionItem = (pattern, word) => {
     }
   }
   if (!strongMatch) {
-    return EmptyMatches;
+    return EmptyMatches$1;
   }
   const highlights = traceHighlights(table, arrows, patternLength, wordLength);
   return highlights;
@@ -4835,6 +4837,8 @@ const filterCompletionItem = (pattern, word) => {
 
 const Deprecated = 1 << 0;
 
+const EmptyMatches = [];
+
 const addEmptyMatch = item => {
   return {
     ...item,
@@ -4842,7 +4846,7 @@ const addEmptyMatch = item => {
   };
 };
 const filterCompletionItems = (completionItems, word) => {
-  if (word === EmptyString) {
+  if (word === EmptyString$1) {
     return completionItems.map(addEmptyMatch);
   }
   const filteredCompletions = [];
@@ -4852,8 +4856,8 @@ const filterCompletionItems = (completionItems, word) => {
       label,
       flags
     } = completionItem;
-    const result = filterCompletionItem(word, label);
-    if (result !== EmptyMatches) {
+    const result = fuzzySearch(word, label);
+    if (result.length > 0) {
       if (flags & Deprecated) {
         // TODO avoid mutation
         completionItem.matches = EmptyMatches;
@@ -5192,58 +5196,108 @@ const focusFind = state => {
   return setFindWidgetFocus(state, FindWidget);
 };
 
+const getWidgetState = (editor, id) => {
+  const {
+    widgets
+  } = editor;
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return widget.newState;
+    }
+  }
+  return undefined;
+};
+
+const getFindState = editor => {
+  return getWidgetState(editor, Find);
+};
+
+const isFind = widget => {
+  return widget.id === Find;
+};
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
-const focusIndex$1 = async (state, index) => {
+const focusIndex$1 = (editor, index) => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     value,
     matches,
     matchIndex
-  } = state;
+  } = findState;
   if (index === matchIndex) {
-    return state;
+    return editor;
   }
+  const {
+    widgets
+  } = editor;
+  const childIndex = widgets.findIndex(isFind);
+  const childWidget = widgets[childIndex];
+
   // TODO find next match and highlight it
   const matchRowIndex = matches[index * 2];
   const matchColumnIndex = matches[index * 2 + 1];
-  // @ts-ignore
   const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
-  // TODO set selections synchronously and render input match index,
-  // input value and new selections at the same time
-  // TODO
-  await invoke$3('Editor.setSelections', newSelections);
-  return {
-    ...state,
+  const newState = {
+    ...findState,
     matchIndex: index
   };
+  const newWidget = {
+    ...childWidget,
+    newState
+  };
+  const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    selections: newSelections,
+    widgets: newWidgets
+  };
 };
-const focusFirst$1 = state => {
-  return focusIndex$1(state, 0);
+const focusFirst$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
+  return focusIndex$1(editor, 0);
 };
-const focusLast = state => {
+const focusLast = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchCount
-  } = state;
-  return focusIndex$1(state, matchCount - 1);
+  } = findState;
+  return focusIndex$1(editor, matchCount - 1);
 };
-const focusNext$1 = state => {
+const focusNext$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchIndex,
     matchCount
-  } = state;
+  } = findState;
   if (matchIndex === matchCount - 1) {
-    return focusFirst$1(state);
+    return focusFirst$1(editor);
   }
-  return focusIndex$1(state, matchIndex + 1);
+  return focusIndex$1(editor, matchIndex + 1);
 };
-const focusPrevious$1 = state => {
+const focusPrevious$1 = editor => {
+  const findState = getFindState(editor);
+  if (!findState) {
+    return editor;
+  }
   const {
     matchIndex
-  } = state;
+  } = findState;
   if (matchIndex === 0) {
-    return focusLast(state);
+    return focusLast(editor);
   }
-  return focusIndex$1(state, matchIndex - 1);
+  return focusIndex$1(editor, matchIndex - 1);
 };
 
 const focusNextMatchButton = state => {
@@ -7123,18 +7177,6 @@ const closeDetails = editor => {
   };
 };
 
-const getWidgetState = (editor, id) => {
-  const {
-    widgets
-  } = editor;
-  for (const widget of widgets) {
-    if (widget.id === id) {
-      return widget.newState;
-    }
-  }
-  return undefined;
-};
-
 const getCompletionState = editor => {
   return getWidgetState(editor, Completion);
 };
@@ -8713,12 +8755,12 @@ const wrapWidgetCommand = (widgetId, fn) => {
 const widgetCommands = {
   'ColorPicker.handleSliderPointerDown': ColorPicker$1,
   'ColorPicker.handleSliderPointerMove': ColorPicker$1,
-  'FindWidget.focusNext': Find,
-  'FindWidget.focusPrevious': Find,
+  // 'FindWidget.focusNext': WidgetId.Find,
+  // 'FindWidget.focusPrevious': WidgetId.Find,
   'FindWidget.close': Find,
-  'FindWidget.focusIndex': Find,
-  'FindWidget.focusFirst': Find,
-  'FindWidget.focusLast': Find,
+  // 'FindWidget.focusIndex': WidgetId.Find,
+  // 'FindWidget.focusFirst': WidgetId.Find,
+  // 'FindWidget.focusLast': WidgetId.Find,
   'FindWidget.toggleReplace': Find,
   'FindWidget.handleFocus': Find,
   'FindWidget.handleBlur': Find,
@@ -9089,11 +9131,11 @@ const getSymbolName = kind => {
 const getCompletionFileIcon = kind => {
   switch (kind) {
     case File:
-      return EmptyString;
+      return EmptyString$1;
     case Folder:
-      return EmptyString;
+      return EmptyString$1;
     default:
-      return EmptyString;
+      return EmptyString$1;
   }
 };
 

package/package.json

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