Skip to content

fix absolute paths in baselines #9710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vladima merged 1 commit into from
Jul 13, 2016
Merged

fix absolute paths in baselines #9710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/baselines/reference/relativeModuleWithoutSlash.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
=== tests/cases/compiler/a.ts ===
=== /a.ts ===

export default { a: 0 };
>a : Symbol(a, Decl(a.ts, 1, 16))

=== tests/cases/compiler/a/index.ts ===
=== /a/index.ts ===
export default { aIndex: 0 };
>aIndex : Symbol(aIndex, Decl(index.ts, 0, 16))

=== tests/cases/compiler/a/test.ts ===
=== /a/test.ts ===
import a from ".";
>a : Symbol(a, Decl(test.ts, 0, 6))

Expand All @@ -24,7 +24,7 @@ aIndex.a; //aIndex.aIndex; See GH#9690
>aIndex : Symbol(aIndex, Decl(test.ts, 1, 6))
>a : Symbol(a, Decl(a.ts, 1, 16))

=== tests/cases/compiler/a/b/test.ts ===
=== /a/b/test.ts ===
import a from "..";
>a : Symbol(a, Decl(test.ts, 0, 6))

Expand Down
40 changes: 20 additions & 20 deletions tests/baselines/reference/relativeModuleWithoutSlash.trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[
"======== Resolving module '.' from 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a/test.ts'. ========",
"======== Resolving module '.' from '/a/test.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"Loading module as file / folder, candidate module location 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a'.",
"File 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts' exist - use it as a name resolution result.",
"Resolving real path for 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts', result 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'",
"======== Module name '.' was successfully resolved to 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'. ========",
"======== Resolving module './' from 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a/test.ts'. ========",
"Loading module as file / folder, candidate module location '/a'.",
"File '/a.ts' exist - use it as a name resolution result.",
"Resolving real path for '/a.ts', result '/a.ts'",
"======== Module name '.' was successfully resolved to '/a.ts'. ========",
"======== Resolving module './' from '/a/test.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"Loading module as file / folder, candidate module location 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a'.",
"File 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts' exist - use it as a name resolution result.",
"Resolving real path for 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts', result 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'",
"======== Module name './' was successfully resolved to 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'. ========",
"======== Resolving module '..' from 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a/b/test.ts'. ========",
"Loading module as file / folder, candidate module location '/a'.",
"File '/a.ts' exist - use it as a name resolution result.",
"Resolving real path for '/a.ts', result '/a.ts'",
"======== Module name './' was successfully resolved to '/a.ts'. ========",
"======== Resolving module '..' from '/a/b/test.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"Loading module as file / folder, candidate module location 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a'.",
"File 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts' exist - use it as a name resolution result.",
"Resolving real path for 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts', result 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'",
"======== Module name '..' was successfully resolved to 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'. ========",
"======== Resolving module '../' from 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a/b/test.ts'. ========",
"Loading module as file / folder, candidate module location '/a'.",
"File '/a.ts' exist - use it as a name resolution result.",
"Resolving real path for '/a.ts', result '/a.ts'",
"======== Module name '..' was successfully resolved to '/a.ts'. ========",
"======== Resolving module '../' from '/a/b/test.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"Loading module as file / folder, candidate module location 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a'.",
"File 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts' exist - use it as a name resolution result.",
"Resolving real path for 'C:/Users/anhans/work/TypeScript/tests/cases/compiler/a.ts', result 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'",
"======== Module name '../' was successfully resolved to 'c:/users/anhans/work/typescript/tests/cases/compiler/a.ts'. ========"
"Loading module as file / folder, candidate module location '/a'.",
"File '/a.ts' exist - use it as a name resolution result.",
"Resolving real path for '/a.ts', result '/a.ts'",
"======== Module name '../' was successfully resolved to '/a.ts'. ========"
]
8 changes: 4 additions & 4 deletions tests/baselines/reference/relativeModuleWithoutSlash.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
=== tests/cases/compiler/a.ts ===
=== /a.ts ===

export default { a: 0 };
>{ a: 0 } : { a: number; }
>a : number
>0 : number

=== tests/cases/compiler/a/index.ts ===
=== /a/index.ts ===
export default { aIndex: 0 };
>{ aIndex: 0 } : { aIndex: number; }
>aIndex : number
>0 : number

=== tests/cases/compiler/a/test.ts ===
=== /a/test.ts ===
import a from ".";
>a : { a: number; }

Expand All @@ -28,7 +28,7 @@ aIndex.a; //aIndex.aIndex; See GH#9690
>aIndex : { a: number; }
>a : number

=== tests/cases/compiler/a/b/test.ts ===
=== /a/b/test.ts ===
import a from "..";
>a : { a: number; }

Expand Down
8 changes: 4 additions & 4 deletions tests/cases/compiler/relativeModuleWithoutSlash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
// @traceResolution: true
// @moduleResolution: node

// @Filename: a.ts
// @Filename: /a.ts
export default { a: 0 };

// @Filename: a/index.ts
// @Filename: /a/index.ts
export default { aIndex: 0 };

// @Filename: a/test.ts
// @Filename: /a/test.ts
import a from ".";
import aIndex from "./";
a.a;
aIndex.a; //aIndex.aIndex; See GH#9690

// @Filename: a/b/test.ts
// @Filename: /a/b/test.ts
import a from "..";
import aIndex from "../";
a.a;
Expand Down