@lvce-editor/editor-worker 18.7.0 → 18.9.0

package/dist/editorWorkerMain.js

@@ -2878,7 +2878,7 @@ const getRegexMatches = (text, regex) => {
 // Supports: http://, https://, ftp://, ftps://, file://
 // Also matches URLs without explicit scheme (www.example.com)
 // Excludes trailing quotes which are commonly used in JSON strings
-const URL_PATTERN = /(?:(?:https?|ftp|ftps|file):\/\/)?(?:www\.)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?(?:\/[^\s"']*)?/g;
+const URL_PATTERN = /(?:https?|ftps?|file):\/\/[^\s"']+|www\.[^\s"']+/g;
 
 // Regex to check if URL has a scheme (http://, https://, ftp://, etc.)
 const HAS_SCHEME_PATTERN = /^(?:https?|ftp|ftps|file):\/\//;
@@ -3042,6 +3042,37 @@ const notifyListeners = async (listenerType, method, ...params) => {
   await Promise.all(notifications);
 };
 
+const resize = (state, dimensions, columnWidth = state.columnWidth) => {
+  const x = dimensions.x ?? state.x;
+  const y = dimensions.y ?? state.y;
+  const width = dimensions.width ?? state.width;
+  const height = dimensions.height ?? state.height;
+  const numberOfVisibleLines = Math.floor(height / state.itemHeight);
+  const total = state.lines.length;
+  const finalY = Math.max(total - numberOfVisibleLines, 0);
+  const finalDeltaY = finalY * state.itemHeight;
+  const deltaY = Math.min(state.deltaY, finalDeltaY);
+  const minLineY = Math.floor(deltaY / state.itemHeight);
+  const maxLineY = Math.min(minLineY + numberOfVisibleLines, total);
+  const contentHeight = total * state.rowHeight;
+  const scrollBarHeight = getScrollBarSize(height, contentHeight, state.minimumSliderSize);
+  return {
+    ...state,
+    columnWidth,
+    deltaY,
+    finalDeltaY,
+    finalY,
+    height,
+    maxLineY,
+    minLineY,
+    numberOfVisibleLines,
+    scrollBarHeight,
+    width,
+    x,
+    y
+  };
+};
+
 const splitLines = lines => {
   if (!lines) {
     return [''];
@@ -3081,7 +3112,7 @@ const getTabCount = string => {
   return count;
 };
 
-const RE_ASCII = /^[\p{ASCII}]*$/u;
+const RE_ASCII = /^\p{ASCII}*$/u;
 const isAscii = line => {
   return RE_ASCII.test(line);
 };
@@ -3604,26 +3635,12 @@ const hasSelection = editor => {
   return editor.selections && editor.selections.length > 0;
 };
 const setBounds = (editor, x, y, width, height, columnWidth) => {
-  const {
-    itemHeight
-  } = editor;
-  const numberOfVisibleLines = Math.floor(height / itemHeight);
-  const total = editor.lines.length;
-  const maxLineY = Math.min(numberOfVisibleLines, total);
-  const finalY = Math.max(total - numberOfVisibleLines, 0);
-  const finalDeltaY = finalY * itemHeight;
-  return {
-    ...editor,
-    columnWidth,
-    finalDeltaY,
-    finalY,
+  return resize(editor, {
     height,
-    maxLineY,
-    numberOfVisibleLines,
     width,
     x,
     y
-  };
+  }, columnWidth);
 };
 const setText$1 = (editor, text) => {
   const lines = splitLines(text);
@@ -6206,11 +6223,7 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     // TODO make sure that editor is not disposed
 
     const definitionStartPosition = positionAt(editor, definition.startOffset);
-    const definitionEndPosition = positionAt(editor, definition.endOffset);
-    // @ts-ignore
-    const definitionRelativeStartX = definitionStartPosition.columnIndex;
-    // @ts-ignore
-    const definitionRelativeEndX = definitionEndPosition.columnIndex;
+    positionAt(editor, definition.endOffset);
     // const definitionRelativeY = definitionStartPosition.rowIndex - editor.minLineY
 
     const lineTokenMap = editor.lineCache[definitionStartPosition.rowIndex + 1];
@@ -6531,7 +6544,8 @@ const setDelta = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   number(eventDeltaY);
   // @ts-ignore
   const {
-    deltaX} = editor;
+    deltaX
+  } = editor;
   if (eventDeltaX === 0) {
     return setDeltaY(editor, eventDeltaY);
   }
@@ -7328,7 +7342,7 @@ const logError = async error => {
 };
 const handleError = async error => {
   try {
-    const prettyError = await logError(error);
+    await logError(error);
   } catch (otherError) {
     console.warn('ErrorHandling error');
     console.warn(otherError);
@@ -7435,13 +7449,8 @@ const getNewSelections$4 = (selections, lines, getDelta) => {
   for (let i = 0; i < selections.length; i += 4) {
     // @ts-ignore
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
-    if (selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn) {
-      moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
-      moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
-    } else {
-      moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
-      moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
-    }
+    moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
+    moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
   }
   return newSelections;
 };
@@ -8450,6 +8459,27 @@ const getBlockComment = async (editor, offset) => {
 
 const RE_WHITESPACE_AT_START$1 = /^\s+/;
 const RE_WHITESPACE_AT_END = /\s+$/;
+const createDeleteEdit = (rowIndex, columnIndex, text) => {
+  return {
+    deleted: [text],
+    end: {
+      columnIndex: columnIndex + text.length,
+      rowIndex
+    },
+    inserted: [],
+    origin: ToggleBlockComment$1,
+    start: {
+      columnIndex,
+      rowIndex
+    }
+  };
+};
+const getRemoveBlockCommentEdits = (rowIndex, startRowIndex, startColumnIndex, endRowIndex, endColumnIndex, blockCommentStart, blockCommentEnd) => {
+  if (startRowIndex === endRowIndex) {
+    return [createDeleteEdit(rowIndex, startColumnIndex, blockCommentStart), createDeleteEdit(rowIndex, endColumnIndex - blockCommentStart.length, blockCommentEnd)];
+  }
+  return [createDeleteEdit(startRowIndex, startColumnIndex, blockCommentStart), createDeleteEdit(endRowIndex, endColumnIndex, blockCommentEnd)];
+};
 const getBlockCommentEdits = (editor, blockComment) => {
   const {
     selections
@@ -8481,75 +8511,19 @@ const getBlockCommentEdits = (editor, blockComment) => {
   }
   const changes = [];
   if (startColumnIndex !== -1 && endColumnIndex !== -1) {
-    if (startRowIndex === endRowIndex) {
-      const change1 = {
-        deleted: [blockCommentStart],
-        end: {
-          columnIndex: startColumnIndex + blockCommentStart.length,
-          rowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: startColumnIndex,
-          rowIndex
-        }
-      };
-      const change2 = {
-        deleted: [blockCommentEnd],
-        end: {
-          columnIndex: endColumnIndex - blockCommentStart.length + blockCommentEnd.length,
-          rowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: endColumnIndex - blockCommentStart.length,
-          rowIndex
-        }
-      };
-      changes.push(change1, change2);
-    } else {
-      const change1 = {
-        deleted: [blockCommentStart],
-        end: {
-          columnIndex: startColumnIndex + blockCommentStart.length,
-          rowIndex: startRowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: startColumnIndex,
-          rowIndex: startRowIndex
-        }
-      };
-      const change2 = {
-        deleted: [blockCommentEnd],
-        end: {
-          columnIndex: endColumnIndex + blockCommentEnd.length,
-          rowIndex: endRowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: endColumnIndex,
-          rowIndex: endRowIndex
-        }
-      };
-      changes.push(change1, change2);
-
-      // const oldRow1 = TextDocument.getLine(editor, startRowIndex)
-      // const newRow1 =
-      //   oldRow1.slice(0, startColumnIndex) +
-      //   oldRow1.slice(startColumnIndex + blockCommentStart.length)
-      // const oldRow2 = TextDocument.getLine(editor, endRowIndex)
-      // const newRow2 =
-      //   oldRow2.slice(0, endColumnIndex) +
-      //   oldRow2.slice(endColumnIndex + blockCommentEnd.length)
-      // // TODO use applyEdit to have undo functionality
-      // TextDocument.setLine(editor, startRowIndex, newRow1)
-      // TextDocument.setLine(editor, endRowIndex, newRow2)
-    }
+    changes.push(...getRemoveBlockCommentEdits(rowIndex, startRowIndex, startColumnIndex, endRowIndex, endColumnIndex, blockCommentStart, blockCommentEnd));
+
+    // const oldRow1 = TextDocument.getLine(editor, startRowIndex)
+    // const newRow1 =
+    //   oldRow1.slice(0, startColumnIndex) +
+    //   oldRow1.slice(startColumnIndex + blockCommentStart.length)
+    // const oldRow2 = TextDocument.getLine(editor, endRowIndex)
+    // const newRow2 =
+    //   oldRow2.slice(0, endColumnIndex) +
+    //   oldRow2.slice(endColumnIndex + blockCommentEnd.length)
+    // // TODO use applyEdit to have undo functionality
+    // TextDocument.setLine(editor, startRowIndex, newRow1)
+    // TextDocument.setLine(editor, endRowIndex, newRow2)
     // TODO move cursors
   } else {
     const whitespaceAtStart = line.match(RE_WHITESPACE_AT_START$1);
@@ -9508,7 +9482,8 @@ const handleSashPointerDown = (state, eventX, eventY) => {
 const handleSashPointerMove = (state, eventX, eventY) => {
   // @ts-ignore
   const {
-    x} = state;
+    x
+  } = state;
   const minWidth = 100;
   const newWidth = Math.max(eventX - x, minWidth);
   return {
@@ -9602,7 +9577,9 @@ const hoverProblemDetail = {
   type: Span
 };
 const getChildCount = (lineInfos, documentation, diagnostics) => {
-  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
+  const documentationCount = documentation ? 1 : 0;
+  const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
+  return lineInfos.length + documentationCount + diagnosticsCount;
 };
 const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
@@ -11272,7 +11249,6 @@ const diffChildren = (oldChildren, newChildren, patches) => {
     patches.push({
       type: NavigateParent
     });
-    currentChildIndex = -1;
   }
   // Add remove patches in reverse order (highest index first)
   // This ensures indices remain valid as we remove
@@ -12386,7 +12362,7 @@ const add$1 = widget => {
   return addWidget$1(widget, 'EditorCompletionDetails', render$1);
 };
 const remove$1 = removeWidget$1;
-const handleEditorType = (editor, state) => {
+const handleEditorChange = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
     return editor;
@@ -12400,19 +12376,11 @@ const handleEditorType = (editor, state) => {
     x: detailX
   };
 };
+const handleEditorType = (editor, state) => {
+  return handleEditorChange(editor, state);
+};
 const handleEditorDeleteLeft = (editor, state) => {
-  const completionState = getCompletionState(editor);
-  if (!completionState) {
-    return editor;
-  }
-  const {
-    x
-  } = getPositionAtCursor$1(editor);
-  const detailX = x + completionState.width - state.borderSize;
-  return {
-    ...state,
-    x: detailX
-  };
+  return handleEditorChange(editor, state);
 };
 
 const EditorCompletionDetailWidget = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "18.7.0",
+  "version": "18.9.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"