Complete interface and struct keywords in function parameters

Fixes #1798

Author: zolotov

src/com/goide/completion/BracesInsertHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Sergey Ignatov, Alexander Zolotov
+ * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Mihai Toader, Florin Patan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,17 +32,14 @@
 
 public class BracesInsertHandler implements InsertHandler<LookupElement> {
   public static final BracesInsertHandler ONE_LINER = new BracesInsertHandler(true);
+  public static final BracesInsertHandler INSTANCE = new BracesInsertHandler(false);
 
   private final boolean myOneLine;
 
   public BracesInsertHandler(boolean oneLine) {
     myOneLine = oneLine;
   }
 
-  public BracesInsertHandler() {
-    this(false);
-  }
-
   @Override
   public void handleInsert(InsertionContext context, LookupElement item) {
     final Editor editor = context.getEditor();

src/com/goide/completion/GoKeywordCompletionContributor.java

@@ -38,7 +38,6 @@
 import static com.intellij.patterns.StandardPatterns.*;
 
 public class GoKeywordCompletionContributor extends CompletionContributor implements DumbAware {
-  private static final BracesInsertHandler ADD_BRACES_INSERT_HANDLER = new BracesInsertHandler();
   private static final InsertHandler<LookupElement> ADD_BRACKETS_INSERT_HANDLER = new AddBracketsInsertHandler();
 
   public GoKeywordCompletionContributor() {
@@ -53,9 +52,11 @@ public GoKeywordCompletionContributor() {
     extend(CompletionType.BASIC, insideBlockPattern(GoTypes.IDENTIFIER),
            new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, EMPTY_INSERT_HANDLER, "fallthrough"));
     extend(CompletionType.BASIC, insideBlockPattern(GoTypes.IDENTIFIER),
-           new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, ADD_BRACES_INSERT_HANDLER, "select"));
+           new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, BracesInsertHandler.INSTANCE, "select"));
     extend(CompletionType.BASIC, typeDeclaration(),
-           new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, ADD_BRACES_INSERT_HANDLER, "interface", "struct"));
+           new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, BracesInsertHandler.INSTANCE, "interface", "struct"));
+    extend(CompletionType.BASIC, typeExpression(),
+           new GoKeywordCompletionProvider(GoCompletionUtil.KEYWORD_PRIORITY, BracesInsertHandler.ONE_LINER, "interface", "struct"));
     extend(CompletionType.BASIC, insideForStatement(GoTypes.IDENTIFIER),
            new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, EMPTY_INSERT_HANDLER, "break", "continue"));
     extend(CompletionType.BASIC, typeExpression(), new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, "chan"));
@@ -65,19 +66,20 @@ public GoKeywordCompletionContributor() {
     extend(CompletionType.BASIC, referenceExpression(), new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY,
                                                                                         ADD_BRACKETS_INSERT_HANDLER, "map"));
     extend(CompletionType.BASIC, referenceExpression(), new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY,
-                                                                                        ADD_BRACES_INSERT_HANDLER, "struct"));
+                                                                                        BracesInsertHandler.ONE_LINER, "struct"));
 
-    extend(CompletionType.BASIC, afterIfBlock(GoTypes.IDENTIFIER),
+    extend(CompletionType.BASIC, afterIfBlock(GoTypes.IDENTIFIER), 
            new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, "else"));
     extend(CompletionType.BASIC, afterElseKeyword(), new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, "if"));
-    extend(CompletionType.BASIC, insideSwitchStatement(), new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, "case", "default"));
+    extend(CompletionType.BASIC, insideSwitchStatement(), 
+           new GoKeywordCompletionProvider(GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, "case", "default"));
     //  todo: "range"
   }
 
   @Override
   public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
     super.fillCompletionVariants(parameters, result);
-    if (insideGoOrDeferStatements(GoTypes.IDENTIFIER).accepts(parameters.getPosition())) {
+    if (insideGoOrDeferStatements().accepts(parameters.getPosition())) {
       InsertHandler<LookupElement> insertHandler = GoKeywordCompletionProvider.createTemplateBasedInsertHandler("go_lang_anonymous_func");
       result.addElement(
         GoKeywordCompletionProvider.createKeywordLookupElement("func", GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY, insertHandler));
@@ -119,8 +121,8 @@ private static ElementPattern<? extends PsiElement> typeDeclaration() {
       .withParent(psiElement(GoTypeReferenceExpression.class).withParent(psiElement(GoType.class).withParent(GoSpecType.class)));
   }
 
-  private static PsiElementPattern.Capture<PsiElement> insideGoOrDeferStatements(@NotNull IElementType tokenType) {
-    return psiElement(tokenType)
+  private static PsiElementPattern.Capture<PsiElement> insideGoOrDeferStatements() {
+    return psiElement(GoTypes.IDENTIFIER)
       .withParent(psiElement(GoExpression.class).withParent(or(psiElement(GoDeferStatement.class), psiElement(GoGoStatement.class))));
   }
 

testData/completion/interfaceKeywordAsFunctionParameter.go

@@ -0,0 +1,4 @@
+package foo
+
+func function(interf<caret>) {
+}

testData/completion/interfaceKeywordAsFunctionParameter_after.go

@@ -0,0 +1,4 @@
+package foo
+
+func function(interface{<caret>}) {
+}

testData/completion/structKeywordAsFunctionParameter.go

@@ -0,0 +1,4 @@
+package foo
+
+func function(struc<caret>) {
+}

testData/completion/structKeywordAsFunctionParameter_after.go

@@ -0,0 +1,4 @@
+package foo
+
+func function(struct {<caret>}) {
+}

tests/com/goide/completion/GoCompletionTest.java

@@ -191,7 +191,7 @@ public void testExpressionKeywords() {
   }
 
   public void testTypeKeywordsInsideParentheses() {
-    myFixture.testCompletionVariants(getTestName(true) + ".go", "chan", "map");
+    myFixture.testCompletionVariants(getTestName(true) + ".go", "chan", "map", "interface", "struct");
   }
 
   public void testSelectKeywordInsertHandler() {
@@ -205,6 +205,14 @@ public void testTypeKeywordInsertBraces() {
   public void testTypeKeywordDoNotInsertBraces() {
     doTestCompletion();
   }
+  
+  public void testInterfaceKeywordAsFunctionParameter() {
+    doTestCompletion();
+  }
+  
+  public void testStructKeywordAsFunctionParameter() {
+    doTestCompletion();
+  }
 
   public void testForStatementKeywords() {
     myFixture.testCompletionVariants(getTestName(true) + ".go", "bar", "break", "const", "continue", "defer", "for", "go", "if", "return",
@@ -258,6 +266,10 @@ public void testForStatementKeywordsDoNotInsertSpace() {
   public void testFunctionInDefer() {
     doTestCompletion();
   }
+  
+  public void testFunctionInMethodInvocation() {
+    doTestCompletion();
+  }
 
   public void testFunctionInGo() {
     doTestCompletion();