@lvce-editor/output-view 2.16.0 → 2.17.1

package/dist/outputViewWorkerMain.js

@@ -1429,20 +1429,30 @@ const parseStructuredLogLine = line => {
   }, {
     className: OutputSourceLink,
     label: getSourceLabel(parsed.source, parsed.line),
+    lineNumber: parsed.line,
     type: Link,
     value: parsed.source
   }];
 };
 
 const RE_SOURCE_LINK = /^lvce(?:-oss)?:\/\//;
-const RE_SOURCE_LOCATION = /:\d+(?::\d+)?$/;
+const RE_SOURCE_LOCATION = /:(\d+)(?::(\d+))?$/;
 const getLinkPart = match => {
   if (RE_SOURCE_LINK.test(match)) {
+    const locationMatch = match.match(RE_SOURCE_LOCATION);
+    const lineNumber = locationMatch ? Number(locationMatch[1]) : undefined;
+    const columnNumber = locationMatch?.[2] ? Number(locationMatch[2]) : undefined;
     return {
       className: OutputSourceLink,
+      ...(columnNumber !== undefined && {
+        columnNumber
+      }),
       label: match,
+      ...(lineNumber !== undefined && {
+        lineNumber
+      }),
       type: Link,
-      value: match.replace(RE_SOURCE_LOCATION, '')
+      value: locationMatch ? match.slice(0, -locationMatch[0].length) : match
     };
   }
   return {
@@ -1904,11 +1914,21 @@ const handleSelect = async (state, id) => {
   return selectChannel(state, id);
 };
 
-const handleSourceLinkClick = async (state, uri) => {
+const handleSourceLinkClick = async (state, uri, lineNumber, columnNumber) => {
   if (!uri) {
     return state;
   }
-  await invoke('Main.openUri', uri);
+  const line = Number(lineNumber);
+  if (!Number.isSafeInteger(line) || line <= 0) {
+    await invoke('Main.openUri', uri);
+    return state;
+  }
+  const column = Number(columnNumber);
+  const rowIndex = line - 1;
+  const columnIndex = Number.isSafeInteger(column) && column > 0 ? column - 1 : 0;
+  await invoke('Main.openUri', uri, true, {
+    selections: new Uint32Array([rowIndex, columnIndex, rowIndex, columnIndex])
+  });
   return state;
 };
 
@@ -2215,6 +2235,12 @@ const getLinePartDom = part => {
           ...(part.className && {
             className: part.className
           }),
+          ...(part.columnNumber !== undefined && {
+            'data-column': part.columnNumber
+          }),
+          ...(part.lineNumber !== undefined && {
+            'data-line': part.lineNumber
+          }),
           ...(isSourceLink && {
             onClick: HandleSourceLinkClick
           })
@@ -2464,7 +2490,7 @@ const renderEventListeners = () => {
     params: ['clearFilter']
   }, {
     name: HandleSourceLinkClick,
-    params: ['handleSourceLinkClick', 'event.target.href'],
+    params: ['handleSourceLinkClick', 'event.target.href', 'event.target.dataset.line', 'event.target.dataset.column'],
     preventDefault: true
   }, {
     name: HandlePointerDown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/output-view",
-  "version": "2.16.0",
+  "version": "2.17.1",
   "description": "Output View Worker",
   "repository": {
     "type": "git",