Skip to content

Commit ae5c275

Browse files
authored
Fix up relative path names in baseline header diffs (#1035)
1 parent 386eee9 commit ae5c275

File tree

35 files changed

+57
-562
lines changed

35 files changed

+57
-562
lines changed

internal/testrunner/compiler_runner.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,25 @@ func (c *compilerTest) verifyDiagnostics(t *testing.T, suiteName string, isSubmo
344344
Subfolder: suiteName,
345345
IsSubmodule: isSubmodule,
346346
IsSubmoduleAccepted: c.containsUnsupportedOptions(),
347+
DiffFixupOld: func(old string) string {
348+
var sb strings.Builder
349+
sb.Grow(len(old))
350+
351+
for line := range strings.SplitSeq(old, "\n") {
352+
const (
353+
relativePrefixNew = "==== "
354+
relativePrefixOld = relativePrefixNew + "./"
355+
)
356+
if rest, ok := strings.CutPrefix(line, relativePrefixOld); ok {
357+
line = relativePrefixNew + rest
358+
}
359+
360+
sb.WriteString(line)
361+
sb.WriteString("\n")
362+
}
363+
364+
return sb.String()[:sb.Len()-1]
365+
},
347366
})
348367
})
349368
}

internal/testutil/tsbaseline/type_symbol_baseline.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ func DoTypeAndSymbolBaseline(
8181
}
8282
}
8383

84+
const (
85+
relativePrefixNew = "=== "
86+
relativePrefixOld = relativePrefixNew + "./"
87+
)
88+
if rest, ok := strings.CutPrefix(line, relativePrefixOld); ok {
89+
line = relativePrefixNew + rest
90+
}
91+
8492
sb.WriteString(line)
8593
sb.WriteString("\n")
8694
}

testdata/baselines/reference/submodule/compiler/computedEnumMemberSyntacticallyString2(isolatedmodules=false).errors.txt.diff

Lines changed: 0 additions & 18 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/computedEnumMemberSyntacticallyString2(isolatedmodules=true).errors.txt.diff

Lines changed: 0 additions & 18 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/decoratorMetadataTypeOnlyExport.types.diff

Lines changed: 0 additions & 17 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/decoratorMetadataTypeOnlyImport.errors.txt.diff

Lines changed: 0 additions & 18 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/decoratorMetadataTypeOnlyImport.types.diff

Lines changed: 0 additions & 17 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/enumNoInitializerFollowsNonLiteralInitializer.errors.txt.diff

Lines changed: 0 additions & 24 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/enumWithNonLiteralStringInitializer.errors.txt.diff

Lines changed: 0 additions & 25 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/isolatedModulesShadowGlobalTypeNotValue(isolatedmodules=false,verbatimmodulesyntax=true).errors.txt.diff

Lines changed: 0 additions & 38 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/isolatedModulesShadowGlobalTypeNotValue(isolatedmodules=true,verbatimmodulesyntax=false).errors.txt.diff

Lines changed: 0 additions & 38 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/isolatedModulesShadowGlobalTypeNotValue(isolatedmodules=true,verbatimmodulesyntax=true).errors.txt.diff

Lines changed: 0 additions & 38 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.errors.txt.diff

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
11
--- old.mergeSymbolReexportInterface.types
22
+++ new.mergeSymbolReexportInterface.types
3-
@@= skipped -15, +15 lines =@@
4-
>'' : ""
5-
6-
7-
-=== ./a.d.ts ===
8-
+=== a.d.ts ===
3+
@@= skipped -18, +18 lines =@@
4+
=== a.d.ts ===
95
import '.'
106
declare module '.' {
117
->'.' : typeof import("index")
128
+>'.' : typeof import(".")
139

1410
type Row2 = { a: string }
1511
>Row2 : Row2
16-
@@= skipped -14, +14 lines =@@
17-
>s : string
18-
}
12+
@@= skipped -13, +13 lines =@@
1913

20-
-=== ./index.d.ts ===
21-
+=== index.d.ts ===
14+
=== index.d.ts ===
2215
export type {Row2} from './common';
2316
->Row2 : import("common").Row2
2417
+>Row2 : import("./common").Row2
2518

26-
-=== ./common.d.ts ===
27-
+=== common.d.ts ===
28-
export interface Row2 { b: string }
29-
>b : string
19+
=== common.d.ts ===
20+
export interface Row2 { b: string }

0 commit comments

Comments
 (0)