microsoft · sheetalkamat · Apr 13, 2023 · Apr 13, 2023
diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
@@ -1416,6 +1416,8 @@ export class TestState {
         return fileBaselines.join("\n\n");
     }
 
+    private static readonly nLinesContext = 4;
+
     private getBaselineContentForFile<T extends ts.DocumentSpan>(
         fileName: string,
         content: string,
@@ -1433,7 +1435,8 @@ export class TestState {
         }: BaselineDocumentSpansWithFileContentsOptions<T>,
         spanToContextId: Map<T, number>,
     ) {
-        let newContent = `=== ${fileName} ===\n`;
+        let readableContents = `// === ${fileName} ===`;
+        let newContent = "";
         interface Detail {
             location: number;
             locationMarker: string;
@@ -1514,6 +1517,8 @@ export class TestState {
                 }
             });
         }
+        const lineStarts = ts.computeLineStarts(content);
+        let posLineInfo: { pos: number, line: number } | undefined;
         // Our preferred way to write marker is
         // /*MARKER*/[| some text |]
         // [| some /*MARKER*/ text |]
@@ -1537,7 +1542,7 @@ export class TestState {
                 // Defer writing marker position to deffered marker index
                 if (deferredMarkerIndex !== undefined) return;
             }
-            newContent += content.slice(pos, location);
+            textWithContext(location, type);
             pos = location;
             // Prefix
             const prefix = detailPrefixes.get(detail);
@@ -1587,8 +1592,36 @@ export class TestState {
             const suffix = detailSuffixes.get(detail);
             if (suffix) newContent += suffix;
         });
