microsoft
diff --git a/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/compiler/diagnosticInformationMap.generated.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/compiler/diagnosticInformationMap.generated.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/compiler/types.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/compiler/types.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/harness/fourslash.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/harness/fourslash.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/harness/harness.ts
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/harness/harness.ts
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/harness/harnessLanguageService.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/harness/harnessLanguageService.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/services/compiler/precompile.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/services/compiler/precompile.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/services/services.ts
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎src/services/services.ts
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎src/services/shims.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/services/shims.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
@@ -102,10 +102,10 @@ module ts {
         {
             name: "target",
             shortName: "t",
-            type: { "es3": ScriptTarget.ES3, "es5": ScriptTarget.ES5 },
-            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_or_ES5,
+            type: { "es3": ScriptTarget.ES3, "es5": ScriptTarget.ES5 , "es6": ScriptTarget.ES6 },
+            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,
             paramType: Diagnostics.VERSION,
-            error: Diagnostics.Argument_for_target_option_must_be_es3_or_es5
+            error: Diagnostics.Argument_for_target_option_must_be_es3_es5_or_es6
         },
         {
             name: "version",
 
@@ -357,7 +357,7 @@ module ts {
         Watch_input_files: { code: 6005, category: DiagnosticCategory.Message, key: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: DiagnosticCategory.Message, key: "Redirect output structure to the directory." },
         Do_not_emit_comments_to_output: { code: 6009, category: DiagnosticCategory.Message, key: "Do not emit comments to output." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_or_ES5: { code: 6015, category: DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), or 'ES5'" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental: { code: 6015, category: DiagnosticCategory.Message, key: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)" },
         Specify_module_code_generation_Colon_commonjs_or_amd: { code: 6016, category: DiagnosticCategory.Message, key: "Specify module code generation: 'commonjs' or 'amd'" },
         Print_this_message: { code: 6017, category: DiagnosticCategory.Message, key: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: DiagnosticCategory.Message, key: "Print the compiler's version." },
@@ -379,7 +379,7 @@ module ts {
         Compiler_option_0_expects_an_argument: { code: 6044, category: DiagnosticCategory.Error, key: "Compiler option '{0}' expects an argument." },
         Unterminated_quoted_string_in_response_file_0: { code: 6045, category: DiagnosticCategory.Error, key: "Unterminated quoted string in response file '{0}'." },
         Argument_for_module_option_must_be_commonjs_or_amd: { code: 6046, category: DiagnosticCategory.Error, key: "Argument for '--module' option must be 'commonjs' or 'amd'." },
-        Argument_for_target_option_must_be_es3_or_es5: { code: 6047, category: DiagnosticCategory.Error, key: "Argument for '--target' option must be 'es3' or 'es5'." },
+        Argument_for_target_option_must_be_es3_es5_or_es6: { code: 6047, category: DiagnosticCategory.Error, key: "Argument for '--target' option must be 'es3', 'es5', or 'es6'." },
         Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: DiagnosticCategory.Error, key: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
         Unsupported_locale_0: { code: 6049, category: DiagnosticCategory.Error, key: "Unsupported locale '{0}'." },
         Unable_to_open_file_0: { code: 6050, category: DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
 
@@ -1424,7 +1424,7 @@
         "category": "Message",
         "code": 6009
     },
-    "Specify ECMAScript target version: 'ES3' (default), or 'ES5'": {
+    "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES6' (experimental)": {
         "category": "Message",
         "code": 6015
     },
@@ -1512,7 +1512,7 @@
         "category": "Error",
         "code": 6046
     },
-    "Argument for '--target' option must be 'es3' or 'es5'.": {
+    "Argument for '--target' option must be 'es3', 'es5', or 'es6'.": {
         "category": "Error",
         "code": 6047
     },
 
@@ -1062,6 +1062,8 @@ module ts {
     export enum ScriptTarget {
         ES3,
         ES5,
+        ES6,
+        Latest = ES6,
     }
 
     export interface ParsedCommandLine {
 
@@ -2139,7 +2139,7 @@ module FourSlash {
         var host = Harness.Compiler.createCompilerHost([{ unitName: Harness.Compiler.fourslashFilename, content: undefined },
             { unitName: fileName, content: content }],
             (fn, contents) => result = contents,
-            ts.ScriptTarget.ES5,
+            ts.ScriptTarget.Latest,
             sys.useCaseSensitiveFileNames);
         var program = ts.createProgram([Harness.Compiler.fourslashFilename, fileName], { out: "fourslashTestOutput.js" }, host);
         var checker = ts.createTypeChecker(program, /*fullTypeCheckMode*/ true);
 
@@ -532,7 +532,7 @@ module Harness {
         }
 
         export var defaultLibFileName = 'lib.d.ts';
-        export var defaultLibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.d.ts'), /*languageVersion*/ ts.ScriptTarget.ES5, /*version:*/ "0");
+        export var defaultLibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0");
 
         // Cache these between executions so we don't have to re-parse them for every test
         export var fourslashFilename = 'fourslash.ts';
@@ -685,6 +685,8 @@ module Harness {
                                     options.target = ts.ScriptTarget.ES3;
                                 } else if (setting.value.toLowerCase() === 'es5') {
                                     options.target = ts.ScriptTarget.ES5;
+                                } else if (setting.value.toLowerCase() === 'es6') {
+                                        options.target = ts.ScriptTarget.ES6;
                                 } else {
                                     throw new Error('Unknown compile target ' + setting.value);
                                 }
 
@@ -260,7 +260,7 @@ module Harness.LanguageService {
 
         /** Parse file given its source text */
         public parseSourceText(fileName: string, sourceText: TypeScript.IScriptSnapshot): TypeScript.SourceUnitSyntax {
-            return TypeScript.Parser.parse(fileName, TypeScript.SimpleText.fromScriptSnapshot(sourceText), ts.ScriptTarget.ES5, TypeScript.isDTSFile(fileName)).sourceUnit();
+            return TypeScript.Parser.parse(fileName, TypeScript.SimpleText.fromScriptSnapshot(sourceText), ts.ScriptTarget.Latest, TypeScript.isDTSFile(fileName)).sourceUnit();
         }
 
         /** Parse a file on disk given its fileName */
 
@@ -184,7 +184,7 @@ module TypeScript {
 
     export function preProcessFile(fileName: string, sourceText: IScriptSnapshot, readImportFiles = true): IPreProcessedFileInfo {
         var text = SimpleText.fromScriptSnapshot(sourceText);
-        var scanner = Scanner.createScanner(ts.ScriptTarget.ES5, text, reportDiagnostic);
+        var scanner = Scanner.createScanner(ts.ScriptTarget.Latest, text, reportDiagnostic);
 
         var firstToken = scanner.scan(/*allowRegularExpression:*/ false);
 
 
@@ -77,7 +77,7 @@ module ts {
         update(scriptSnapshot: TypeScript.IScriptSnapshot, version: string, isOpen: boolean, textChangeRange: TypeScript.TextChangeRange): SourceFile;
     }
 
-    var scanner: Scanner = createScanner(ScriptTarget.ES5, /*skipTrivia*/ true);
+    var scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
 
     var emptyArray: any[] = [];
 
@@ -1456,9 +1456,9 @@ module ts {
     }
 
     export function getDefaultCompilerOptions(): CompilerOptions {
-        // Set "ES5" target by default for language service
+        // Set "ScriptTarget.Latest" target by default for language service
         return {
-            target: ScriptTarget.ES5,
+            target: ScriptTarget.Latest,
             module: ModuleKind.None,
         };
     }
@@ -3794,8 +3794,8 @@ module ts {
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
 
-                    if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.ES5)) &&
-                        (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.ES5))) {
+                    if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) &&
+                        (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) {
                         // Found a real match.  Keep searching.  
                         positions.push(position);
                     }
@@ -5217,7 +5217,7 @@ module ts {
 
     /// Classifier
     export function createClassifier(host: Logger): Classifier {
-        var scanner = createScanner(ScriptTarget.ES5, /*skipTrivia*/ false);
+        var scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
 
         /// We do not have a full parser support to know when we should parse a regex or not
         /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
 
@@ -174,6 +174,7 @@ module ts {
     export enum LanguageVersion {
         EcmaScript3 = 0,
         EcmaScript5 = 1,
+        EcmaScript6 = 2,
     }
 
     export enum ModuleGenTarget {
@@ -213,6 +214,7 @@ module ts {
         switch (languageVersion) {
             case LanguageVersion.EcmaScript3: return ScriptTarget.ES3
             case LanguageVersion.EcmaScript5: return ScriptTarget.ES5;
+            case LanguageVersion.EcmaScript6: return ScriptTarget.ES6;
             default: throw Error("unsupported LanguageVersion value: " + languageVersion);
         }
     }
@@ -234,6 +236,7 @@ module ts {
         switch (scriptTarget) {
             case ScriptTarget.ES3: return LanguageVersion.EcmaScript3;
             case ScriptTarget.ES5: return LanguageVersion.EcmaScript5;
+            case ScriptTarget.ES6: return LanguageVersion.EcmaScript6;
             default: throw Error("unsupported ScriptTarget value: " + scriptTarget);
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,10 @@ module ts {`
`102`	`102`	`{`
`103`	`103`	`name: "target",`
`104`	`104`	`shortName: "t",`
`105`		`- type: { "es3": ScriptTarget.ES3, "es5": ScriptTarget.ES5 },`
`106`		`- description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_or_ES5,`
	`105`	`+ type: { "es3": ScriptTarget.ES3, "es5": ScriptTarget.ES5 , "es6": ScriptTarget.ES6 },`
	`106`	`+ description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES6_experimental,`
`107`	`107`	`paramType: Diagnostics.VERSION,`
`108`		`- error: Diagnostics.Argument_for_target_option_must_be_es3_or_es5`
	`108`	`+ error: Diagnostics.Argument_for_target_option_must_be_es3_es5_or_es6`
`109`	`109`	`},`
`110`	`110`	`{`
`111`	`111`	`name: "version",`
Original file line number	Diff line number	Diff line change
`@@ -1062,6 +1062,8 @@ module ts {`
`1062`	`1062`	`export enum ScriptTarget {`
`1063`	`1063`	`ES3,`
`1064`	`1064`	`ES5,`
	`1065`	`+ ES6,`
	`1066`	`+ Latest = ES6,`
`1065`	`1067`	`}`
`1066`	`1068`
`1067`	`1069`	`export interface ParsedCommandLine {`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ module Harness.LanguageService {`
`260`	`260`
`261`	`261`	`/** Parse file given its source text */`
`262`	`262`	`public parseSourceText(fileName: string, sourceText: TypeScript.IScriptSnapshot): TypeScript.SourceUnitSyntax {`
`263`		`- return TypeScript.Parser.parse(fileName, TypeScript.SimpleText.fromScriptSnapshot(sourceText), ts.ScriptTarget.ES5, TypeScript.isDTSFile(fileName)).sourceUnit();`
	`263`	`+ return TypeScript.Parser.parse(fileName, TypeScript.SimpleText.fromScriptSnapshot(sourceText), ts.ScriptTarget.Latest, TypeScript.isDTSFile(fileName)).sourceUnit();`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`/** Parse a file on disk given its fileName */`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ module ts {`
`174`	`174`	`export enum LanguageVersion {`
`175`	`175`	`EcmaScript3 = 0,`
`176`	`176`	`EcmaScript5 = 1,`
	`177`	`+ EcmaScript6 = 2,`
`177`	`178`	`}`
`178`	`179`
`179`	`180`	`export enum ModuleGenTarget {`
`@@ -213,6 +214,7 @@ module ts {`
`213`	`214`	`switch (languageVersion) {`
`214`	`215`	`case LanguageVersion.EcmaScript3: return ScriptTarget.ES3`
`215`	`216`	`case LanguageVersion.EcmaScript5: return ScriptTarget.ES5;`
	`217`	`+ case LanguageVersion.EcmaScript6: return ScriptTarget.ES6;`
`216`	`218`	`default: throw Error("unsupported LanguageVersion value: " + languageVersion);`
`217`	`219`	`}`
`218`	`220`	`}`
`@@ -234,6 +236,7 @@ module ts {`
`234`	`236`	`switch (scriptTarget) {`
`235`	`237`	`case ScriptTarget.ES3: return LanguageVersion.EcmaScript3;`
`236`	`238`	`case ScriptTarget.ES5: return LanguageVersion.EcmaScript5;`
	`239`	`+ case ScriptTarget.ES6: return LanguageVersion.EcmaScript6;`
`237`	`240`	`default: throw Error("unsupported ScriptTarget value: " + scriptTarget);`
`238`	`241`	`}`
`239`	`242`	`}`