Ensure comments before // @filename are not part of the following virtual test file (microsoft#57579)

Author: andrewbranch

src/harness/harnessIO.ts

@@ -1232,6 +1232,10 @@ export namespace TestCaseParser {
                 else {
                     // First metadata marker in the file
                     currentFileName = testMetaData[2].trim();
+                    if (currentFileContent && ts.skipTrivia(currentFileContent, 0, /*stopAfterLineBreak*/ false, /*stopAtComments*/ false) !== currentFileContent.length) {
+                        throw new Error("Non-comment test content appears before the first '// @Filename' directive");
+                    }
+                    currentFileContent = "";
                 }
             }
             else {

tests/baselines/reference/blockScopedNamespaceDifferentFile.js

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/blockScopedNamespaceDifferentFile.ts] ////
 
 //// [test.ts]
-// #15734 failed when test.ts comes before typings.d.ts
 namespace C {
     export class Name {
         static funcData = A.AA.func();
@@ -21,7 +20,6 @@ declare namespace A {
 
 
 //// [out.js]
-// #15734 failed when test.ts comes before typings.d.ts
 var C;
 (function (C) {
     var Name = /** @class */ (function () {

tests/baselines/reference/blockScopedNamespaceDifferentFile.symbols

@@ -1,31 +1,30 @@
 //// [tests/cases/compiler/blockScopedNamespaceDifferentFile.ts] ////
 
 === test.ts ===
-// #15734 failed when test.ts comes before typings.d.ts
 namespace C {
 >C : Symbol(C, Decl(test.ts, 0, 0))
 
     export class Name {
->Name : Symbol(Name, Decl(test.ts, 1, 13))
+>Name : Symbol(Name, Decl(test.ts, 0, 13))
 
         static funcData = A.AA.func();
->funcData : Symbol(Name.funcData, Decl(test.ts, 2, 23))
+>funcData : Symbol(Name.funcData, Decl(test.ts, 1, 23))
 >A.AA.func : Symbol(A.AA.func, Decl(typings.d.ts, 1, 18))
 >A.AA : Symbol(A.AA, Decl(typings.d.ts, 0, 21))
 >A : Symbol(A, Decl(typings.d.ts, 0, 0))
 >AA : Symbol(A.AA, Decl(typings.d.ts, 0, 21))
 >func : Symbol(A.AA.func, Decl(typings.d.ts, 1, 18))
 
         static someConst = A.AA.foo;
->someConst : Symbol(Name.someConst, Decl(test.ts, 3, 38))
+>someConst : Symbol(Name.someConst, Decl(test.ts, 2, 38))
 >A.AA.foo : Symbol(A.AA.foo, Decl(typings.d.ts, 3, 13))
 >A.AA : Symbol(A.AA, Decl(typings.d.ts, 0, 21))
 >A : Symbol(A, Decl(typings.d.ts, 0, 0))
 >AA : Symbol(A.AA, Decl(typings.d.ts, 0, 21))
 >foo : Symbol(A.AA.foo, Decl(typings.d.ts, 3, 13))
 
         constructor(parameters) {}
->parameters : Symbol(parameters, Decl(test.ts, 6, 20))
+>parameters : Symbol(parameters, Decl(test.ts, 5, 20))
     }
 }
 

tests/baselines/reference/blockScopedNamespaceDifferentFile.types

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/blockScopedNamespaceDifferentFile.ts] ////
 
 === test.ts ===
-// #15734 failed when test.ts comes before typings.d.ts
 namespace C {
 >C : typeof C
 

tests/baselines/reference/commonJSReexport.symbols

@@ -12,19 +12,17 @@ hardline
 >hardline : Symbol(hardline, Decl(main.js, 0, 7))
 
 === first.js ===
-// #41422, based on prettier's exports
-
 const hardline = { type: "hard" }
->hardline : Symbol(hardline, Decl(first.js, 2, 5))
->type : Symbol(type, Decl(first.js, 2, 18))
+>hardline : Symbol(hardline, Decl(first.js, 0, 5))
+>type : Symbol(type, Decl(first.js, 0, 18))
 
 module.exports = {
 >module.exports : Symbol(module.exports, Decl(first.js, 0, 0))
->module : Symbol(module, Decl(first.js, 2, 33))
+>module : Symbol(module, Decl(first.js, 0, 33))
 >exports : Symbol(module.exports, Decl(first.js, 0, 0))
 
   hardline
->hardline : Symbol(hardline, Decl(first.js, 3, 18))
+>hardline : Symbol(hardline, Decl(first.js, 1, 18))
 }
 
 

tests/baselines/reference/commonJSReexport.types

@@ -13,8 +13,6 @@ hardline
 >hardline : { type: string; }
 
 === first.js ===
-// #41422, based on prettier's exports
-
 const hardline = { type: "hard" }
 >hardline : { type: string; }
 >{ type: "hard" } : { type: string; }

tests/baselines/reference/commonJsImportBindingElementNarrowType.symbols

@@ -14,9 +14,6 @@ if (a) {
 >a : Symbol(a, Decl(bar.js, 0, 7))
 }
 === /foo.d.ts ===
-// Regresion test for GH#41957
-
-
 export const a: number | null;
->a : Symbol(a, Decl(foo.d.ts, 3, 12))
+>a : Symbol(a, Decl(foo.d.ts, 0, 12))
 

tests/baselines/reference/commonJsImportBindingElementNarrowType.types

@@ -17,9 +17,6 @@ if (a) {
 >1 : 1
 }
 === /foo.d.ts ===
-// Regresion test for GH#41957
-
-
 export const a: number | null;
 >a : number | null
 

tests/baselines/reference/commonSourceDirectory.js

@@ -1,8 +1,6 @@
 //// [tests/cases/compiler/commonSourceDirectory.ts] ////
 
 //// [index.ts]
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 export const x = 0;
 
 //// [bar.d.ts]

tests/baselines/reference/commonSourceDirectory.js.map

@@ -13,10 +13,8 @@ x + y;
 >y : Symbol(y, Decl(index.ts, 2, 8))
 
 === /node_modules/foo/index.ts ===
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 export const x = 0;
->x : Symbol(x, Decl(index.ts, 2, 12))
+>x : Symbol(x, Decl(index.ts, 0, 12))
 
 === /types/bar.d.ts ===
 declare module "bar" {

tests/baselines/reference/commonSourceDirectory.symbols

@@ -14,8 +14,6 @@ x + y;
 >y : 0
 
 === /node_modules/foo/index.ts ===
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 export const x = 0;
 >x : 0
 >0 : 0

tests/baselines/reference/commonSourceDirectory.types

@@ -1,8 +1,6 @@
 //// [tests/cases/compiler/commonSourceDirectory_dts.ts] ////
 
 //// [bar.d.ts]
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 declare const y: number;
 
 //// [index.ts]

tests/baselines/reference/commonSourceDirectory_dts.js

@@ -1,14 +1,12 @@
 //// [tests/cases/compiler/commonSourceDirectory_dts.ts] ////
 
 === /app/lib/bar.d.ts ===
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 declare const y: number;
->y : Symbol(y, Decl(bar.d.ts, 2, 13))
+>y : Symbol(y, Decl(bar.d.ts, 0, 13))
 
 === /app/src/index.ts ===
 /// <reference path="../lib/bar.d.ts" />
 export const x = y;
 >x : Symbol(x, Decl(index.ts, 1, 12))
->y : Symbol(y, Decl(bar.d.ts, 2, 13))
+>y : Symbol(y, Decl(bar.d.ts, 0, 13))
 

tests/baselines/reference/commonSourceDirectory_dts.symbols

@@ -1,8 +1,6 @@
 //// [tests/cases/compiler/commonSourceDirectory_dts.ts] ////
 
 === /app/lib/bar.d.ts ===
-// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
-
 declare const y: number;
 >y : number
 

tests/baselines/reference/commonSourceDirectory_dts.types

@@ -3,8 +3,6 @@ error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserv
 
 !!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 ==== /node_modules/dep/package.json (0 errors) ====
-    // This documents bug https://github.com/microsoft/TypeScript/issues/50762.
-    
     {
       "name": "dep",
       "version": "1.0.0",

tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=bundler).errors.txt

@@ -3,8 +3,6 @@ error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolut
 
 !!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 ==== /node_modules/dep/package.json (0 errors) ====
-    // This documents bug https://github.com/microsoft/TypeScript/issues/50762.
-    
     {
       "name": "dep",
       "version": "1.0.0",

tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=node16).errors.txt

@@ -3,8 +3,6 @@ error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResol
 
 !!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
 ==== /node_modules/dep/package.json (0 errors) ====
-    // This documents bug https://github.com/microsoft/TypeScript/issues/50762.
-    
     {
       "name": "dep",
       "version": "1.0.0",

tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=nodenext).errors.txt

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/decoratorReferenceOnOtherProperty.ts] ////
 
 //// [yoha.ts]
-// https://github.com/Microsoft/TypeScript/issues/19799
 export class Yoha {}
 
 //// [index.ts]
@@ -28,7 +27,6 @@ class Bar {
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Yoha = void 0;
-// https://github.com/Microsoft/TypeScript/issues/19799
 var Yoha = /** @class */ (function () {
     function Yoha() {
     }

tests/baselines/reference/decoratorReferenceOnOtherProperty.js

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/decoratorReferenceOnOtherProperty.ts] ////
 
 === yoha.ts ===
-// https://github.com/Microsoft/TypeScript/issues/19799
 export class Yoha {}
 >Yoha : Symbol(Yoha, Decl(yoha.ts, 0, 0))
 

tests/baselines/reference/decoratorReferenceOnOtherProperty.symbols

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/decoratorReferenceOnOtherProperty.ts] ////
 
 === yoha.ts ===
-// https://github.com/Microsoft/TypeScript/issues/19799
 export class Yoha {}
 >Yoha : Yoha
 

tests/baselines/reference/decoratorReferenceOnOtherProperty.types

@@ -1,6 +1,6 @@
 //// [tests/cases/compiler/doNotEmitPinnedCommentOnNotEmittedNode.ts] ////
 
-//// [file1.ts]
+//// [doNotEmitPinnedCommentOnNotEmittedNode.ts]
 class C {
     /*! remove pinned comment anywhere else */
     public foo(x: string, y: any)
@@ -12,7 +12,7 @@ var x = 10;
 /*! remove pinned comment anywhere else */
 declare var OData: any;
 
-//// [file1.js]
+//// [doNotEmitPinnedCommentOnNotEmittedNode.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js

@@ -1,25 +1,25 @@
 //// [tests/cases/compiler/doNotEmitPinnedCommentOnNotEmittedNode.ts] ////
 
-=== file1.ts ===
+=== doNotEmitPinnedCommentOnNotEmittedNode.ts ===
 class C {
->C : Symbol(C, Decl(file1.ts, 0, 0))
+>C : Symbol(C, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 0, 0))
 
     /*! remove pinned comment anywhere else */
     public foo(x: string, y: any)
->foo : Symbol(C.foo, Decl(file1.ts, 0, 9), Decl(file1.ts, 2, 33))
->x : Symbol(x, Decl(file1.ts, 2, 15))
->y : Symbol(y, Decl(file1.ts, 2, 25))
+>foo : Symbol(C.foo, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 0, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 2, 33))
+>x : Symbol(x, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 2, 15))
+>y : Symbol(y, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 2, 25))
 
     public foo(x: string, y: number) { }
->foo : Symbol(C.foo, Decl(file1.ts, 0, 9), Decl(file1.ts, 2, 33))
->x : Symbol(x, Decl(file1.ts, 3, 15))
->y : Symbol(y, Decl(file1.ts, 3, 25))
+>foo : Symbol(C.foo, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 0, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 2, 33))
+>x : Symbol(x, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 3, 15))
+>y : Symbol(y, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 3, 25))
 }
 
 var x = 10;
->x : Symbol(x, Decl(file1.ts, 6, 3))
+>x : Symbol(x, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 6, 3))
 
 /*! remove pinned comment anywhere else */
 declare var OData: any;
->OData : Symbol(OData, Decl(file1.ts, 9, 11))
+>OData : Symbol(OData, Decl(doNotEmitPinnedCommentOnNotEmittedNode.ts, 9, 11))
 

tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.symbols

@@ -1,6 +1,6 @@
 //// [tests/cases/compiler/doNotEmitPinnedCommentOnNotEmittedNode.ts] ////
 
-=== file1.ts ===
+=== doNotEmitPinnedCommentOnNotEmittedNode.ts ===
 class C {
 >C : C
 

tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.types

@@ -1,17 +1,16 @@
-duplicateIdentifierEnum_A.ts(2,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(5,7): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(9,11): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(12,12): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(16,12): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(19,10): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(23,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-duplicateIdentifierEnum_A.ts(26,7): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(1,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(4,7): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(8,11): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(11,12): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(15,12): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(18,10): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(22,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
+duplicateIdentifierEnum_A.ts(25,7): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
 duplicateIdentifierEnum_B.ts(1,10): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
 duplicateIdentifierEnum_B.ts(4,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations.
 
 
 ==== duplicateIdentifierEnum_A.ts (8 errors) ====
-    // Test the error message when attempting to merge an enum with a class, an interface, or a function.
     enum A {
          ~
 !!! error TS2567: Enum declarations can only merge with namespace or other enum declarations.
@@ -62,12 +61,12 @@ duplicateIdentifierEnum_B.ts(4,6): error TS2567: Enum declarations can only merg
     function D() {
              ~
 !!! error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-!!! related TS6203 duplicateIdentifierEnum_A.ts:23:6: 'D' was also declared here.
+!!! related TS6203 duplicateIdentifierEnum_A.ts:22:6: 'D' was also declared here.
         return 0;
     }
     enum E {
          ~
 !!! error TS2567: Enum declarations can only merge with namespace or other enum declarations.
-!!! related TS6203 duplicateIdentifierEnum_A.ts:26:7: 'E' was also declared here.
+!!! related TS6203 duplicateIdentifierEnum_A.ts:25:7: 'E' was also declared here.
         bar
     }

tests/baselines/reference/duplicateIdentifierEnum.errors.txt

@@ -1,7 +1,6 @@
 //// [tests/cases/compiler/duplicateIdentifierEnum.ts] ////
 
 //// [duplicateIdentifierEnum_A.ts]
-// Test the error message when attempting to merge an enum with a class, an interface, or a function.
 enum A {
     bar
 }
@@ -39,7 +38,6 @@ enum E {
 }
 
 //// [duplicateIdentifierEnum_A.js]
-// Test the error message when attempting to merge an enum with a class, an interface, or a function.
 var A;
 (function (A) {
     A[A["bar"] = 0] = "bar";