Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a880be1

Browse filesBrowse files
vladimavladima
committed
resolve merge conflicts, update tests
1 parent 031fdf1 commit a880be1
Copy full SHA for a880be1

5 files changed

+13-13Lines changed: 13 additions & 13 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/compiler/program.ts‎

Copy file name to clipboardExpand all lines: src/compiler/program.ts
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,15 +863,15 @@ namespace ts {
863863
if (importedFile && resolution.isExternalLibraryImport) {
864864
if (!isExternalModule(importedFile)) {
865865
let start = getTokenPosOfNode(file.imports[i], file)
866-
diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.File_0_is_not_a_module, importedFile.fileName));
866+
fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.File_0_is_not_a_module, importedFile.fileName));
867867
}
868868
else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) {
869869
let start = getTokenPosOfNode(file.imports[i], file)
870-
diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
870+
fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
871871
}
872872
else if (importedFile.referencedFiles.length) {
873873
let firstRef = importedFile.referencedFiles[0];
874-
diagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
874+
fileProcessingDiagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
875875
}
876876
}
877877
}
Collapse file

‎tests/baselines/reference/nodeResolution6.errors.txt‎

Copy file name to clipboardExpand all lines: tests/baselines/reference/nodeResolution6.errors.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
1+
tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
22

33

44
==== tests/cases/compiler/b.ts (0 errors) ====
@@ -11,7 +11,7 @@ tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Proper external mod
1111
==== tests/cases/compiler/node_modules/a.d.ts (1 errors) ====
1212
/// <reference path="ref.ts"/>
1313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14-
!!! error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
14+
!!! error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
1515
export declare var y;
1616

1717

Collapse file

‎tests/baselines/reference/nodeResolution8.errors.txt‎

Copy file name to clipboardExpand all lines: tests/baselines/reference/nodeResolution8.errors.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
1+
tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
22

33

44
==== tests/cases/compiler/b.ts (0 errors) ====
@@ -10,7 +10,7 @@ tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Proper extern
1010
==== tests/cases/compiler/node_modules/a/index.d.ts (1 errors) ====
1111
/// <reference path="ref.ts"/>
1212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13-
!!! error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
13+
!!! error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
1414
export declare var y;
1515

1616

Collapse file

‎tests/cases/unittests/moduleResolution.ts‎

Copy file name to clipboardExpand all lines: tests/cases/unittests/moduleResolution.ts
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module ts {
4141
let moduleFile = { name: moduleFileNameNoExt + ext }
4242
let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
4343
assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
44-
assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
44+
assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
4545

4646
let failedLookupLocations: string[] = [];
4747
let dir = getDirectoryPath(containingFileName);
@@ -80,7 +80,7 @@ module ts {
8080
let moduleFile = { name: moduleFileName };
8181
let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, packageJson, moduleFile));
8282
assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
83-
assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
83+
assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
8484
// expect three failed lookup location - attempt to load module as file with all supported extensions
8585
assert.equal(resolution.failedLookupLocations.length, 3);
8686
}
@@ -98,7 +98,7 @@ module ts {
9898
let indexFile = { name: "/a/b/foo/index.d.ts" };
9999
let resolution = nodeModuleNameResolver("./foo", containingFile.name, createModuleResolutionHost(containingFile, packageJson, indexFile));
100100
assert.equal(resolution.resolvedModule.resolvedFileName, indexFile.name);
101-
assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
101+
assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
102102
assert.deepEqual(resolution.failedLookupLocations, [
103103
"/a/b/foo.ts",
104104
"/a/b/foo.tsx",
@@ -139,15 +139,15 @@ module ts {
139139
let moduleFile = { name: "/a/b/node_modules/foo.d.ts" };
140140
let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
141141
assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
142-
assert.equal(resolution.resolvedModule.shouldBeProperExternalModule, true);
142+
assert.equal(resolution.resolvedModule.isExternalLibraryImport, true);
143143
});
144144

145145
it("load module as directory", () => {
146146
let containingFile = { name: "/a/node_modules/b/c/node_modules/d/e.ts" };
147147
let moduleFile = { name: "/a/node_modules/foo/index.d.ts" };
148148
let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
149149
assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
150-
assert.equal(resolution.resolvedModule.shouldBeProperExternalModule, true);
150+
assert.equal(resolution.resolvedModule.isExternalLibraryImport, true);
151151
assert.deepEqual(resolution.failedLookupLocations, [
152152
"/a/node_modules/b/c/node_modules/d/node_modules/foo.d.ts",
153153
"/a/node_modules/b/c/node_modules/d/node_modules/foo/package.json",
Collapse file

‎tests/cases/unittests/reuseProgramStructure.ts‎

Copy file name to clipboardExpand all lines: tests/cases/unittests/reuseProgramStructure.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ module ts {
180180
const actual = file.resolvedModules[id];
181181
assert.isTrue(actual !== undefined);
182182
assert.isTrue(expected.resolvedFileName === actual.resolvedFileName, `'resolvedFileName': expected '${expected.resolvedFileName}' to be equal to '${actual.resolvedFileName}'`);
183-
assert.isTrue(expected.shouldBeProperExternalModule === actual.shouldBeProperExternalModule, `'shouldBeProperExternalModule': expected '${expected.shouldBeProperExternalModule}' to be equal to '${actual.shouldBeProperExternalModule}'`);
183+
assert.isTrue(expected.isExternalLibraryImport === actual.isExternalLibraryImport, `'shouldBeProperExternalModule': expected '${expected.isExternalLibraryImport}' to be equal to '${actual.isExternalLibraryImport}'`);
184184
}
185185
else {
186186
assert.isTrue(file.resolvedModules[id] === undefined);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.