microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 04:43:37 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

CodeReview feedback.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-10-03 15:06:04 -07:00
parent e751c34fcb
commit 422324f0af
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/services/services.ts
View File

@@ -1,4 +1,4 @@
/// <reference path="..\compiler\types.ts"/>
/// <reference path="..\compiler\types.ts"/>
/// <reference path="..\compiler\core.ts"/>
/// <reference path="..\compiler\scanner.ts"/>
/// <reference path="..\compiler\parser.ts"/>
@@ -4711,7 +4711,7 @@ module ts {
// In order to determine if the user is potentially typing something generic, we use a
// weak heuristic where we track < and > tokens. It's a weak heuristic, but should
// work well enough in practice.
var inGenericStack = 0;
var angleBracketStack = 0;
do {
token = scanner.scan();
@@ -4736,19 +4736,18 @@ module ts {
token === SyntaxKind.LessThanToken) {
// Could be the start of something generic. Keep track of that by bumping
// up the current count of generic contexts we may be in.
inGenericStack++;
angleBracketStack++;
}
else if (token === SyntaxKind.GreaterThanToken && inGenericStack > 0) {
else if (token === SyntaxKind.GreaterThanToken && angleBracketStack > 0) {
// If we think we're currently in something generic, then mark that that
// generic entity is complete.
inGenericStack--;
angleBracketStack--;
}
else if (token === SyntaxKind.AnyKeyword ||
token === SyntaxKind.StringKeyword ||
token === SyntaxKind.NumberKeyword ||
token === SyntaxKind.BooleanKeyword ||
token === SyntaxKind.VoidKeyword) {
if (inGenericStack > 0) {
token === SyntaxKind.BooleanKeyword) {
if (angleBracketStack > 0) {
// If it looks like we're could be in something generic, don't classify this
// as a keyword. We may just get overwritten by the syntactic classifier,
// causing a noisy experience for the user.