-        newContent += content.slice(pos);
-        return readableJsoncBaseline(newContent);
+        textWithContext(/*location*/ undefined, /*type*/ undefined);
+        return readableContents + (newContent ? "\n" + readableJsoncBaseline(newContent) : "");
+
+        function textWithContext(location: number | undefined, type: Detail["type"]) {
+            if (!newContent && location === undefined) ts.Debug.fail("Unsupported");
+            if (type !== "textEnd" && type !== "contextEnd") {
+                // Calculate pos to location number of lines
+                const posLine = posLineInfo?.pos === pos ? posLineInfo.line : ts.computeLineOfPosition(lineStarts, pos, posLineInfo?.line);
+                const locationLine = location !== undefined ? ts.computeLineOfPosition(lineStarts, location, posLine) : lineStarts.length - 1;
+                if (location !== undefined) posLineInfo = { pos: location, line: locationLine };
+                let nLines = 0;
+                if (newContent) nLines += TestState.nLinesContext + 1;
+                if (location !== undefined) nLines += TestState.nLinesContext + 1;
+                // first nLinesContext and last nLinesContext
+                if (locationLine - posLine > nLines) {
+                    if (newContent) {
+                        readableContents = readableContents + "\n" + readableJsoncBaseline(newContent + content.slice(pos, lineStarts[posLine + TestState.nLinesContext]) +
+                            `--- (line: ${posLine + TestState.nLinesContext + 1}) skipped ---`);
+                        if (location !== undefined) readableContents += "\n";
+                        newContent = "";
+                    }
+                    if (location !== undefined) {
+                        newContent += `--- (line: ${locationLine - TestState.nLinesContext + 1}) skipped ---\n` +
+                            content.slice(lineStarts[locationLine - TestState.nLinesContext + 1], location);
+                    }
+                    return;
+                }
+            }
+            newContent += content.slice(pos, location);
+        }
     }
 
     private assertObjectsEqual<T>(fullActual: T, fullExpected: T, msgPrefix = ""): void {

diff --git a/tests/baselines/reference/cancellationWhenfindingAllRefsOnDefinition.baseline.jsonc b/tests/baselines/reference/cancellationWhenfindingAllRefsOnDefinition.baseline.jsonc
@@ -1,8 +1,6 @@
 // === findAllReferences ===
 // === /tests/cases/fourslash/findAllRefsOnDefinition-import.ts ===
-// export class Test{
-// 
-//     constructor(){
+// --- (line: 3) skipped ---
 // 
 //     }
 // 
@@ -24,9 +22,7 @@
 
   // === Definitions ===
   // === /tests/cases/fourslash/findAllRefsOnDefinition-import.ts ===
-  // export class Test{
-  // 
-  //     constructor(){
+  // --- (line: 3) skipped ---
   // 
   //     }
   // 
@@ -108,9 +104,7 @@
 
 // === findAllReferences ===
 // === /tests/cases/fourslash/findAllRefsOnDefinition-import.ts ===
-// export class Test{
-// 
-//     constructor(){
+// --- (line: 3) skipped ---
 // 
 //     }
 // 
@@ -132,9 +126,7 @@
 
   // === Definitions ===
   // === /tests/cases/fourslash/findAllRefsOnDefinition-import.ts ===
-  // export class Test{
-  // 
-  //     constructor(){
+  // --- (line: 3) skipped ---
   // 
   //     }
   // 

diff --git a/tests/baselines/reference/declarationMapGoToDefinition.baseline.jsonc b/tests/baselines/reference/declarationMapGoToDefinition.baseline.jsonc
@@ -6,14 +6,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /tests/cases/fourslash/server/mymodule.ts ===
 // import * as mod from "./indexdef";

diff --git a/tests/baselines/reference/declarationMapsEnableMapping_NoInline.baseline.jsonc b/tests/baselines/reference/declarationMapsEnableMapping_NoInline.baseline.jsonc
@@ -6,14 +6,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -32,14 +25,7 @@
 
 // === goToType ===
 // === /index.ts ===
-// export class Foo {
-//     member: string;
-//     methodName(propName: SomeType): SomeType { return propName; }
-//     otherMethod() {
-//         if (Math.random() > 0.5) {
-//             return {x: 42};
-//         }
-//         return {y: "yes"};
+// --- (line: 8) skipped ---
 //     }
 // }
 // 
@@ -72,14 +58,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -106,14 +85,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";

diff --git a/tests/baselines/reference/declarationMapsEnableMapping_NoInlineSources.baseline.jsonc b/tests/baselines/reference/declarationMapsEnableMapping_NoInlineSources.baseline.jsonc
@@ -6,14 +6,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -32,14 +25,7 @@
 
 // === goToType ===
 // === /index.ts ===
-// export class Foo {
-//     member: string;
-//     methodName(propName: SomeType): SomeType { return propName; }
-//     otherMethod() {
-//         if (Math.random() > 0.5) {
-//             return {x: 42};
-//         }
-//         return {y: "yes"};
+// --- (line: 8) skipped ---
 //     }
 // }
 // 
@@ -72,14 +58,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -106,14 +85,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";

diff --git a/tests/baselines/reference/declarationMapsGeneratedMapsEnableMapping.baseline.jsonc b/tests/baselines/reference/declarationMapsGeneratedMapsEnableMapping.baseline.jsonc
@@ -6,14 +6,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -32,14 +25,7 @@
 
 // === goToType ===
 // === /index.ts ===
-// export class Foo {
-//     member: string;
-//     methodName(propName: SomeType): SomeType { return propName; }
-//     otherMethod() {
-//         if (Math.random() > 0.5) {
-//             return {x: 42};
-//         }
-//         return {y: "yes"};
+// --- (line: 8) skipped ---
 //     }
 // }
 // 
@@ -72,14 +58,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -106,14 +85,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";

diff --git a/tests/baselines/reference/declarationMapsGeneratedMapsEnableMapping2.baseline.jsonc b/tests/baselines/reference/declarationMapsGeneratedMapsEnableMapping2.baseline.jsonc
@@ -6,14 +6,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -32,14 +25,7 @@
 
 // === goToType ===
 // === /index.ts ===
-// export class Foo {
-//     member: string;
-//     methodName(propName: SomeType): SomeType { return propName; }
-//     otherMethod() {
-//         if (Math.random() > 0.5) {
-//             return {x: 42};
-//         }
-//         return {y: "yes"};
+// --- (line: 8) skipped ---
 //     }
 // }
 // 
@@ -72,14 +58,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";
@@ -106,14 +85,7 @@
 //     otherMethod() {
 //         if (Math.random() > 0.5) {
 //             return {x: 42};
-//         }
-//         return {y: "yes"};
-//     }
-// }
-// 
-// export interface SomeType {
-//     member: number;
-// }
+// --- (line: 7) skipped ---
 
 // === /mymodule.ts ===
 // import * as mod from "/dist/index";