@lvce-editor/static-server 0.84.13 → 0.84.15

package/static/{d9f5508 → 76eeed9}/packages/editor-worker/dist/editorWorkerMain.js

@@ -2922,6 +2922,44 @@ const HAS_SCHEME_PATTERN = /^(?:https?|ftp|ftps|file):\/\//;
 
 // Regex to check if URL starts with www.
 const HAS_WWW_PATTERN = /^www\./;
+const TRAILING_SENTENCE_PUNCTUATION = '.,;:!?';
+const OPENING_DELIMITER_MAP = {
+  ')': '(',
+  ']': '[',
+  '}': '{',
+  '>': '<'
+};
+const hasUnmatchedClosingDelimiter = (url, closingDelimiter) => {
+  const openingDelimiter = OPENING_DELIMITER_MAP[closingDelimiter];
+  let balance = 0;
+  for (const char of url) {
+    if (char === openingDelimiter) {
+      balance++;
+    } else if (char === closingDelimiter) {
+      balance--;
+    }
+  }
+  return balance < 0;
+};
+const trimTrailingPunctuation = url => {
+  let trimmed = url;
+  while (trimmed.length > 0) {
+    const lastChar = trimmed.at(-1);
+    if (!lastChar) {
+      break;
+    }
+    if (TRAILING_SENTENCE_PUNCTUATION.includes(lastChar)) {
+      trimmed = trimmed.slice(0, -1);
+      continue;
+    }
+    if (lastChar in OPENING_DELIMITER_MAP && hasUnmatchedClosingDelimiter(trimmed, lastChar)) {
+      trimmed = trimmed.slice(0, -1);
+      continue;
+    }
+    break;
+  }
+  return trimmed;
+};
 
 /**
  * Detects links in a given text and returns their positions
@@ -2932,7 +2970,7 @@ const detectLinks = text => {
   const matches = getRegexMatches(text, URL_PATTERN);
   const links = [];
   for (const match of matches) {
-    const url = match[0];
+    const url = trimTrailingPunctuation(match[0]);
     // Only consider as link if it has a scheme or starts with www.
     if (HAS_SCHEME_PATTERN.test(url) || HAS_WWW_PATTERN.test(url)) {
       links.push({
@@ -5361,36 +5399,50 @@ const cutLine = async editor => {
     lines,
     selections
   } = editor;
-  const [startRowIndex] = selections;
-  const line = lines[startRowIndex];
-  const replaceRange$1 = new Uint32Array([startRowIndex, 0, startRowIndex, line.length]);
+  const seenRows = new Set();
+  const rows = [];
+  for (let i = 0; i < selections.length; i += 4) {
+    const [startRowIndex] = getSelectionPairs(selections, i);
+    if (!seenRows.has(startRowIndex)) {
+      seenRows.add(startRowIndex);
+      rows.push(startRowIndex);
+    }
+  }
+  const replaceRange$1 = new Uint32Array(rows.length * 4);
+  const selectionChanges = new Uint32Array(rows.length * 4);
+  const cutLines = [];
+  for (let i = 0; i < rows.length; i++) {
+    const startRowIndex = rows[i];
+    const line = lines[startRowIndex];
+    const offset = i * 4;
+    replaceRange$1[offset] = startRowIndex;
+    replaceRange$1[offset + 1] = 0;
+    replaceRange$1[offset + 2] = startRowIndex;
+    replaceRange$1[offset + 3] = line.length;
+    selectionChanges[offset] = startRowIndex;
+    selectionChanges[offset + 1] = 0;
+    selectionChanges[offset + 2] = startRowIndex;
+    selectionChanges[offset + 3] = 0;
+    cutLines.push(line);
+  }
   const changes = replaceRange(editor, replaceRange$1, [''], EditorCut);
-  const selectionChanges = new Uint32Array([startRowIndex, 0, startRowIndex, 0]);
-  await writeText(line);
+  await writeText(joinLines(cutLines));
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
 const cutSelectedText = async editor => {
-  const {
-    selections
-  } = editor;
-  const [startRowIndex, startColumnIndex, endRowIndex, endColumnIndex] = selections;
   const changes = editorReplaceSelections(editor, [''], EditorCut);
-  const selectionChanges = new Uint32Array([startRowIndex, startColumnIndex, endRowIndex, endColumnIndex]);
-  // @ts-ignore
-  const text = joinLines(changes[0].deleted);
-  // TODO remove selected text from document
+  const selectedTexts = changes.map(change => joinLines(change.deleted)).filter(text => text.length > 0);
+  const text = joinLines(selectedTexts);
   await writeText(text);
-  // @ts-ignore
-  return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
+  return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
 const cut$1 = async editor => {
   const {
     selections
   } = editor;
-  const [startRowIndex, startColumnIndex, endRowIndex, endColumnIndex] = selections;
-  if (isEmpty(startRowIndex, startColumnIndex, endRowIndex, endColumnIndex)) {
+  if (isEverySelectionEmpty(selections)) {
     return cutLine(editor);
   }
   return cutSelectedText(editor);
@@ -6198,7 +6250,11 @@ const handleTripleClick = (editor, modifier, x, y) => {
   return selectLine(editor);
 };
 
+const PrimaryButton = 0;
 const handleMouseDown = async (state, button, altKey, ctrlKey, x, y, detail) => {
+  if (button !== PrimaryButton) {
+    return state;
+  }
   const modifier = getModifier(altKey, ctrlKey);
   let newState;
   switch (detail) {
@@ -10771,58 +10827,72 @@ const relaunchWorkers = async () => {
   await launch();
 };
 
-const getWidgetName = widgetId => {
+const getWidgetHotReloadDescriptor = widgetId => {
   switch (widgetId) {
     case Find:
-      return `FindWidget`;
+      return {
+        invoke: invoke$3,
+        name: 'FindWidget'
+      };
     default:
-      return '';
+      return undefined;
   }
 };
-const saveWidgetState = async keys => {
-  const savedStates = Object.create(null);
-  for (const key of keys) {
-    const editor = get$7(parseInt(key));
-    const {
-      widgets
-    } = editor.newState;
-    for (const widget of widgets) {
-      const invoke = getWidgetInvoke(widget.id);
-      const fullKey = `${key}:${widget.newState.uid}`;
-      const name = getWidgetName(widget.id);
-      const savedState = await invoke(`${name}.saveState`, widget.newState.uid);
-      savedStates[fullKey] = savedState;
+
+const restoreWidget = async (editorUid, key, widget, savedStates) => {
+  if (widget?.newState) {
+    const fullKey = `${key}:${widget.newState.uid}`;
+    const descriptor = getWidgetHotReloadDescriptor(widget.id);
+    if (descriptor && savedStates && Object.hasOwn(savedStates, fullKey)) {
+      const {
+        invoke,
+        name
+      } = descriptor;
+      const savedState = savedStates[fullKey];
+      await invoke(`${name}.create`, widget.newState.uid, widget.newState.x, widget.newState.y, widget.newState.width, widget.newState.height, editorUid);
+      await invoke(`${name}.loadContent`, widget.newState.uid, savedState);
+      const diffResult = await invoke(`${name}.diff2`, widget.newState.uid);
+      const commands = await invoke(`${name}.render2`, widget.newState.uid, diffResult);
+      return {
+        restored: true,
+        widget: {
+          ...widget,
+          newState: {
+            ...widget.newState,
+            commands
+          }
+        }
+      };
     }
   }
-  return savedStates;
+  return {
+    restored: false,
+    widget
+  };
 };
-
 const restoreWidgetState = async (keys, savedStates) => {
   const newEditors = [];
   for (const key of keys) {
     const editorUid = parseInt(key);
     const editor = get$7(editorUid);
+    if (!editor?.newState || !Array.isArray(editor.newState.widgets)) {
+      continue;
+    }
     const {
       widgets
     } = editor.newState;
     const newWidgets = [];
+    let hasRestoredWidget = false;
     for (const widget of widgets) {
-      const invoke = getWidgetInvoke(widget.id);
-      const fullKey = `${key}:${widget.newState.uid}`;
-      const savedState = savedStates[fullKey] || {};
-      const name = getWidgetName(widget.id);
-      await invoke(`${name}.create`, widget.newState.uid, widget.newState.x, widget.newState.y, widget.newState.width, widget.newState.height, editorUid);
-      await invoke(`${name}.loadContent`, widget.newState.uid, savedState);
-      const diffResult = await invoke(`${name}.diff2`, widget.newState.uid);
-      const commands = await invoke(`${name}.render2`, widget.newState.uid, diffResult);
-      const newWidget = {
-        ...widget,
-        newState: {
-          ...widget.newState,
-          commands
-        }
-      };
-      newWidgets.push(newWidget);
+      const restoredWidget = await restoreWidget(editorUid, key, widget, savedStates);
+      newWidgets.push(restoredWidget.widget);
+      if (restoredWidget.restored) {
+        hasRestoredWidget = true;
+      }
+    }
+    if (!hasRestoredWidget) {
+      newEditors.push(editor);
+      continue;
     }
     newEditors.push({
       ...editor,
@@ -10835,6 +10905,42 @@ const restoreWidgetState = async (keys, savedStates) => {
   return newEditors;
 };
 
+const saveSingleWidgetState = async (savedStates, key, widget) => {
+  if (!widget?.newState) {
+    return;
+  }
+  const descriptor = getWidgetHotReloadDescriptor(widget.id);
+  if (!descriptor) {
+    return;
+  }
+  const {
+    invoke,
+    name
+  } = descriptor;
+  const {
+    uid
+  } = widget.newState;
+  const fullKey = `${key}:${uid}`;
+  const savedState = await invoke(`${name}.saveState`, uid);
+  savedStates[fullKey] = savedState;
+};
+const saveWidgetState = async keys => {
+  const savedStates = Object.create(null);
+  for (const key of keys) {
+    const editor = get$7(parseInt(key));
+    if (!editor?.newState || !Array.isArray(editor.newState.widgets)) {
+      continue;
+    }
+    const {
+      widgets
+    } = editor.newState;
+    for (const widget of widgets) {
+      await saveSingleWidgetState(savedStates, key, widget);
+    }
+  }
+  return savedStates;
+};
+
 const state = {
   isReloading: false
 };
@@ -10843,20 +10949,22 @@ const hotReload = async () => {
     return;
   }
   state.isReloading = true;
+  try {
+    // TODO use getEditors
+    const keys = getKeys$2();
+    const savedStates = await saveWidgetState(keys);
+    await relaunchWorkers();
+    const newEditors = await restoreWidgetState(keys, savedStates);
+    for (const editor of newEditors) {
+      set$8(editor.newState.uid, editor.oldState, editor.newState);
+    }
 
-  // TODO use getEditors
-  const keys = getKeys$2();
-  const savedStates = await saveWidgetState(keys);
-  await relaunchWorkers();
-  const newEditors = await restoreWidgetState(keys, savedStates);
-  for (const editor of newEditors) {
-    set$8(editor.newState.uid, editor.oldState, editor.newState);
+    // TODO ask renderer worker to rerender all editors
+    // @ts-ignore
+    await invoke$b(`Editor.rerender`);
+  } finally {
+    state.isReloading = false;
   }
-
-  // TODO ask renderer worker to rerender all editors
-  // @ts-ignore
-  await invoke$b(`Editor.rerender`);
-  state.isReloading = false;
 };
 
 const sendMessagePortToSyntaxHighlightingWorker = async port => {
@@ -11769,19 +11877,9 @@ const getDom = state => {
   }
   return getEditorVirtualDom(state);
 };
-const isFastScroll = (oldState, newState) => {
-  return Math.abs(newState.minLineY - oldState.minLineY) > 1;
-};
 const renderIncremental = (oldState, newState) => {
   const oldDom = oldState.initial ? getDom(oldState) : get(newState.uid) || getDom(oldState);
   const newDom = getDom(newState);
-  if (isFastScroll(oldState, newState)) {
-    set(newState.uid, newDom);
-    return [SetPatches, newState.uid, [{
-      nodes: newDom,
-      type: 6
-    }]];
-  }
   const patches = diffTree(oldDom, newDom);
   if (patches.length === 0) {
     return [];

package/static/{d9f5508 → 76eeed9}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2916,7 +2916,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/d9f5508/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/76eeed9/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3138,9 +3138,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/d9f5508' !== 'undefined') {
+  if (typeof '/76eeed9' !== 'undefined') {
     // @ts-ignore
-    return '/d9f5508';
+    return '/76eeed9';
   }
   if (platform === Electron) {
     return '../../../../..';