Update LKG

microsoft · Dec 5, 2016 · 409311f · 409311f
1 parent e15166a
commit 409311f
Show file tree

Hide file tree

Showing 9 changed files with 447 additions and 393 deletions.
diff --git a/lib/tsc.js b/lib/tsc.js
diff --git a/lib/tsserver.js b/lib/tsserver.js
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
@@ -2820,6 +2820,7 @@ declare namespace ts {
         UnionOrIntersection = 196608,
         StructuredType = 229376,
         StructuredOrTypeParameter = 507904,
+        TypeVariable = 540672,
         Narrowable = 1033215,
         NotUnionOrUnit = 33281,
         RequiresWidening = 6291456,
@@ -2889,7 +2890,8 @@ declare namespace ts {
     interface UnionOrIntersectionType extends Type {
         types: Type[];
         resolvedProperties: SymbolTable;
-        couldContainTypeParameters: boolean;
+        resolvedIndexType: IndexType;
+        couldContainTypeVariables: boolean;
     }
     interface UnionType extends UnionOrIntersectionType {
     }
@@ -2926,21 +2928,23 @@ declare namespace ts {
         iterableElementType?: Type;
         iteratorElementType?: Type;
     }
-    interface TypeParameter extends Type {
+    interface TypeVariable extends Type {
+        resolvedIndexType: IndexType;
+    }
+    interface TypeParameter extends TypeVariable {
         constraint: Type;
         target?: TypeParameter;
         mapper?: TypeMapper;
         resolvedApparentType: Type;
-        resolvedIndexType: IndexType;
         isThisType?: boolean;
     }
-    interface IndexType extends Type {
-        type: TypeParameter;
-    }
-    interface IndexedAccessType extends Type {
+    interface IndexedAccessType extends TypeVariable {
         objectType: Type;
         indexType: Type;
     }
+    interface IndexType extends Type {
+        type: TypeVariable | UnionOrIntersectionType;
+    }
     const enum SignatureKind {
         Call = 0,
         Construct = 1,
@@ -7530,7 +7534,7 @@ declare namespace ts {
             key: string;
             message: string;
         };
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: {
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_or_ESNEXT: {
             code: number;
             category: DiagnosticCategory;
             key: string;

diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
@@ -1775,6 +1775,7 @@ declare namespace ts {
         UnionOrIntersection = 196608,
         StructuredType = 229376,
         StructuredOrTypeParameter = 507904,
+        TypeVariable = 540672,
         Narrowable = 1033215,
         NotUnionOrUnit = 33281,
     }
@@ -1844,16 +1845,18 @@ declare namespace ts {
         elementType: Type;
         finalArrayType?: Type;
     }
-    interface TypeParameter extends Type {
-        constraint: Type;
+    interface TypeVariable extends Type {
     }
-    interface IndexType extends Type {
-        type: TypeParameter;
+    interface TypeParameter extends TypeVariable {
+        constraint: Type;
     }
-    interface IndexedAccessType extends Type {
+    interface IndexedAccessType extends TypeVariable {
         objectType: Type;
         indexType: Type;
     }
+    interface IndexType extends Type {
+        type: TypeVariable | UnionOrIntersectionType;
+    }
     enum SignatureKind {
         Call = 0,
         Construct = 1,

diff --git a/lib/typescript.js b/lib/typescript.js
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
@@ -1775,6 +1775,7 @@ declare namespace ts {
         UnionOrIntersection = 196608,
         StructuredType = 229376,
         StructuredOrTypeParameter = 507904,
+        TypeVariable = 540672,
         Narrowable = 1033215,
         NotUnionOrUnit = 33281,
     }
@@ -1844,16 +1845,18 @@ declare namespace ts {
         elementType: Type;
         finalArrayType?: Type;
     }
-    interface TypeParameter extends Type {
-        constraint: Type;
+    interface TypeVariable extends Type {
     }
-    interface IndexType extends Type {
-        type: TypeParameter;
+    interface TypeParameter extends TypeVariable {
+        constraint: Type;
     }
-    interface IndexedAccessType extends Type {
+    interface IndexedAccessType extends TypeVariable {
         objectType: Type;
         indexType: Type;
     }
+    interface IndexType extends Type {
+        type: TypeVariable | UnionOrIntersectionType;
+    }
     enum SignatureKind {
         Call = 0,
         Construct = 1,

diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -3034,7 +3034,7 @@ var ts;
         Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
         Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
         Skip_type_checking_of_declaration_files: { code: 6012, category: ts.DiagnosticCategory.Message, key: "Skip_type_checking_of_declaration_files_6012", message: "Skip type checking of declaration files." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_or_ESNEXT: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_or_ESNEXT_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'" },
         Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
         Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
@@ -5043,7 +5043,7 @@ var ts;
                 "es2017": 4,
                 "esnext": 5,
             }),
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_or_ESNEXT,
             paramType: ts.Diagnostics.VERSION,
         },
         {