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

Commite508bf7

Browse files
committed
Add symbol keyword
1 parent95af997 commite508bf7

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

‎src/compiler/checker.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9751,6 +9751,7 @@ module ts {
97519751
case SyntaxKind.NumberKeyword:
97529752
case SyntaxKind.StringKeyword:
97539753
case SyntaxKind.BooleanKeyword:
9754+
case SyntaxKind.SymbolKeyword:
97549755
return true;
97559756
case SyntaxKind.VoidKeyword:
97569757
return node.parent.kind !== SyntaxKind.VoidExpression;
@@ -10529,7 +10530,7 @@ module ts {
1052910530
return grammarErrorOnNode(parameter.name, Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
1053010531
}
1053110532
if (parameter.type.kind !== SyntaxKind.StringKeyword && parameter.type.kind !== SyntaxKind.NumberKeyword) {
10532-
if (isESSymbolTypeNode(parameter.type)) {
10533+
if (parameter.type.kind === SyntaxKind.SymbolKeyword) {
1053310534
if (languageVersion < ScriptTarget.ES6) {
1053410535
return grammarErrorOnNode(parameter.type, Diagnostics.Symbol_indexers_are_only_available_when_targeting_ECMAScript_6_and_higher);
1053510536
}

‎src/compiler/emitter.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ module ts {
579579
caseSyntaxKind.StringKeyword:
580580
caseSyntaxKind.NumberKeyword:
581581
caseSyntaxKind.BooleanKeyword:
582+
caseSyntaxKind.SymbolKeyword:
582583
caseSyntaxKind.VoidKeyword:
583584
caseSyntaxKind.StringLiteral:
584585
returnwriteTextOfNode(currentSourceFile,type);

‎src/compiler/parser.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,6 +2515,7 @@ module ts {
25152515
caseSyntaxKind.StringKeyword:
25162516
caseSyntaxKind.NumberKeyword:
25172517
caseSyntaxKind.BooleanKeyword:
2518+
caseSyntaxKind.SymbolKeyword:
25182519
// If these are followed by a dot, then parse these out as a dotted type reference instead.
25192520
varnode=tryParse(parseKeywordAndNoDot);
25202521
returnnode||parseTypeReference();
@@ -2539,6 +2540,7 @@ module ts {
25392540
caseSyntaxKind.StringKeyword:
25402541
caseSyntaxKind.NumberKeyword:
25412542
caseSyntaxKind.BooleanKeyword:
2543+
caseSyntaxKind.SymbolKeyword:
25422544
caseSyntaxKind.VoidKeyword:
25432545
caseSyntaxKind.TypeOfKeyword:
25442546
caseSyntaxKind.OpenBraceToken:

‎src/compiler/scanner.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ module ts {
8282
"string":SyntaxKind.StringKeyword,
8383
"super":SyntaxKind.SuperKeyword,
8484
"switch":SyntaxKind.SwitchKeyword,
85+
"symbol":SyntaxKind.SymbolKeyword,
8586
"this":SyntaxKind.ThisKeyword,
8687
"throw":SyntaxKind.ThrowKeyword,
8788
"true":SyntaxKind.TrueKeyword,

‎src/compiler/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ module ts {
140140
NumberKeyword,
141141
SetKeyword,
142142
StringKeyword,
143+
SymbolKeyword,
143144
TypeKeyword,
144145

145146
// Parse tree nodes

‎src/compiler/utilities.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -852,12 +852,6 @@ module ts {
852852
returnnode.kind===SyntaxKind.PropertyAccessExpression&&isESSymbolIdentifier((<PropertyAccessExpression>node).expression);
853853
}
854854

855-
exportfunctionisESSymbolTypeNode(node:Node):boolean{
856-
returnnode.kind===SyntaxKind.TypeReference&&
857-
(<TypeReferenceNode>node).typeArguments===undefined&&
858-
isESSymbolIdentifier((<TypeReferenceNode>node).typeName);
859-
}
860-
861855
/**
862856
* Includes the word "Symbol" with unicode escapes
863857
*/

‎src/services/formatting/tokenRange.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ module ts.formatting {
134134
staticUnaryPredecrementExpressions=TokenRange.FromTokens([SyntaxKind.Identifier,SyntaxKind.OpenParenToken,SyntaxKind.ThisKeyword,SyntaxKind.NewKeyword]);
135135
staticUnaryPostdecrementExpressions=TokenRange.FromTokens([SyntaxKind.Identifier,SyntaxKind.CloseParenToken,SyntaxKind.CloseBracketToken,SyntaxKind.NewKeyword]);
136136
staticComments=TokenRange.FromTokens([SyntaxKind.SingleLineCommentTrivia,SyntaxKind.MultiLineCommentTrivia]);
137-
staticTypeNames=TokenRange.FromTokens([SyntaxKind.Identifier,SyntaxKind.NumberKeyword,SyntaxKind.StringKeyword,SyntaxKind.BooleanKeyword,SyntaxKind.VoidKeyword,SyntaxKind.AnyKeyword]);
137+
staticTypeNames=TokenRange.FromTokens([SyntaxKind.Identifier,SyntaxKind.NumberKeyword,SyntaxKind.StringKeyword,SyntaxKind.BooleanKeyword,SyntaxKind.SymbolKeyword,SyntaxKind.VoidKeyword,SyntaxKind.AnyKeyword]);
138138
}
139139
}
140140
}

‎src/services/services.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5754,7 +5754,8 @@ module ts {
57545754
elseif(token===SyntaxKind.AnyKeyword||
57555755
token===SyntaxKind.StringKeyword||
57565756
token===SyntaxKind.NumberKeyword||
5757-
token===SyntaxKind.BooleanKeyword){
5757+
token===SyntaxKind.BooleanKeyword||
5758+
token===SyntaxKind.SymbolKeyword){
57585759
if(angleBracketStack>0&&!classifyKeywordsInGenerics){
57595760
// If it looks like we're could be in something generic, don't classify this
57605761
// as a keyword. We may just get overwritten by the syntactic classifier,

0 commit comments

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