@@ -5694,25 +5694,25 @@ module ts {
5694
5694
}
5695
5695
}
5696
5696
else if ( lastNonTriviaToken === SyntaxKind . DotToken && isKeyword ( token ) ) {
5697
- token = SyntaxKind . Identifier ;
5697
+ token = SyntaxKind . Identifier ;
5698
5698
}
5699
5699
else if ( isKeyword ( lastNonTriviaToken ) && isKeyword ( token ) && ! canFollow ( lastNonTriviaToken , token ) ) {
5700
- // We have two keywords in a row. Only treat the second as a keyword if
5701
- // it's a sequence that could legally occur in the language. Otherwise
5702
- // treat it as an identifier. This way, if someone writes "private var"
5703
- // we recognize that 'var' is actually an identifier here.
5704
- token = SyntaxKind . Identifier ;
5700
+ // We have two keywords in a row. Only treat the second as a keyword if
5701
+ // it's a sequence that could legally occur in the language. Otherwise
5702
+ // treat it as an identifier. This way, if someone writes "private var"
5703
+ // we recognize that 'var' is actually an identifier here.
5704
+ token = SyntaxKind . Identifier ;
5705
5705
}
5706
5706
else if ( lastNonTriviaToken === SyntaxKind . Identifier &&
5707
5707
token === SyntaxKind . LessThanToken ) {
5708
- // Could be the start of something generic. Keep track of that by bumping
5709
- // up the current count of generic contexts we may be in.
5710
- angleBracketStack ++ ;
5708
+ // Could be the start of something generic. Keep track of that by bumping
5709
+ // up the current count of generic contexts we may be in.
5710
+ angleBracketStack ++ ;
5711
5711
}
5712
5712
else if ( token === SyntaxKind . GreaterThanToken && angleBracketStack > 0 ) {
5713
- // If we think we're currently in something generic, then mark that that
5714
- // generic entity is complete.
5715
- angleBracketStack -- ;
5713
+ // If we think we're currently in something generic, then mark that that
5714
+ // generic entity is complete.
5715
+ angleBracketStack -- ;
5716
5716
}
5717
5717
else if ( token === SyntaxKind . AnyKeyword ||
5718
5718
token === SyntaxKind . StringKeyword ||
@@ -5873,7 +5873,8 @@ module ts {
5873
5873
case SyntaxKind . EqualsToken :
5874
5874
case SyntaxKind . CommaToken :
5875
5875
return true ;
5876
- default : return false ;
5876
+ default :
5877
+ return false ;
5877
5878
}
5878
5879
}
5879
5880
@@ -5918,6 +5919,7 @@ module ts {
5918
5919
case SyntaxKind . SingleLineCommentTrivia :
5919
5920
return TokenClass . Comment ;
5920
5921
case SyntaxKind . WhitespaceTrivia :
5922
+ case SyntaxKind . NewLineTrivia :
5921
5923
return TokenClass . Whitespace ;
5922
5924
case SyntaxKind . Identifier :
5923
5925
default :
0 commit comments