Skip to content

Commit d7944c6

Browse files
andrewbranchandrewbranch
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.",

‎tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extensi
5050
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
5151
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
5252
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
53-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
54-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
55-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
56-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
5753
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
5854
======== Module name './fileB.mjs' was not resolved. ========
5955
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 0 undefined Failed Lookup Locations
@@ -169,10 +165,6 @@ File '/user/username/projects/myproject/src/fileB.mjs.tsx' does not exist.
169165
File '/user/username/projects/myproject/src/fileB.mjs.d.ts' does not exist.
170166
File '/user/username/projects/myproject/src/fileB.mjs.js' does not exist.
171167
File '/user/username/projects/myproject/src/fileB.mjs.jsx' does not exist.
172-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
173-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
174-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
175-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
176168
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
177169
======== Module name './fileB.mjs' was not resolved. ========
178170
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/fileB.mjs 1 undefined Failed Lookup Locations
@@ -276,10 +268,6 @@ File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extensi
276268
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
277269
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
278270
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
279-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
280-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
281-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
282-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
283271
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
284272
======== Module name './fileB.mjs' was not resolved. ========
285273
File '/a/lib/package.json' does not exist according to earlier cached lookups.
@@ -390,10 +378,6 @@ File '/user/username/projects/myproject/src/fileB.mjs.tsx' does not exist.
390378
File '/user/username/projects/myproject/src/fileB.mjs.d.ts' does not exist.
391379
File '/user/username/projects/myproject/src/fileB.mjs.js' does not exist.
392380
File '/user/username/projects/myproject/src/fileB.mjs.jsx' does not exist.
393-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
394-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
395-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
396-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
397381
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
398382
======== Module name './fileB.mjs' was not resolved. ========
399383
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/fileB.mjs 1 undefined Failed Lookup Locations

‎tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ File '/user/username/projects/myproject/src/fileB.mjs.tsx' does not exist.
5555
File '/user/username/projects/myproject/src/fileB.mjs.d.ts' does not exist.
5656
File '/user/username/projects/myproject/src/fileB.mjs.js' does not exist.
5757
File '/user/username/projects/myproject/src/fileB.mjs.jsx' does not exist.
58-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
59-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
60-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
61-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
6258
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
6359
======== Module name './fileB.mjs' was not resolved. ========
6460
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/fileB.mjs 1 undefined Failed Lookup Locations
@@ -175,10 +171,6 @@ File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extensi
175171
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
176172
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
177173
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
178-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
179-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
180-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
181-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
182174
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
183175
======== Module name './fileB.mjs' was not resolved. ========
184176
File '/a/lib/package.json' does not exist according to earlier cached lookups.
@@ -283,10 +275,6 @@ File '/user/username/projects/myproject/src/fileB.mjs.tsx' does not exist.
283275
File '/user/username/projects/myproject/src/fileB.mjs.d.ts' does not exist.
284276
File '/user/username/projects/myproject/src/fileB.mjs.js' does not exist.
285277
File '/user/username/projects/myproject/src/fileB.mjs.jsx' does not exist.
286-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
287-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
288-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
289-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
290278
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
291279
======== Module name './fileB.mjs' was not resolved. ========
292280
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/fileB.mjs 1 undefined Failed Lookup Locations
@@ -482,10 +470,6 @@ File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extensi
482470
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
483471
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
484472
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
485-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
486-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
487-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
488-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
489473
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
490474
======== Module name './fileB.mjs' was not resolved. ========
491475
File '/a/lib/package.json' does not exist according to earlier cached lookups.
@@ -597,10 +581,6 @@ File '/user/username/projects/myproject/src/fileB.mjs.tsx' does not exist.
597581
File '/user/username/projects/myproject/src/fileB.mjs.d.ts' does not exist.
598582
File '/user/username/projects/myproject/src/fileB.mjs.js' does not exist.
599583
File '/user/username/projects/myproject/src/fileB.mjs.jsx' does not exist.
600-
File name '/user/username/projects/myproject/src/fileB.mjs' has a '.mjs' extension - stripping it.
601-
File '/user/username/projects/myproject/src/fileB.mts' does not exist.
602-
File '/user/username/projects/myproject/src/fileB.d.mts' does not exist.
603-
File '/user/username/projects/myproject/src/fileB.mjs' does not exist.
604584
Directory '/user/username/projects/myproject/src/fileB.mjs' does not exist, skipping all lookups in it.
605585
======== Module name './fileB.mjs' was not resolved. ========
606586
DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/fileB.mjs 1 undefined Failed Lookup Locations

0 commit comments

Comments
 (0)