Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit873c1df

Browse files
committed
Add es6 target
1 parentbdac6ca commit873c1df

27 files changed

+602
-20
lines changed

‎src/compiler/commandLineParser.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ module ts {
102102
{
103103
name:"target",
104104
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,
107107
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
109109
},
110110
{
111111
name:"version",

‎src/compiler/diagnosticInformationMap.generated.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ module ts {
357357
Watch_input_files:{code:6005,category:DiagnosticCategory.Message,key:"Watch input files."},
358358
Redirect_output_structure_to_the_directory:{code:6006,category:DiagnosticCategory.Message,key:"Redirect output structure to the directory."},
359359
Do_not_emit_comments_to_output:{code:6009,category:DiagnosticCategory.Message,key:"Do not emit comments to output."},
360-
Specify_ECMAScript_target_version_Colon_ES3_default_or_ES5:{code:6015,category:DiagnosticCategory.Message,key:"Specify ECMAScript target version: 'ES3' (default), or 'ES5'"},
360+
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)"},
361361
Specify_module_code_generation_Colon_commonjs_or_amd:{code:6016,category:DiagnosticCategory.Message,key:"Specify module code generation: 'commonjs' or 'amd'"},
362362
Print_this_message:{code:6017,category:DiagnosticCategory.Message,key:"Print this message."},
363363
Print_the_compiler_s_version:{code:6019,category:DiagnosticCategory.Message,key:"Print the compiler's version."},
@@ -379,7 +379,7 @@ module ts {
379379
Compiler_option_0_expects_an_argument:{code:6044,category:DiagnosticCategory.Error,key:"Compiler option '{0}' expects an argument."},
380380
Unterminated_quoted_string_in_response_file_0:{code:6045,category:DiagnosticCategory.Error,key:"Unterminated quoted string in response file '{0}'."},
381381
Argument_for_module_option_must_be_commonjs_or_amd:{code:6046,category:DiagnosticCategory.Error,key:"Argument for '--module' option must be 'commonjs' or 'amd'."},
382-
Argument_for_target_option_must_be_es3_or_es5:{code:6047,category:DiagnosticCategory.Error,key:"Argument for '--target' option must be 'es3'or 'es5'."},
382+
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'."},
383383
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}'."},
384384
Unsupported_locale_0:{code:6049,category:DiagnosticCategory.Error,key:"Unsupported locale '{0}'."},
385385
Unable_to_open_file_0:{code:6050,category:DiagnosticCategory.Error,key:"Unable to open file '{0}'."},

‎src/compiler/diagnosticMessages.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@
14241424
"category":"Message",
14251425
"code":6009
14261426
},
1427-
"Specify ECMAScript target version: 'ES3' (default), or 'ES5'": {
1427+
"Specify ECMAScript target version: 'ES3' (default),'ES5',or 'ES6' (experimental)": {
14281428
"category":"Message",
14291429
"code":6015
14301430
},
@@ -1512,7 +1512,7 @@
15121512
"category":"Error",
15131513
"code":6046
15141514
},
1515-
"Argument for '--target' option must be 'es3'or 'es5'.": {
1515+
"Argument for '--target' option must be 'es3', 'es5',or 'es6'.": {
15161516
"category":"Error",
15171517
"code":6047
15181518
},

‎src/compiler/types.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,8 @@ module ts {
10621062
exportenumScriptTarget{
10631063
ES3,
10641064
ES5,
1065+
ES6,
1066+
Latest=ES6,
10651067
}
10661068

10671069
exportinterfaceParsedCommandLine{

‎src/harness/fourslash.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2139,7 +2139,7 @@ module FourSlash {
21392139
varhost=Harness.Compiler.createCompilerHost([{unitName:Harness.Compiler.fourslashFilename,content:undefined},
21402140
{unitName:fileName,content:content}],
21412141
(fn,contents)=>result=contents,
2142-
ts.ScriptTarget.ES5,
2142+
ts.ScriptTarget.Latest,
21432143
sys.useCaseSensitiveFileNames);
21442144
varprogram=ts.createProgram([Harness.Compiler.fourslashFilename,fileName],{out:"fourslashTestOutput.js"},host);
21452145
varchecker=ts.createTypeChecker(program,/*fullTypeCheckMode*/true);

‎src/harness/harness.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ module Harness {
532532
}
533533

534534
exportvardefaultLibFileName='lib.d.ts';
535-
exportvardefaultLibSourceFile=ts.createSourceFile(defaultLibFileName,IO.readFile(libFolder+'lib.core.d.ts'),/*languageVersion*/ts.ScriptTarget.ES5,/*version:*/"0");
535+
exportvardefaultLibSourceFile=ts.createSourceFile(defaultLibFileName,IO.readFile(libFolder+'lib.core.d.ts'),/*languageVersion*/ts.ScriptTarget.Latest,/*version:*/"0");
536536

537537
// Cache these between executions so we don't have to re-parse them for every test
538538
exportvarfourslashFilename='fourslash.ts';
@@ -685,6 +685,8 @@ module Harness {
685685
options.target=ts.ScriptTarget.ES3;
686686
}elseif(setting.value.toLowerCase()==='es5'){
687687
options.target=ts.ScriptTarget.ES5;
688+
}elseif(setting.value.toLowerCase()==='es6'){
689+
options.target=ts.ScriptTarget.ES6;
688690
}else{
689691
thrownewError('Unknown compile target '+setting.value);
690692
}

‎src/harness/harnessLanguageService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ module Harness.LanguageService {
260260

261261
/** Parse file given its source text */
262262
publicparseSourceText(fileName:string,sourceText:TypeScript.IScriptSnapshot):TypeScript.SourceUnitSyntax{
263-
returnTypeScript.Parser.parse(fileName,TypeScript.SimpleText.fromScriptSnapshot(sourceText),ts.ScriptTarget.ES5,TypeScript.isDTSFile(fileName)).sourceUnit();
263+
returnTypeScript.Parser.parse(fileName,TypeScript.SimpleText.fromScriptSnapshot(sourceText),ts.ScriptTarget.Latest,TypeScript.isDTSFile(fileName)).sourceUnit();
264264
}
265265

266266
/** Parse a file on disk given its fileName */

‎src/services/compiler/precompile.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ module TypeScript {
184184

185185
exportfunctionpreProcessFile(fileName:string,sourceText:IScriptSnapshot,readImportFiles=true):IPreProcessedFileInfo{
186186
vartext=SimpleText.fromScriptSnapshot(sourceText);
187-
varscanner=Scanner.createScanner(ts.ScriptTarget.ES5,text,reportDiagnostic);
187+
varscanner=Scanner.createScanner(ts.ScriptTarget.Latest,text,reportDiagnostic);
188188

189189
varfirstToken=scanner.scan(/*allowRegularExpression:*/false);
190190

‎src/services/services.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module ts {
7777
update(scriptSnapshot:TypeScript.IScriptSnapshot,version:string,isOpen:boolean,textChangeRange:TypeScript.TextChangeRange):SourceFile;
7878
}
7979

80-
varscanner:Scanner=createScanner(ScriptTarget.ES5,/*skipTrivia*/true);
80+
varscanner:Scanner=createScanner(ScriptTarget.Latest,/*skipTrivia*/true);
8181

8282
varemptyArray:any[]=[];
8383

@@ -1456,9 +1456,9 @@ module ts {
14561456
}
14571457

14581458
exportfunctiongetDefaultCompilerOptions():CompilerOptions{
1459-
// Set "ES5" target by default for language service
1459+
// Set "ScriptTarget.Latest" target by default for language service
14601460
return{
1461-
target:ScriptTarget.ES5,
1461+
target:ScriptTarget.Latest,
14621462
module:ModuleKind.None,
14631463
};
14641464
}
@@ -3794,8 +3794,8 @@ module ts {
37943794
// before and after it have to be a non-identifier char).
37953795
varendPosition=position+symbolNameLength;
37963796

3797-
if((position===0||!isIdentifierPart(text.charCodeAt(position-1),ScriptTarget.ES5))&&
3798-
(endPosition===sourceLength||!isIdentifierPart(text.charCodeAt(endPosition),ScriptTarget.ES5))){
3797+
if((position===0||!isIdentifierPart(text.charCodeAt(position-1),ScriptTarget.Latest))&&
3798+
(endPosition===sourceLength||!isIdentifierPart(text.charCodeAt(endPosition),ScriptTarget.Latest))){
37993799
// Found a real match. Keep searching.
38003800
positions.push(position);
38013801
}
@@ -5217,7 +5217,7 @@ module ts {
52175217

52185218
/// Classifier
52195219
exportfunctioncreateClassifier(host:Logger):Classifier{
5220-
varscanner=createScanner(ScriptTarget.ES5,/*skipTrivia*/false);
5220+
varscanner=createScanner(ScriptTarget.Latest,/*skipTrivia*/false);
52215221

52225222
/// We do not have a full parser support to know when we should parse a regex or not
52235223
/// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where

‎src/services/shims.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ module ts {
174174
exportenumLanguageVersion{
175175
EcmaScript3=0,
176176
EcmaScript5=1,
177+
EcmaScript6=2,
177178
}
178179

179180
exportenumModuleGenTarget{
@@ -213,6 +214,7 @@ module ts {
213214
switch(languageVersion){
214215
caseLanguageVersion.EcmaScript3:returnScriptTarget.ES3
215216
caseLanguageVersion.EcmaScript5:returnScriptTarget.ES5;
217+
caseLanguageVersion.EcmaScript6:returnScriptTarget.ES6;
216218
default:throwError("unsupported LanguageVersion value: "+languageVersion);
217219
}
218220
}
@@ -234,6 +236,7 @@ module ts {
234236
switch(scriptTarget){
235237
caseScriptTarget.ES3:returnLanguageVersion.EcmaScript3;
236238
caseScriptTarget.ES5:returnLanguageVersion.EcmaScript5;
239+
caseScriptTarget.ES6:returnLanguageVersion.EcmaScript6;
237240
default:throwError("unsupported ScriptTarget value: "+scriptTarget);
238241
}
239242
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp