Fix issues in code completion

ballerina-attic · Jul 21, 2017 · 8211b33 · 8211b33
1 parent b2d438a
commit 8211b33
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/org/ballerinalang/plugins/idea/BallerinaTypes.java b/src/main/java/org/ballerinalang/plugins/idea/BallerinaTypes.java
@@ -41,6 +41,7 @@ private BallerinaTypes() {
     public static final TokenIElementType IDENTIFIER = tokenIElementTypes.get(BallerinaLexer.Identifier);
     public static final TokenIElementType COMMENT_STATEMENT = tokenIElementTypes.get(BallerinaLexer.LINE_COMMENT);
     public static final TokenIElementType QUOTED_STRING = tokenIElementTypes.get(BallerinaLexer.QuotedStringLiteral);
+    public static final TokenIElementType FLOATING_POINT = tokenIElementTypes.get(BallerinaLexer.FloatingPointLiteral);
     public static final TokenIElementType INTEGER_LITERAL = tokenIElementTypes.get(BallerinaLexer.IntegerLiteral);
     public static final TokenIElementType ERRCHAR = tokenIElementTypes.get(BallerinaLexer.ERRCHAR);
     public static final TokenIElementType DOUBLE_QUOTE = tokenIElementTypes.get(BallerinaLexer.DOUBLEQUOTE);

diff --git a/src/main/java/org/ballerinalang/plugins/idea/completion/AutoImportInsertHandler.java b/src/main/java/org/ballerinalang/plugins/idea/completion/AutoImportInsertHandler.java
@@ -105,9 +105,9 @@ public void handleInsert(@NotNull InsertionContext context, @NotNull LookupEleme
                         }
                     }
                     if (myTriggerAutoPopup) {
-                        PsiDocumentManager.getInstance(project)
-                                .doPostponedOperationsAndUnblockDocument(editor.getDocument());
                         ApplicationManager.getApplication().runWriteAction(() -> {
+                            PsiDocumentManager.getInstance(project)
+                                    .doPostponedOperationsAndUnblockDocument(editor.getDocument());
                             EditorModificationUtil.insertStringAtCaret(editor, ":");
                             PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
                         });

diff --git a/...ava/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java b/...ava/org/ballerinalang/plugins/idea/completion/BallerinaKeywordsCompletionContributor.java
@@ -21,8 +21,11 @@
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiErrorElement;
+import com.intellij.psi.impl.source.tree.LeafPsiElement;
+import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode;
+import org.ballerinalang.plugins.idea.BallerinaTypes;
 import org.ballerinalang.plugins.idea.psi.AnnotationDefinitionNode;
 import org.ballerinalang.plugins.idea.psi.CallableUnitBodyNode;
 import org.ballerinalang.plugins.idea.psi.ConnectorBodyNode;
@@ -38,6 +41,7 @@
 import org.ballerinalang.plugins.idea.psi.PackageDeclarationNode;
 import org.ballerinalang.plugins.idea.psi.ResourceDefinitionNode;
 import org.ballerinalang.plugins.idea.psi.ServiceBodyNode;
+import org.ballerinalang.plugins.idea.psi.ServiceDefinitionNode;
 import org.ballerinalang.plugins.idea.psi.TypeNameNode;
 import org.jetbrains.annotations.NotNull;
 
@@ -50,6 +54,13 @@ public void fillCompletionVariants(@NotNull CompletionParameters parameters, @No
         PsiElement element = parameters.getPosition();
         PsiElement parent = element.getParent();
 
+        if (element instanceof LeafPsiElement) {
+            IElementType elementType = ((LeafPsiElement) element).getElementType();
+            if (elementType == BallerinaTypes.FLOATING_POINT) {
+                return;
+            }
+        }
+
         if (parent instanceof NameReferenceNode /*|| parent instanceof PsiErrorElement*/) {
             PsiElement prevVisibleSibling = PsiTreeUtil.prevVisibleLeaf(element);
             if (prevVisibleSibling instanceof IdentifierPSINode) {
@@ -86,8 +97,8 @@ public void fillCompletionVariants(@NotNull CompletionParameters parameters, @No
 
         if (parent instanceof PsiErrorElement) {
 
-            FunctionDefinitionNode functionDefinitionNode = PsiTreeUtil.getParentOfType(element,
-                    FunctionDefinitionNode.class);
+            PsiElement functionDefinitionNode = PsiTreeUtil.getParentOfType(element,
+                    FunctionDefinitionNode.class, ServiceDefinitionNode.class, ConnectorDefinitionNode.class);
             if (functionDefinitionNode != null) {
 
                 PsiElement prevVisibleSibling = PsiTreeUtil.prevVisibleLeaf(element);