Merge pull request microsoft#5019 from RyanCavanaugh/fix4731

RyanCavanaugh · RyanCavanaugh · commit a4db4be4b6b3 · 2015-09-30T13:11:09.000-07:00
Issue correct completions in 'as' operator
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -3662,9 +3662,9 @@ namespace ts {
                         return containingNodeKind === SyntaxKind.Parameter;
 
                     case SyntaxKind.AsKeyword:
-                        containingNodeKind === SyntaxKind.ImportSpecifier ||
-                        containingNodeKind === SyntaxKind.ExportSpecifier ||
-                        containingNodeKind === SyntaxKind.NamespaceImport;
+                        return containingNodeKind === SyntaxKind.ImportSpecifier ||
+                            containingNodeKind === SyntaxKind.ExportSpecifier ||
+                            containingNodeKind === SyntaxKind.NamespaceImport;
 
                     case SyntaxKind.ClassKeyword:
                     case SyntaxKind.EnumKeyword:
@@ -7814,6 +7814,7 @@ namespace ts {
                 case SyntaxKind.GreaterThanEqualsToken:
                 case SyntaxKind.InstanceOfKeyword:
                 case SyntaxKind.InKeyword:
+                case SyntaxKind.AsKeyword:
                 case SyntaxKind.EqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
diff --git a/tests/cases/fourslash/asOperatorCompletion.ts b/tests/cases/fourslash/asOperatorCompletion.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+//// type T = number;
+//// var x;
+//// var y = x as /**/
+
+goTo.marker();
+verify.completionListContains('T');
