Skip to content

Commit d7944c6

Browse files
committed
Fix bad merge conflict resolution
1 parent e4096f8 commit d7944c6

12 files changed

+1
-64
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,8 +1755,6 @@ function loadModuleFromFile(extensions: Extensions, candidate: string, onlyRecor
17551755
return resolvedByAddingExtension;
17561756
}
17571757
}
1758-
1759-
return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
17601758
}
17611759

17621760
function loadModuleFromFileNoImplicitExtensions(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PathAndExtension | undefined {

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7224,7 +7224,7 @@ export interface ResolvedModule {
72247224
* True if the original module reference used a .ts extension to refer directly to a .ts file,
72257225
* which should produce an error during checking if emit is enabled.
72267226
*/
7227-
resolvedUsingTsExtension: boolean;
7227+
resolvedUsingTsExtension?: boolean;
72287228
}
72297229

72307230
/**

src/testRunner/unittests/moduleResolution.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ describe("unittests:: moduleResolution:: Node module resolution - non-relative p
169169
resolvedFileName: "/sub/node_modules/a/index.ts",
170170
isExternalLibraryImport: true,
171171
extension: ts.Extension.Ts,
172-
resolvedUsingTsExtension: false,
173172
},
174173
failedLookupLocations: [],
175174
affectingLocations: [],
@@ -185,7 +184,6 @@ describe("unittests:: moduleResolution:: Node module resolution - non-relative p
185184
resolvedFileName: "/sub/directory/node_modules/b/index.ts",
186185
isExternalLibraryImport: true,
187186
extension: ts.Extension.Ts,
188-
resolvedUsingTsExtension: false,
189187
},
190188
failedLookupLocations: [],
191189
affectingLocations: [],
@@ -203,7 +201,6 @@ describe("unittests:: moduleResolution:: Node module resolution - non-relative p
203201
resolvedFileName: "/bar/node_modules/c/index.ts",
204202
isExternalLibraryImport: true,
205203
extension: ts.Extension.Ts,
206-
resolvedUsingTsExtension: false,
207204
},
208205
failedLookupLocations: [],
209206
affectingLocations: [],
@@ -220,7 +217,6 @@ describe("unittests:: moduleResolution:: Node module resolution - non-relative p
220217
resolvedFileName: "/foo/index.ts",
221218
isExternalLibraryImport: true,
222219
extension: ts.Extension.Ts,
223-
resolvedUsingTsExtension: false,
224220
},
225221
failedLookupLocations: [],
226222
affectingLocations: [],
@@ -236,7 +232,6 @@ describe("unittests:: moduleResolution:: Node module resolution - non-relative p
236232
resolvedFileName: "d:/bar/node_modules/e/index.ts",
237233
isExternalLibraryImport: true,
238234
extension: ts.Extension.Ts,
239-
resolvedUsingTsExtension: false,
240235
},
241236
failedLookupLocations: [],
242237
affectingLocations: [],

tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=false,noemit=false).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=false,noemit=true).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=true,noemit=false).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

tests/baselines/reference/hybridImportTsExtensions(allowimportingtsextensions=true,noemit=true).trace.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"File '/project/a.d.ts.d.ts' does not exist.",
9797
"File '/project/a.d.ts.js' does not exist.",
9898
"File '/project/a.d.ts.jsx' does not exist.",
99-
"File name '/project/a.d.ts' has a '.d.ts' extension - stripping it.",
100-
"File '/project/a.d.ts' does not exist.",
10199
"Directory '/project/a.d.ts' does not exist, skipping all lookups in it.",
102100
"======== Module name './a.d.ts' was not resolved. ========"
103101
]

tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
"File '/node_modules/foo/foo.js.ts' does not exist.",
2020
"File '/node_modules/foo/foo.js.tsx' does not exist.",
2121
"File '/node_modules/foo/foo.js.d.ts' does not exist.",
22-
"File name '/node_modules/foo/foo.js' has a '.js' extension - stripping it.",
23-
"File '/node_modules/foo/foo.ts' does not exist.",
24-
"File '/node_modules/foo/foo.tsx' does not exist.",
25-
"File '/node_modules/foo/foo.d.ts' does not exist.",
2622
"Directory '/node_modules/foo/foo.js' does not exist, skipping all lookups in it.",
2723
"File '/node_modules/foo/index.ts' does not exist.",
2824
"File '/node_modules/foo/index.tsx' does not exist.",

tests/baselines/reference/moduleResolutionWithSuffixes_one_jsModule.trace.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
"File '/foo.js.ios.ts' does not exist.",
1010
"File '/foo.js.ios.tsx' does not exist.",
1111
"File '/foo.js.ios.d.ts' does not exist.",
12-
"File name '/foo.js' has a '.js' extension - stripping it.",
13-
"File '/foo.ios.ts' does not exist.",
14-
"File '/foo.ios.tsx' does not exist.",
15-
"File '/foo.ios.d.ts' does not exist.",
1612
"Directory '/foo.js' does not exist, skipping all lookups in it.",
1713
"Loading module as file / folder, candidate module location '/foo.js', target file types: JavaScript.",
1814
"File name '/foo.js' has a '.js' extension - stripping it.",

tests/baselines/reference/packageJsonMain.trace.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
"File '/node_modules/bar/rab.js.ts' does not exist.",
5252
"File '/node_modules/bar/rab.js.tsx' does not exist.",
5353
"File '/node_modules/bar/rab.js.d.ts' does not exist.",
54-
"File name '/node_modules/bar/rab.js' has a '.js' extension - stripping it.",
55-
"File '/node_modules/bar/rab.ts' does not exist.",
56-
"File '/node_modules/bar/rab.tsx' does not exist.",
57-
"File '/node_modules/bar/rab.d.ts' does not exist.",
5854
"Directory '/node_modules/bar/rab.js' does not exist, skipping all lookups in it.",
5955
"File '/node_modules/bar/index.ts' does not exist.",
6056
"File '/node_modules/bar/index.tsx' does not exist.",

0 commit comments

Comments
 (0)