fix *CanAppendSemicolon*

Talv · Apr 29, 2018 · f01a63d · f01a63d
1 parent 97105a2
commit f01a63d
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/service/completions.ts b/src/service/completions.ts
@@ -346,17 +346,28 @@ export class CompletionsProvider extends AbstractProvider {
                 flags &= ~CompletionItemDataFlags.CanExpand;
             }
 
-            if (position >= currentToken.end) {
-                flags |= CompletionItemDataFlags.CanAppendSemicolon;
-            }
-            else if (currentToken.parent) {
+            if (currentToken.parent) {
                 switch (currentToken.parent.kind) {
                     case gt.SyntaxKind.ExpressionStatement: {
-                        flags |= currentToken.parent.syntaxTokens.findIndex(value => value.kind === gt.SyntaxKind.SemicolonToken) === -1 ? CompletionItemDataFlags.CanAppendSemicolon : 0;
+                        if (position >= currentToken.end) {
+                            flags |= CompletionItemDataFlags.CanAppendSemicolon;
+                        }
+                        else {
+                            flags |= currentToken.parent.syntaxTokens.findIndex(value => value.kind === gt.SyntaxKind.SemicolonToken) === -1 ? CompletionItemDataFlags.CanAppendSemicolon : 0;
+                        }
+                        break;
+                    }
+                    case gt.SyntaxKind.Block:
+                    case gt.SyntaxKind.SourceFile:
+                    {
+                        if (position >= currentToken.end) {
+                            flags |= CompletionItemDataFlags.CanAppendSemicolon;
+                        }
                         break;
                     }
-                    case gt.SyntaxKind.Block: {
-                        flags |= CompletionItemDataFlags.CanAppendSemicolon;
+                    case gt.SyntaxKind.FunctionDeclaration:
+                    {
+                        flags &= ~CompletionItemDataFlags.CanExpand;
                         break;
                     }
                 }