Merge pull request microsoft#10340 from Microsoft/lower_case_types

Andy · web-flow · commit ef4fefc197c3 · 2016-08-17T06:04:14.000-07:00
Use lowercase names for type reference directives
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2010,15 +2010,16 @@ namespace ts {
         }
 
         function processTypeReferenceDirectives(file: SourceFile) {
-            const typeDirectives = map(file.typeReferenceDirectives, l => l.fileName);
+            const typeDirectives = map(file.typeReferenceDirectives, ref => ref.fileName.toLocaleLowerCase());
             const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
 
             for (let i = 0; i < typeDirectives.length; i++) {
                 const ref = file.typeReferenceDirectives[i];
                 const resolvedTypeReferenceDirective = resolutions[i];
                 // store resolved type directive on the file
-                setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
-                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+                const fileName = ref.fileName.toLocaleLowerCase();
+                setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
             }
         }
 
diff --git a/tests/baselines/reference/typingsLookup3.js b/tests/baselines/reference/typingsLookup3.js
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/typings/typingsLookup3.ts] ////
+
+//// [index.d.ts]
+declare var $: { x: any };
+
+//// [a.ts]
+/// <reference types="JqUeRy" />
+$.x;
+
+
+//// [a.js]
+/// <reference types="JqUeRy" />
+$.x;
diff --git a/tests/baselines/reference/typingsLookup3.symbols b/tests/baselines/reference/typingsLookup3.symbols
@@ -0,0 +1,12 @@
+=== /a.ts ===
+/// <reference types="JqUeRy" />
+$.x;
+>$.x : Symbol(x, Decl(index.d.ts, 0, 16))
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
+=== /node_modules/@types/jquery/index.d.ts ===
+declare var $: { x: any };
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
diff --git a/tests/baselines/reference/typingsLookup3.trace.json b/tests/baselines/reference/typingsLookup3.trace.json
@@ -0,0 +1,12 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file '/a.ts', root directory '/node_modules/@types'. ========",
+    "Resolving with primary search path '/node_modules/@types'",
+    "File '/node_modules/@types/jquery/package.json' does not exist.",
+    "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "Resolving with primary search path '/node_modules/@types'",
+    "File '/node_modules/@types/jquery/package.json' does not exist.",
+    "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========"
+]
diff --git a/tests/baselines/reference/typingsLookup3.types b/tests/baselines/reference/typingsLookup3.types
@@ -0,0 +1,12 @@
+=== /a.ts ===
+/// <reference types="JqUeRy" />
+$.x;
+>$.x : any
+>$ : { x: any; }
+>x : any
+
+=== /node_modules/@types/jquery/index.d.ts ===
+declare var $: { x: any };
+>$ : { x: any; }
+>x : any
+
diff --git a/tests/cases/conformance/typings/typingsLookup3.ts b/tests/cases/conformance/typings/typingsLookup3.ts
@@ -0,0 +1,14 @@
+// @traceResolution: true
+// @noImplicitReferences: true
+// @currentDirectory: /
+// This tests that `types` references are automatically lowercased.
+
+// @filename: /tsconfig.json
+{ "files": "a.ts" }
+
+// @filename: /node_modules/@types/jquery/index.d.ts
+declare var $: { x: any };
+
+// @filename: /a.ts
+/// <reference types="JqUeRy" />
+$.x;

Original file line number	Diff line number	Diff line change
`@@ -2010,15 +2010,16 @@ namespace ts {`
`2010`	`2010`	`}`
`2011`	`2011`
`2012`	`2012`	`function processTypeReferenceDirectives(file: SourceFile) {`
`2013`		`- const typeDirectives = map(file.typeReferenceDirectives, l => l.fileName);`
	`2013`	`+ const typeDirectives = map(file.typeReferenceDirectives, ref => ref.fileName.toLocaleLowerCase());`
`2014`	`2014`	`const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);`
`2015`	`2015`
`2016`	`2016`	`for (let i = 0; i < typeDirectives.length; i++) {`
`2017`	`2017`	`const ref = file.typeReferenceDirectives[i];`
`2018`	`2018`	`const resolvedTypeReferenceDirective = resolutions[i];`
`2019`	`2019`	`// store resolved type directive on the file`
`2020`		`- setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);`
`2021`		`- processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);`
	`2020`	`+ const fileName = ref.fileName.toLocaleLowerCase();`
	`2021`	`+ setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);`
	`2022`	`+ processTypeReferenceDirective(fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);`
`2022`	`2023`	`}`
`2023`	`2024`	`}`
`2024`	`2025`