@lvce-editor/editor-worker 2.4.0 → 2.5.0

package/README.md

@@ -1,4 +1,6 @@
-# editor worker
+# Editor Worker
+
+Webworker for the core editing functionality in Lvce Editor.
 
 ## Gitpod
 

package/dist/editorWorkerMain.js

@@ -561,6 +561,7 @@ const EmptyString = '';
 const Space = ' ';
 const Tab = '\t';
 const Underline = '_';
+const DoubleQuote$1 = '"';
 const T = 't';
 
 const getTabCount = string => {
@@ -642,9 +643,6 @@ const shouldNormalizeText = text => {
   return text.includes(Tab);
 };
 
-// TODO visible selections could also be uint16array
-// [top1, left1, width1, height1, top2, left2, width2, height2...]
-
 const getX = (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference = 0) => {
   if (!line) {
     return 0;
@@ -2544,36 +2542,30 @@ const copy = async editor => {
 // TODO handle multiline selection
 // TODO handle multiple cursors
 
-// @ts-ignore
 const copyLineDown = editor => {
   const {
-    selections,
-    primarySelectionIndex
+    selections
   } = editor;
-  const rowIndex = selections[primarySelectionIndex];
+  const rowIndex = selections[0];
   number$1(rowIndex);
   const position = {
     rowIndex,
     columnIndex: 0
   };
   const changes = [{
-    inserted: [getLine(editor, rowIndex), ''],
-    deleted: [''],
     start: position,
-    end: position
+    end: position,
+    inserted: [getLine(editor, rowIndex), ''],
+    deleted: ['']
   }];
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-// @ts-ignore
-
-// @ts-ignore
 const copyLineUp = editor => {
   const {
-    selections,
-    primarySelectionIndex
+    selections
   } = editor;
-  const rowIndex = selections[primarySelectionIndex];
+  const rowIndex = selections[0];
   const position = {
     rowIndex: rowIndex,
     columnIndex: 0
@@ -2671,7 +2663,6 @@ const editorCursorHorizontalLeft = (editor, getDelta) => {
   return scheduleSelections(editor, newSelections);
 };
 
-// @ts-ignore
 const characterLeft = (line, columnIndex) => {
   if (!supported()) {
     return 1;
@@ -2683,8 +2674,6 @@ const characterLeft = (line, columnIndex) => {
 const twoCharactersLeft = () => {
   return 2;
 };
-
-// @ts-ignore
 const characterRight = (line, columnIndex) => {
   if (!supported()) {
     return 1;
@@ -2693,13 +2682,9 @@ const characterRight = (line, columnIndex) => {
   const next = segmenter.at(line, columnIndex);
   return next.segment.length;
 };
-
-// @ts-ignore
 const isWhitespace = char => {
   return char === Space || char === Tab;
 };
-
-// @ts-ignore
 const lineCharacterStart = (line, columnIndex) => {
   if (line.length === 0) {
     return 0;
@@ -2711,13 +2696,9 @@ const lineCharacterStart = (line, columnIndex) => {
   }
   return columnIndex;
 };
-
-// @ts-ignore
 const lineEnd = (line, columnIndex) => {
   return line.length - columnIndex;
 };
-
-// @ts-ignore
 const tryRegexArray = (partialLine, regexArray) => {
   for (const regex of regexArray) {
     const match = partialLine.match(regex);
@@ -2742,8 +2723,6 @@ const wordLeft = (line, columnIndex) => {
 const RE_WORD_RIGHT_1 = /^\s*[\u00C0-\u017F\w]+/i;
 const RE_WORD_RIGHT_2 = /^[^a-zA-Z\d]+\w*/;
 const RE_WORD_RIGHT = [RE_WORD_RIGHT_1, RE_WORD_RIGHT_2];
-
-// @ts-ignore
 const wordRight = (line, columnIndex) => {
   const partialLine = line.slice(columnIndex);
   return tryRegexArray(partialLine, RE_WORD_RIGHT);
@@ -2758,8 +2737,6 @@ const RE_PARTIAL_WORD_LEFT_7 = /(?<![A-Z])[A-Z]_+\s*$/;
 const RE_PARTIAL_WORD_LEFT_8 = /[a-z]+\s*$/;
 const RE_PARTIAL_WORD_LEFT_9 = /[^a-zA-Z\d\s]+\s*$/;
 const RE_PARTIAL_WORD_LEFT = [RE_PARTIAL_WORD_LEFT_1, RE_PARTIAL_WORD_LEFT_2, RE_PARTIAL_WORD_LEFT_3, RE_PARTIAL_WORD_LEFT_4, RE_PARTIAL_WORD_LEFT_5, RE_PARTIAL_WORD_LEFT_6, RE_PARTIAL_WORD_LEFT_7, RE_PARTIAL_WORD_LEFT_8, RE_PARTIAL_WORD_LEFT_9];
-
-// @ts-ignore
 const wordPartLeft = (line, columnIndex) => {
   const partialLine = line.slice(0, columnIndex);
   return tryRegexArray(partialLine, RE_PARTIAL_WORD_LEFT);
@@ -2778,8 +2755,6 @@ const ARRAY_PARTIAL_WORD_RIGHT_1 = [RE_PARTIAL_WORD_RIGHT_1,
 RE_PARTIAL_WORD_RIGHT_3, RE_PARTIAL_WORD_RIGHT_4, RE_PARTIAL_WORD_RIGHT_5, RE_PARTIAL_WORD_RIGHT_6];
 const ARRAY_PARTIAL_WORD_RIGHT_2 = [RE_PARTIAL_WORD_RIGHT_1, RE_PARTIAL_WORD_RIGHT_2, RE_PARTIAL_WORD_RIGHT_3, RE_PARTIAL_WORD_RIGHT_4, RE_PARTIAL_WORD_RIGHT_5, RE_PARTIAL_WORD_RIGHT_6];
 const RE_UPPERCASE = /[A-Z]/;
-
-// @ts-ignore
 const wordPartRight = (line, columnIndex) => {
   const partialLine = line.slice(columnIndex);
   // line[columnIndex]//?
@@ -2794,7 +2769,6 @@ const cursorCharacterLeft = editor => {
   return editorCursorHorizontalLeft(editor, characterLeft);
 };
 
-// @ts-ignore
 const editorGetPositionRight = (position, lines, getDelta) => {
   const rowIndex = position.rowIndex;
   const columnIndex = position.columnIndex;
@@ -2813,8 +2787,6 @@ const editorGetPositionRight = (position, lines, getDelta) => {
     columnIndex: columnIndex + delta
   };
 };
-
-// @ts-ignore
 const moveToPositionRight = (selections, i, rowIndex, columnIndex, lines, getDelta) => {
   if (rowIndex >= lines.length) {
     return;
@@ -2830,9 +2802,6 @@ const moveToPositionRight = (selections, i, rowIndex, columnIndex, lines, getDel
   }
 };
 
-// @ts-ignore
-
-// @ts-ignore
 const getNewSelections$a = (selections, lines, getDelta) => {
   const newSelections = new Uint32Array(selections.length);
   for (let i = 0; i < selections.length; i += 4) {
@@ -2846,8 +2815,6 @@ const getNewSelections$a = (selections, lines, getDelta) => {
   }
   return newSelections;
 };
-
-// @ts-ignore
 const editorCursorHorizontalRight = (editor, getDelta) => {
   const {
     lines,
@@ -2904,16 +2871,9 @@ const getNewSelections$8 = selections => {
   return map(selections, moveSelectionWithoutIntlSegmenter);
 };
 const cursorVertical = (editor, getPosition, getEdgePosition, delta) => {
-  // if (TextSegmenter.supported()) {
-  //   return editorCursorsVerticalWithIntlSegmenter(
-  //     editor,
-  //     getPosition,
-  //     getEdgePosition,
-  //     delta
-  //   )
-  // }
-  const selections = editor.selections;
-  // @ts-ignore
+  const {
+    selections
+  } = editor;
   const newSelections = getNewSelections$8(selections);
   return scheduleSelections(editor, newSelections);
 };
@@ -2940,7 +2900,6 @@ const cursorWordPartRight = editor => {
   return editorCursorHorizontalRight(editor, wordPartRight);
 };
 
-// @ts-ignore
 const cursorWordRight = editor => {
   return editorCursorHorizontalRight(editor, wordRight);
 };
@@ -5204,22 +5163,39 @@ const editorSelectAllLeft = editor => {
   editorSelectHorizontalLeft(editor, lineCharacterStart);
 };
 
-// TODO handle virtual space
+const RE_ALPHA_NUMERIC = /[a-zA-Z\d]/;
+const isAlphaNumeric = char => {
+  return RE_ALPHA_NUMERIC.test(char);
+};
 
-const getNewSelectionsSingleLineWord = (lines, word) => {
-  if (word.length === 0) {
-    throw new Error('word length must be greater than zero');
+const getWordStartIndex = (line, index) => {
+  for (let i = index - 1; i >= 0; i--) {
+    if (!isAlphaNumeric(line[i])) {
+      return i + 1;
+    }
   }
-  const newSelections = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    let columnIndex = -word.length;
-    while ((columnIndex = line.indexOf(word, columnIndex + word.length)) !== -1) {
-      newSelections.push(i, columnIndex, i, columnIndex + word.length);
+  return 0;
+};
+const getWordEndIndex = (line, index) => {
+  for (let i = index; i < line.length; i++) {
+    if (!isAlphaNumeric(line[i])) {
+      return i;
     }
   }
-  return new Uint32Array(newSelections);
+  return line.length - 1;
+};
+const getWordMatchAtPosition = (lines, rowIndex, columnIndex) => {
+  const line = lines[rowIndex];
+  const start = getWordStartIndex(line, columnIndex);
+  const end = getWordEndIndex(line, columnIndex);
+  const word = line.slice(start, end);
+  return {
+    start,
+    end,
+    word
+  };
 };
+
 const isMultiLineMatch = (lines, rowIndex, wordParts) => {
   let j = 0;
   if (!lines[rowIndex + j].endsWith(wordParts[j])) {
@@ -5230,14 +5206,29 @@ const isMultiLineMatch = (lines, rowIndex, wordParts) => {
       return false;
     }
   }
-  // j--
   if (!lines[rowIndex + j].startsWith(wordParts[j])) {
-
     return false;
   }
   return true;
 };
 
+// TODO handle virtual space
+
+const getNewSelectionsSingleLineWord = (lines, word) => {
+  if (word.length === 0) {
+    throw new Error('word length must be greater than zero');
+  }
+  const newSelections = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    let columnIndex = -word.length;
+    while ((columnIndex = line.indexOf(word, columnIndex + word.length)) !== -1) {
+      newSelections.push(i, columnIndex, i, columnIndex + word.length);
+    }
+  }
+  return new Uint32Array(newSelections);
+};
+
 // TODO this is very expensive, there might be a better algorithm for this
 // TODO if this matches the given selections, don't schedule selections/rerender
 const getAllOccurrencesMultiLine = (lines, wordParts) => {
@@ -5253,39 +5244,6 @@ const getAllOccurrencesMultiLine = (lines, wordParts) => {
   }
   return new Uint32Array(newSelections);
 };
-
-// TODO duplicate code with EditorSelectNextOccurrence
-const RE_ALPHA_NUMERIC$1 = /[a-zA-Z\d]/;
-const isAlphaNumeric$1 = char => {
-  return RE_ALPHA_NUMERIC$1.test(char);
-};
-const getWordStartIndex$1 = (line, index) => {
-  for (let i = index - 1; i >= 0; i--) {
-    if (!isAlphaNumeric$1(line[i])) {
-      return i + 1;
-    }
-  }
-  return 0;
-};
-const getWordEndIndex$1 = (line, index) => {
-  for (let i = index; i < line.length; i++) {
-    if (!isAlphaNumeric$1(line[i])) {
-      return i;
-    }
-  }
-  return line.length - 1;
-};
-const getWordMatchAtPosition$1 = (lines, rowIndex, columnIndex) => {
-  const line = lines[rowIndex];
-  const start = getWordStartIndex$1(line, columnIndex);
-  const end = getWordEndIndex$1(line, columnIndex);
-  const word = line.slice(start, end);
-  return {
-    start,
-    end,
-    word
-  };
-};
 const getNewSelections$3 = (lines, selections) => {
   if (selections.length < 4) {
     throw new Error('selections must have at least one entry');
@@ -5297,7 +5255,7 @@ const getNewSelections$3 = (lines, selections) => {
   const endColumnIndex = selections[firstSelectionIndex + 3];
   if (startRowIndex === endRowIndex) {
     if (startColumnIndex === endColumnIndex) {
-      const wordMatch = getWordMatchAtPosition$1(lines, endRowIndex, endColumnIndex);
+      const wordMatch = getWordMatchAtPosition(lines, endRowIndex, endColumnIndex);
       if (wordMatch.start === wordMatch.end) {
         return selections;
       }
@@ -5407,11 +5365,11 @@ const getNewSelections$1 = (lines, selections) => {
       let startColumnIndex = selectionStartColumn;
       let endColumnIndex = selectionEndColumn;
       const line = lines[rowIndex];
-      while (startColumnIndex > 0 && line[startColumnIndex] !== '"') {
+      while (startColumnIndex > 0 && line[startColumnIndex] !== DoubleQuote$1) {
         startColumnIndex--;
       }
       startColumnIndex++;
-      while (endColumnIndex < line.length && line[endColumnIndex] !== '"') {
+      while (endColumnIndex < line.length && line[endColumnIndex] !== DoubleQuote$1) {
         endColumnIndex++;
       }
       newSelections[i] = rowIndex;
@@ -5434,9 +5392,26 @@ const selectInsideString = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
-// @ts-ignore
+// TODO handle virtual space
+
+// TODO editors behave differently when selecting next occurrence, for example:
+
+// aaa
+// bbb 1
+// ccc
+// bbb 2
+// bbb 3
+// aaa
+// bbb 4
+// ccc
+
+// when clicking first at position 4 and then position 2,
+// - vscode selects next position 3 and refuses to select position 1
+// - atom also selects next position 3 and refuses to select position 1
+// - WebStorm also selects next position 3 and refuses to select position 1
+// - brackets (codemirror) selects position 3 and then selects position 1
+// - sublime selects next position 1, then next position 3
 
-// @ts-ignore
 const getSelectionEditsSingleLineWord = (lines, selections) => {
   const lastSelectionIndex = selections.length - 4;
   const rowIndex = selections[lastSelectionIndex];
@@ -5515,48 +5490,6 @@ const getSelectionEditsSingleLineWord = (lines, selections) => {
   }
   return undefined;
 };
-const RE_ALPHA_NUMERIC = /[a-zA-Z\d]/;
-
-// @ts-ignore
-const isAlphaNumeric = char => {
-  return RE_ALPHA_NUMERIC.test(char);
-};
-
-// @ts-ignore
-const getWordStartIndex = (line, index) => {
-  for (let i = index - 1; i >= 0; i--) {
-    if (!isAlphaNumeric(line[i])) {
-      return i + 1;
-    }
-  }
-  return 0;
-};
-
-// @ts-ignore
-const getWordEndIndex = (line, index) => {
-  for (let i = index; i < line.length; i++) {
-    if (!isAlphaNumeric(line[i])) {
-      return i;
-    }
-  }
-  return line.length - 1;
-};
-
-// @ts-ignore
-const getWordMatchAtPosition = (lines, rowIndex, columnIndex) => {
-  const line = lines[rowIndex];
-  const index = columnIndex;
-  const start = getWordStartIndex(line, index);
-  const end = getWordEndIndex(line, index);
-  const word = line.slice(start, end);
-  return {
-    start,
-    end,
-    word
-  };
-};
-
-// @ts-ignore
 const getSelectNextOccurrenceResult = editor => {
   const lines = editor.lines;
   const selections = editor.selections;
@@ -5588,13 +5521,31 @@ const getSelectNextOccurrenceResult = editor => {
   return undefined;
 };
 
-// @ts-ignore
+// TODO handle virtual space
+
+// TODO editors behave differently when selecting next occurrence, for example:
+
+// aaa
+// bbb 1
+// ccc
+// bbb 2
+// bbb 3
+// aaa
+// bbb 4
+// ccc
+
+// when clicking first at position 4 and then position 2,
+// - vscode selects next position 3 and refuses to select position 1
+// - atom also selects next position 3 and refuses to select position 1
+// - WebStorm also selects next position 3 and refuses to select position 1
+// - brackets (codemirror) selects position 3 and then selects position 1
+// - sublime selects next position 1, then next position 3
+
 const isRangeInViewPort = (minLineY, maxLineY, startRowIndex, endRowIndex) => {
   return startRowIndex >= minLineY && endRowIndex <= maxLineY;
 };
 
 // TODO handle virtual space
-// @ts-ignore
 const selectNextOccurrence = editor => {
   const result = getSelectNextOccurrenceResult(editor);
   if (!result) {
@@ -5609,7 +5560,6 @@ const selectNextOccurrence = editor => {
   }
   // TODO what is this magic number 5?
   // const deltaY = (revealRangeStartRowIndex - 5) * editor.rowHeight
-  // @ts-ignore
   return scheduleDocumentAndCursorsSelections(editor, [], selectionEdits);
 };
 
@@ -6528,7 +6478,6 @@ const typeWithAutoClosing = async (editor, text) => {
   // EditorCommandCompletion.openFromType(editor, text)
 };
 
-// @ts-ignore
 const inverseChange = edit => {
   const endColumnIndex = edit.end.columnIndex - edit.deleted[0].length + edit.inserted[0].length;
   return {
@@ -6542,7 +6491,6 @@ const inverseChange = edit => {
   };
 };
 
-// @ts-ignore
 const undo = state => {
   const {
     undoStack

package/package.json

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