Merge branch 'main' into chore-ms-time-display

Author: lukecotter

.gitignore

@@ -7,3 +7,4 @@ node_modules
 dist/
 build/
 out/
+coverage/

CHANGELOG.md

@@ -66,6 +66,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Markers for errors, skipped lines, and truncation
     - Click to navigate to Call Tree (now on key press of `J` or `Cmd/Ctrl+Click`)
   - **Legacy Support**: Toggle the legacy timeline anytime via **Settings -> Apex Log Analyzer -> Timeline -> Legacy**.
+- 📄 **Raw Log Navigation**: Seamless navigation between raw log files and the log analysis. ([#204])
+  - **Show in Raw Log**: Right-click timeline or call tree frames → "Show in Log File" to jump to the corresponding line.
+  - **Show in Log Analysis**: Click the hover link on raw log lines to navigate back to the log analysis.
+  - **Code Folding**: Collapse/expand matching start/end events (METHOD_ENTRY/EXIT, CODE_UNIT, DML, SOQL, etc.).
+  - **Line Decorations**: Duration appears as ghost text at the end of the cursor line (e.g., `1.23s (self: 45ms)`).
+  - **Hover Details**: Hover near the ghost text to see SOQL/DML counts, row counts, and exception info.
+  - **Total Duration**: First line shows total log execution time.
 
 ### Changed
 
@@ -466,6 +473,7 @@ Skipped due to adopting odd numbering for pre releases and even number for relea
 
 <!-- Unreleased -->
 
+[#204]: https://github.com/certinia/debug-log-analyzer/issues/204
 [#714]: https://github.com/certinia/debug-log-analyzer/issues/714
 [#245]: https://github.com/certinia/debug-log-analyzer/issues/245
 [#164]: https://github.com/certinia/debug-log-analyzer/issues/164

README.md

@@ -23,6 +23,7 @@ Apex Log Analyzer is a blazing-fast VS Code extension for Salesforce developers.
 - **🔥 [Timeline](#-timeline)** – Visualize every method, SOQL query, and DML operation in your Apex logs with an interactive flame chart and minimap navigation.
 - **🌲 [Interactive Call Tree](#-call-tree)** – Dive into execution stacks with timing, row counts, and DML/ SOQL metrics.
 - **📊 [Apex](#-apex-analysis) + [Database](#%EF%B8%8F-database-analysis) Analysis** – Identify slow-performing SOQL, high-impact DML, and time-heavy Apex methods.
+- **📄 [Raw Log Navigation](#-raw-log-navigation)** – Jump between analysis views and raw log files with code folding, hover details, and bidirectional navigation.
 - **🧠 Smart Filtering + Sorting** – Focus on what matters: filter by namespace, event type, or duration.
 - **🔍 Deep Search** – Find events across the flame chart, call tree, and database tables.
 - **📤 Export + Share** – Copy or Export Salesforce debug log insights for analysis or collaboration.
@@ -150,6 +151,17 @@ Search across all visualizations:
 
 Quickly step through matches, auto-expand parents, and automatically show timeline tooltips.
 
+## 📄 Raw Log Navigation
+
+Seamlessly navigate between the visual analysis and your raw `.log` files:
+
+- **Show in Raw Log** – Right-click any frame in Timeline or Call Tree → "Show in Log File" to jump to the exact line.
+- **Show in Log Analysis** – Hover a raw log line to see metrics and click "Show in Log Analysis" to jump back.
+- **Code Folding** – Collapse/expand matching start/end events (METHOD_ENTRY/EXIT, DML_BEGIN/END, etc.) using the gutter icons or `Ctrl+Shift+[`/`]`.
+- **Line Decorations** – Duration appears as ghost text at the end of the cursor line (e.g., `1.23s (self: 45ms)`).
+- **Hover Details** – Hover near the ghost text to see SOQL/DML counts, row counts, and exception info.
+- **Total Duration** – First line displays total log execution time.
+
 ## 🎨 Customization
 
 Adjust event colors in `settings.json`:

…ewer/src/__tests__/ApexLogParser.test.ts …g-parser/__tests__/ApexLogParser.test.tslog-viewer/src/__tests__/ApexLogParser.test.ts renamed to apex-log-parser/__tests__/ApexLogParser.test.ts log-viewer/src/__tests__/ApexLogParser.test.ts renamed to apex-log-parser/__tests__/ApexLogParser.test.ts

@@ -2,19 +2,19 @@
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
 import {
+  ApexLogParser,
   CodeUnitStartedLine,
   ExecutionStartedLine,
+  lineTypeMap,
   LogEvent,
   MethodEntryLine,
-  SOQLExecuteBeginLine,
-  SOQLExecuteExplainLine,
+  parse,
   parseObjectNamespace,
   parseRows,
   parseVfNamespace,
-} from '../core/log-parser/LogEvents.js';
-import { lineTypeMap } from '../core/log-parser/LogLineMapping.js';
-
-import { ApexLogParser, parse } from '../core/log-parser/ApexLogParser.js';
+  SOQLExecuteBeginLine,
+  SOQLExecuteExplainLine,
+} from '../src/index.js';
 
 class DummyLine extends LogEvent {
   constructor(parser: ApexLogParser, parts: string[]) {

apex-log-parser/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "apex-log-parser",
+  "version": "0.1.0",
+  "private": true,
+  "description": "Apex debug log parser for Salesforce",
+  "type": "module"
+}

…wer/src/core/log-parser/ApexLogParser.ts apex-log-parser/src/ApexLogParser.tslog-viewer/src/core/log-parser/ApexLogParser.ts renamed to apex-log-parser/src/ApexLogParser.ts log-viewer/src/core/log-parser/ApexLogParser.ts renamed to apex-log-parser/src/ApexLogParser.ts

@@ -425,17 +425,21 @@ export class BulkHeapAllocateLine extends LogEvent {
   }
 }
 
-export class CalloutRequestLine extends LogEvent {
+export class CalloutRequestLine extends DurationLogEvent {
   constructor(parser: ApexLogParser, parts: string[]) {
-    super(parser, parts);
-    this.text = `${parts[3]} : ${parts[2]}`;
+    super(parser, parts, ['CALLOUT_RESPONSE'], 'Method', 'free');
+    this.text = parts[3] ?? '';
+    this.lineNumber = this.parseLineNumber(parts[2]);
   }
 }
 
 export class CalloutResponseLine extends LogEvent {
+  isExit = true;
+
   constructor(parser: ApexLogParser, parts: string[]) {
     super(parser, parts);
-    this.text = `${parts[3]} : ${parts[2]}`;
+    this.text = parts[3] ?? '';
+    this.lineNumber = this.parseLineNumber(parts[2]);
   }
 }
 export class NamedCredentialRequestLine extends LogEvent {

…-viewer/src/core/log-parser/LogEvents.ts apex-log-parser/src/LogEvents.tslog-viewer/src/core/log-parser/LogEvents.ts renamed to apex-log-parser/src/LogEvents.ts log-viewer/src/core/log-parser/LogEvents.ts renamed to apex-log-parser/src/LogEvents.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 Certinia Inc. All rights reserved.
+ */
+
+// Parser
+export { ApexLogParser, DebugLevel, parse } from './ApexLogParser.js';
+
+// Types
+export type {
+  CPUType,
+  GovernorLimits,
+  GovernorSnapshot,
+  IssueType,
+  Limits,
+  LineNumber,
+  LogEventType,
+  LogIssue,
+  LogLineConstructor,
+  LogSubCategory,
+  SelfTotal,
+} from './types.js';
+
+// Events - classes and utilities used by consumers
+export {
+  ApexLog,
+  CodeUnitStartedLine,
+  DMLBeginLine,
+  ExecutionStartedLine,
+  LogEvent,
+  MethodEntryLine,
+  SOQLExecuteBeginLine,
+  SOQLExecuteExplainLine,
+  parseObjectNamespace,
+  parseRows,
+  parseVfNamespace,
+} from './LogEvents.js';
+
+// Mapping
+export { getLogEventClass, lineTypeMap } from './LogLineMapping.js';