Enhance log file viewer to support opening files at specific lines and update log entry grouping to include line numbers

Author: dermatz

src/extension.ts

@@ -44,8 +44,21 @@ function activateExtension(context: vscode.ExtensionContext, magentoRoot: string
   const treeView = vscode.window.createTreeView('logFiles', { treeDataProvider: logViewerProvider });
 
   vscode.commands.registerCommand('magento-log-viewer.refreshLogFiles', () => logViewerProvider.refresh());
-  vscode.commands.registerCommand('magento-log-viewer.openFile', (resource) => {
-    vscode.window.showTextDocument(vscode.Uri.file(resource));
+  vscode.commands.registerCommand('magento-log-viewer.openFile', (filePath, lineNumber) => {
+    if (lineNumber !== undefined) {
+      const options: vscode.TextDocumentShowOptions = {
+        selection: new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 0))
+      };
+      vscode.window.showTextDocument(vscode.Uri.file(filePath), options);
+    } else {
+      vscode.window.showTextDocument(vscode.Uri.file(filePath));
+    }
+  });
+  vscode.commands.registerCommand('magento-log-viewer.openFileAtLine', (filePath, lineNumber) => {
+    const options: vscode.TextDocumentShowOptions = {
+      selection: new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 0))
+    };
+    vscode.window.showTextDocument(vscode.Uri.file(filePath), options);
   });
 
   vscode.commands.registerCommand('magento-log-viewer.clearAllLogFiles', () => {
@@ -65,7 +78,8 @@ function activateExtension(context: vscode.ExtensionContext, magentoRoot: string
   // Update the badge count
   const updateBadge = () => {
     const logFiles = logViewerProvider.getLogFilesWithoutUpdatingBadge(path.join(magentoRoot, 'var', 'log'));
-    treeView.badge = { value: logFiles.length, tooltip: `${logFiles.length} log files` };
+    const totalEntries = logFiles.reduce((count, file) => count + parseInt(file.description?.match(/\d+/)?.[0] || '0', 10), 0);
+    treeView.badge = { value: totalEntries, tooltip: `${totalEntries} log entries` };
   };
 
   logViewerProvider.onDidChangeTreeData(updateBadge);

src/logViewer.ts

@@ -69,12 +69,12 @@ export class LogViewerProvider implements vscode.TreeDataProvider<LogFile>, vsco
   private getLogFileLines(filePath: string): LogFile[] {
     const fileContent = fs.readFileSync(filePath, 'utf-8');
     const lines = fileContent.split('\n');
-    const groupedLines = this.groupLogEntries(lines);
+    const groupedLines = this.groupLogEntries(lines, filePath);
     return groupedLines;
   }
 
-  private groupLogEntries(lines: string[]): LogFile[] {
-    const grouped: { [key: string]: string[] } = {};
+  private groupLogEntries(lines: string[], filePath: string): LogFile[] {
+    const grouped: { [key: string]: { line: string, lineNumber: number }[] } = {};
 
     lines.forEach((line, index) => {
       const match = line.match(/\.(\w+):/);
@@ -83,14 +83,18 @@ export class LogViewerProvider implements vscode.TreeDataProvider<LogFile>, vsco
         if (!grouped[level]) {
           grouped[level] = [];
         }
-        grouped[level].push(`Line ${index + 1}: ${line}`);
+        grouped[level].push({ line, lineNumber: index });
       }
     });
 
     const summary = Object.keys(grouped).map(level => {
       const count = grouped[level].length;
       const label = `${level} (${count})`;
-      return new LogFile(label, vscode.TreeItemCollapsibleState.Collapsed, undefined, grouped[level].map(line => new LogFile(line, vscode.TreeItemCollapsibleState.None)));
+      return new LogFile(label, vscode.TreeItemCollapsibleState.Collapsed, undefined, grouped[level].map(entry => new LogFile(`Line ${entry.lineNumber + 1}: ${entry.line}`, vscode.TreeItemCollapsibleState.None, {
+        command: 'magento-log-viewer.openFileAtLine',
+        title: 'Open Log File at Line',
+        arguments: [filePath, entry.lineNumber]
+      })));
     });
 
     return summary;