Minor cleanup for label completions (microsoft#20502)

Andy · web-flow · commit 06aeab8f311b · 2017-12-06T08:34:54.000-08:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -40,8 +40,9 @@ namespace ts.Completions {
         }
 
         const contextToken = findPrecedingToken(position, sourceFile);
-        if (isInBreakOrContinue(contextToken)) {
-            return getLabelCompletionAtPosition(contextToken);
+        if (contextToken && isBreakOrContinueStatement(contextToken.parent)
+            && (contextToken.kind === SyntaxKind.BreakKeyword || contextToken.kind === SyntaxKind.ContinueKeyword || contextToken.kind === SyntaxKind.Identifier)) {
+            return getLabelCompletionAtPosition(contextToken.parent);
         }
 
         const completionData = getCompletionData(typeChecker, log, sourceFile, position, allSourceFiles, options, compilerOptions.target);
@@ -228,13 +229,8 @@ namespace ts.Completions {
         return uniques;
     }
 
-    function isInBreakOrContinue(contextToken: Node): boolean {
-        return contextToken && isBreakOrContinueStatement(contextToken.parent) &&
-            (contextToken.kind === SyntaxKind.BreakKeyword || contextToken.kind === SyntaxKind.ContinueKeyword || contextToken.kind === SyntaxKind.Identifier);
-    }
-
-    function getLabelCompletionAtPosition(contextToken: Node): CompletionInfo | undefined {
-        const entries = getLabelStatementCompletions(contextToken.parent);
+    function getLabelCompletionAtPosition(node: BreakOrContinueStatement): CompletionInfo | undefined {
+        const entries = getLabelStatementCompletions(node);
         if (entries.length) {
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries };
         }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,9 @@ namespace ts.Completions {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`const contextToken = findPrecedingToken(position, sourceFile);`
`43`		`- if (isInBreakOrContinue(contextToken)) {`
`44`		`- return getLabelCompletionAtPosition(contextToken);`
	`43`	`+ if (contextToken && isBreakOrContinueStatement(contextToken.parent)`
	`44`	`+ && (contextToken.kind === SyntaxKind.BreakKeyword \|\| contextToken.kind === SyntaxKind.ContinueKeyword \|\| contextToken.kind === SyntaxKind.Identifier)) {`
	`45`	`+ return getLabelCompletionAtPosition(contextToken.parent);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`const completionData = getCompletionData(typeChecker, log, sourceFile, position, allSourceFiles, options, compilerOptions.target);`
`@@ -228,13 +229,8 @@ namespace ts.Completions {`
`228`	`229`	`return uniques;`
`229`	`230`	`}`
`230`	`231`
`231`		`- function isInBreakOrContinue(contextToken: Node): boolean {`
`232`		`- return contextToken && isBreakOrContinueStatement(contextToken.parent) &&`
`233`		`- (contextToken.kind === SyntaxKind.BreakKeyword \|\| contextToken.kind === SyntaxKind.ContinueKeyword \|\| contextToken.kind === SyntaxKind.Identifier);`
`234`		`- }`
`235`		`-`
`236`		`- function getLabelCompletionAtPosition(contextToken: Node): CompletionInfo \| undefined {`
`237`		`- const entries = getLabelStatementCompletions(contextToken.parent);`
	`232`	`+ function getLabelCompletionAtPosition(node: BreakOrContinueStatement): CompletionInfo \| undefined {`
	`233`	`+ const entries = getLabelStatementCompletions(node);`
`238`	`234`	`if (entries.length) {`
`239`	`235`	`return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries };`
`240`	`236`	`}`