refactor(terminal): extract common link related code to terminal-link.ts (#4549)

1. Move regex patterns and constants to terminal-link.ts
2. Create ILinkInfo interface for link information
3. Extract extractLineInfoFromMatch function to common module
4. Update imports and usages in related files
5. Remove duplicate code in link providers

Author: Aaaaash

packages/terminal-next/__tests__/browser/links/validated-local-link-provider.test.ts

@@ -286,4 +286,79 @@ describe('Workbench - TerminalValidatedLocalLinkProvider', () => {
       },
     ]);
   });
+
+  describe('Special formats', () => {
+    const isWindows = false;
+    test('Python error output format', async () => {
+      await assertLink('  File "/path/to/file.py", line 3, in test_func', isWindows, [
+        {
+          text: '/path/to/file.py", line 3',
+          range: [
+            [9, 1],
+            [33, 1],
+          ],
+        },
+      ]);
+      await assertLink('    File "/absolute/path/script.py", line 123, column 45', isWindows, [
+        {
+          text: '/absolute/path/script.py", line 123, column 45',
+          range: [
+            [11, 1],
+            [56, 1],
+          ],
+        },
+      ]);
+    });
+
+    test('File paths with line and column numbers', async () => {
+      await assertLink('/path/to/file.py:2, column 2', isWindows, [
+        {
+          text: '/path/to/file.py:2',
+          range: [
+            [1, 1],
+            [18, 1],
+          ],
+        },
+      ]);
+
+      await assertLink('/path/to/file.py:2, col 2', isWindows, [
+        {
+          text: '/path/to/file.py:2',
+          range: [
+            [1, 1],
+            [18, 1],
+          ],
+        },
+      ]);
+
+      await assertLink('/path/to/file.py:2:3', isWindows, [
+        {
+          text: '/path/to/file.py:2:3',
+          range: [
+            [1, 1],
+            [20, 1],
+          ],
+        },
+      ]);
+    });
+
+    test('Multiple formats in one line', async () => {
+      await assertLink('Error in /path/to/file.py:2, column 2 and /another/file.js:5:6', isWindows, [
+        {
+          text: '/path/to/file.py:2',
+          range: [
+            [10, 1],
+            [27, 1],
+          ],
+        },
+        {
+          text: '/another/file.js:5:6',
+          range: [
+            [43, 1],
+            [62, 1],
+          ],
+        },
+      ]);
+    });
+  });
 });

packages/terminal-next/src/browser/links/link-manager.ts

@@ -25,22 +25,21 @@ import {
   ITerminalHoverManagerService,
   ITerminalService,
 } from '../../common';
+import {
+  ILinkInfo,
+  extractLineInfoFromMatch,
+  getLineAndColumnClause,
+  unixLocalLinkClause,
+  winDrivePrefix,
+  winLocalLinkClause,
+} from '../../common/terminal-link';
 import { XTermCore } from '../../common/xterm-private';
 import { TerminalClient } from '../terminal.client';
 
 import { TerminalExternalLinkProviderAdapter } from './external-link-provider-adapter';
 import { TerminalLink } from './link';
 import { TerminalProtocolLinkProvider } from './protocol-link-provider';
-import {
-  TerminalValidatedLocalLinkProvider,
-  lineAndColumnClause,
-  lineAndColumnClauseGroupCount,
-  unixLineAndColumnMatchIndex,
-  unixLocalLinkClause,
-  winDrivePrefix,
-  winLineAndColumnMatchIndex,
-  winLocalLinkClause,
-} from './validated-local-link-provider';
+import { TerminalValidatedLocalLinkProvider } from './validated-local-link-provider';
 import { TerminalWordLinkProvider } from './word-link-provider';
 
 const { posix, win32 } = path;
