@lvce-editor/editor-worker 16.1.0 → 16.3.0

package/dist/editorWorkerMain.js

@@ -2619,6 +2619,108 @@ const getIncrementalEdits = async (oldState, newState) => {
   return emptyIncrementalEdits;
 };
 
+/**
+ * Gets all regex matches for a given text and regex pattern
+ * @param text The text to match against
+ * @param regex The regex pattern to use (should have global flag)
+ * @returns Array of regex matches
+ */
+const getRegexMatches = (text, regex) => {
+  return [...text.matchAll(regex)];
+};
+
+// URL matching regex pattern - matches common URL schemes
+// Supports: http://, https://, ftp://, ftps://, file://
+// Also matches URLs without explicit scheme (www.example.com)
+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;
+
+// Regex to check if URL has a scheme (http://, https://, ftp://, etc.)
+const HAS_SCHEME_PATTERN = /^(?:https?|ftp|ftps|file):\/\//;
+
+// Regex to check if URL starts with www.
+const HAS_WWW_PATTERN = /^www\./;
+
+/**
+ * Detects links in a given text and returns their positions
+ * @param text The text to scan for links
+ * @returns Array of links with their start position and length
+ */
+const detectLinks = text => {
+  const matches = getRegexMatches(text, URL_PATTERN);
+  const links = [];
+  for (const match of matches) {
+    const url = 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({
+        length: url.length,
+        start: match.index ?? 0
+      });
+    }
+  }
+  return links;
+};
+
+/**
+ * Detects all links in an editor and returns them as decorations
+ * @param editor The editor containing lines to scan
+ * @returns Flat array of decorations in format [offset, length, type, modifiers, ...]
+ */
+const detectAllLinksAsDecorations = editor => {
+  const decorations = [];
+  const {
+    lines
+  } = editor;
+  let offset = 0;
+  for (const line of lines) {
+    const links = detectLinks(line);
+    for (const link of links) {
+      const linkOffset = offset + link.start;
+      // Add link decoration: offset, length, type, modifiers
+      decorations.push(linkOffset, link.length, Link, 0);
+    }
+    offset += line.length + 1; // +1 for newline
+  }
+  return decorations;
+};
+
+/**
+ * Gets the URL text at a given offset in the editor if it's a link
+ * @param editor The editor
+ * @param offset The offset in the document
+ * @returns The URL string if the offset is on a link, or undefined
+ */
+const getUrlAtOffset = (editor, offset) => {
+  const {
+    decorations,
+    lines
+  } = editor;
+
+  // Iterate through decorations in groups of 4 (offset, length, type, modifiers)
+  for (let i = 0; i < decorations.length; i += 4) {
+    const decorationOffset = decorations[i];
+    const decorationLength = decorations[i + 1];
+    const decorationType = decorations[i + 2];
+
+    // Check if this decoration is a link and if the offset falls within it
+    if (decorationType === Link && offset >= decorationOffset && offset < decorationOffset + decorationLength) {
+      // Extract the URL text from the editor content
+      let currentOffset = 0;
+      for (const line of lines) {
+        const lineLength = line.length + 1; // +1 for newline
+        if (currentOffset + lineLength > decorationOffset) {
+          // The link starts in this line
+          const linkStartInLine = decorationOffset - currentOffset;
+          const url = line.slice(linkStartInLine, linkStartInLine + decorationLength);
+          return url;
+        }
+        currentOffset += lineLength;
+      }
+    }
+  }
+  return undefined;
+};
+
 const splitLines = lines => {
   if (!lines) {
     return [''];
@@ -3034,11 +3136,17 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
     selections: newSelections,
     undoStack: [...editor.undoStack, changes]
   };
-  set$6(editor.uid, editor, newEditor);
-  const incrementalEdits = await getIncrementalEdits(editor, newEditor);
-  const editorWithNewWidgets = await applyWidgetChanges(newEditor, changes);
-  const newEditor2 = {
+  // Update link decorations after text changes
+  const linkDecorations = detectAllLinksAsDecorations(newEditor);
+  const newEditorWithDecorations = {
     ...newEditor,
+    decorations: linkDecorations
+  };
+  set$6(editor.uid, editor, newEditorWithDecorations);
+  const incrementalEdits = await getIncrementalEdits(editor, newEditorWithDecorations);
+  const editorWithNewWidgets = await applyWidgetChanges(newEditorWithDecorations, changes);
+  const newEditor2 = {
+    ...newEditorWithDecorations,
     ...editorWithNewWidgets,
     incrementalEdits
   };
@@ -3308,71 +3416,6 @@ const getLanguages = async (platform, assetDir) => {
   return languages;
 };
 
-/**
- * Gets all regex matches for a given text and regex pattern
- * @param text The text to match against
- * @param regex The regex pattern to use (should have global flag)
- * @returns Array of regex matches
- */
-const getRegexMatches = (text, regex) => {
-  return [...text.matchAll(regex)];
-};
-
-// URL matching regex pattern - matches common URL schemes
-// Supports: http://, https://, ftp://, ftps://, file://
-// Also matches URLs without explicit scheme (www.example.com)
-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;
-
-// Regex to check if URL has a scheme (http://, https://, ftp://, etc.)
-const HAS_SCHEME_PATTERN = /^(?:https?|ftp|ftps|file):\/\//;
-
-// Regex to check if URL starts with www.
-const HAS_WWW_PATTERN = /^www\./;
-
-/**
- * Detects links in a given text and returns their positions
- * @param text The text to scan for links
- * @returns Array of links with their start position and length
- */
-const detectLinks = text => {
-  const matches = getRegexMatches(text, URL_PATTERN);
-  const links = [];
-  for (const match of matches) {
-    const url = 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({
-        length: url.length,
-        start: match.index ?? 0
-      });
-    }
-  }
-  return links;
-};
-
-/**
- * Detects all links in an editor and returns them as decorations
- * @param editor The editor containing lines to scan
- * @returns Flat array of decorations in format [offset, length, type, modifiers, ...]
- */
-const detectAllLinksAsDecorations = editor => {
-  const decorations = [];
-  const {
-    lines
-  } = editor;
-  let offset = 0;
-  for (const line of lines) {
-    const links = detectLinks(line);
-    for (const link of links) {
-      const linkOffset = offset + link.start;
-      // Add link decoration: offset, length, type, modifiers
-      decorations.push(linkOffset, link.length, Link, 0);
-    }
-    offset += line.length + 1; // +1 for newline
-  }
-  return decorations;
-};
-
 const measureCharacterWidth = async (fontWeight, fontSize, fontFamily, letterSpacing) => {
   return await measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
@@ -3460,6 +3503,37 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
   return visibleDiagnostics;
 };
 
+/**
+ * Merges link decorations with diagnostic decorations
+ * Links should always be present, but we also need to include any diagnostic decorations
+ */
+const mergeLinksWithDiagnosticDecorations = (editor, diagnosticDecorations) => {
+  // Get link decorations
+  const linkDecorations = detectAllLinksAsDecorations(editor);
+
+  // Merge with diagnostic decorations
+  const allDecorations = [...linkDecorations, ...diagnosticDecorations];
+
+  // Sort by offset to maintain proper order
+  const sortedDecorations = [];
+  for (let i = 0; i < allDecorations.length; i += 4) {
+    sortedDecorations.push({
+      length: allDecorations[i + 1],
+      modifiers: allDecorations[i + 3],
+      offset: allDecorations[i],
+      type: allDecorations[i + 2]
+    });
+  }
+  sortedDecorations.sort((a, b) => a.offset - b.offset);
+
+  // Flatten back to array format
+  const result = [];
+  for (const dec of sortedDecorations) {
+    result.push(dec.offset, dec.length, dec.type, dec.modifiers);
+  }
+  return result;
+};
+
 const updateDiagnostics = async newState => {
   try {
     // TODO handle error
@@ -3480,11 +3554,13 @@ const updateDiagnostics = async newState => {
       return newState;
     }
     const visualDecorations = await getVisibleDiagnostics(latest.newState, diagnostics);
-    // Re-detect link decorations after text changes
-    const linkDecorations = detectAllLinksAsDecorations(latest.newState);
+    // Get diagnostic decorations from visual decorations (if any)
+    const diagnosticDecorations = visualDecorations.flatMap(deco => [deco.offset, deco.length, deco.type, deco.modifiers || 0]);
+    // Merge link decorations with diagnostic decorations
+    const mergedDecorations = mergeLinksWithDiagnosticDecorations(latest.newState, diagnosticDecorations);
     const newEditor = {
       ...latest.newState,
-      decorations: linkDecorations,
+      decorations: mergedDecorations,
       // Text-level decorations (flat array) for CSS classes
       diagnostics,
       visualDecorations // Visual decorations (objects with x, y, width, height) for squiggly underlines
@@ -5440,6 +5516,10 @@ const setPosition$1 = position => {
   state$3.position = position;
 };
 
+const openExternal = async url => {
+  await invoke$b('Open.openUrl', url);
+};
+
 // TODO first change cursor position, then run go to definition
 // cursor should appear at mousedown position immediately
 const handleSingleClickWithAlt = async (editor, position) => {
@@ -5447,12 +5527,21 @@ const handleSingleClickWithAlt = async (editor, position) => {
     columnIndex,
     rowIndex
   } = position;
+
+  // Check if the click is on a link
+  const offset = offsetAt(editor, rowIndex, columnIndex);
+  const url = getUrlAtOffset(editor, offset);
+  if (url) {
+    // Open the link
+    await openExternal(url);
+    return editor;
+  }
+
+  // Otherwise, perform the default go to definition
   const newEditor = {
     ...editor,
     selections: new Uint32Array([rowIndex, columnIndex, rowIndex, columnIndex])
   };
-  // TODO rectangular selection with alt click,
-  // but also go to definition with alt click
   const newEditor2 = await goToDefinition(newEditor);
   return newEditor2;
 };

package/package.json

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