@@ -249,23 +248,22 @@ export class TerminalLinkManager extends Disposable {
   protected get _localLinkRegex(): RegExp {
     const baseLocalLinkClause = this._client.os === OperatingSystem.Windows ? winLocalLinkClause : unixLocalLinkClause;
     // Append line and column number regex
-    return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`);
+    return new RegExp(`${baseLocalLinkClause}(${getLineAndColumnClause()})`);
   }
 
   private async _handleLocalLink(link: string): Promise<void> {
-    // TODO: This gets resolved again but doesn't need to as it's already validated
-    const resolvedLink = await this._resolvePath(link);
+    const lineColumnInfo: LineColumnInfo = this.extractLineColumnInfo(link);
+    const resolvedLink = await this._resolvePath(lineColumnInfo.filePath);
     if (!resolvedLink) {
       return;
     }
-    const lineColumnInfo: LineColumnInfo = this.extractLineColumnInfo(link);
     const range: ITextEditorSelection = {
       startLineNumber: lineColumnInfo.lineNumber,
       endLineNumber: lineColumnInfo.lineNumber,
       startColumn: lineColumnInfo.columnNumber,
       endColumn: lineColumnInfo.columnNumber,
     };
-    await this._editorService.open(resolvedLink.uri, { range });
+    await this._editorService.open(resolvedLink.uri, { range, focus: true });
   }
 
   private _handleHypertextLink(url: string): void {
@@ -399,39 +397,31 @@ export class TerminalLinkManager extends Disposable {
     }
   }
 
+  private _extractLineInfoFromMatch(match: RegExpExecArray): ILinkInfo {
+    return extractLineInfoFromMatch(match);
+  }
+
   /**
    * Returns line and column number of URl if that is present.
    *
    * @param link Url link which may contain line and column number.
    */
   public extractLineColumnInfo(link: string): LineColumnInfo {
-    const matches: string[] | null = this._localLinkRegex.exec(link);
+    const matches: RegExpExecArray | null = this._localLinkRegex.exec(link);
     const lineColumnInfo: LineColumnInfo = {
       lineNumber: 1,
       columnNumber: 1,
+      filePath: link,
     };
-
     if (!matches) {
       return lineColumnInfo;
     }
-
-    const lineAndColumnMatchIndex =
-      this._client.os === OperatingSystem.Windows ? winLineAndColumnMatchIndex : unixLineAndColumnMatchIndex;
-    for (let i = 0; i < lineAndColumnClause.length; i++) {
-      const lineMatchIndex = lineAndColumnMatchIndex + lineAndColumnClauseGroupCount * i;
-      const rowNumber = matches[lineMatchIndex];
-      if (rowNumber) {
-        lineColumnInfo['lineNumber'] = parseInt(rowNumber, 10);
-        // Check if column number exists
-        const columnNumber = matches[lineMatchIndex + 2];
-        if (columnNumber) {
-          lineColumnInfo['columnNumber'] = parseInt(columnNumber, 10);
-        }
-        break;
-      }
-    }
-
-    return lineColumnInfo;
+    const lineInfo = this._extractLineInfoFromMatch(matches);
+    return {
+      filePath: lineInfo.filePath ?? link,
+      lineNumber: lineInfo.line ?? 1,
+      columnNumber: lineInfo.column ?? 1,
+    };
   }
 
   /**
@@ -449,6 +439,7 @@ export class TerminalLinkManager extends Disposable {
 }
 
 export interface LineColumnInfo {
+  filePath: string;
   lineNumber: number;
   columnNumber: number;
 }

packages/terminal-next/src/browser/links/link.ts

@@ -43,7 +43,17 @@ export class TerminalLink extends Disposable implements ILink {
     public readonly range: IBufferRange,
     public readonly text: string,
     private readonly _viewportY: number,
-    private readonly _activateCallback: (event: MouseEvent | undefined, uri: string) => void,
+    private readonly _activateCallback: (
+      event: MouseEvent | undefined,
+      uri: string,
+      lineInfo?: {
+        filePath?: string;
+        line?: number;
+        column?: number;
+        endLine?: number;
+        endColumn?: number;
+      },
+    ) => void,
     private readonly _tooltipCallback: (
       link: TerminalLink,
       viewportRange: IViewportRange,
@@ -52,6 +62,13 @@ export class TerminalLink extends Disposable implements ILink {
     ) => IDisposable | undefined,
     private readonly _isHighConfidenceLink: boolean,
     readonly label: string | undefined,
+    private readonly _lineInfo?: {
+      filePath?: string;
+      line?: number;
+      column?: number;
+      endLine?: number;
+      endColumn?: number;
+    },
   ) {
     super();
     this.decorations = {
@@ -71,7 +88,7 @@ export class TerminalLink extends Disposable implements ILink {
   }
 
   activate(event: MouseEvent | undefined, text: string): void {
-    this._activateCallback(event, text);
+    this._activateCallback(event, text, this._lineInfo);
   }
 
   hover(event: MouseEvent, text: string): void {