Package names completion

resources/liveTemplates/go.xml

@@ -24,7 +24,7 @@
   </template>
   <template description='Package declaration' name='p' toReformat='true' toShortenFQNames='true'
             value='package $NAME$'>
-    <variable alwaysStopAt='true' defaultValue='' expression='directoryName()' name='NAME'/>
+    <variable alwaysStopAt='true' defaultValue='' expression='complete()' name='NAME'/>
     <context>
       <option name='GO_FILE' value='true'/>
     </context>

resources/liveTemplates/hidden.xml

@@ -3,7 +3,7 @@
   <!-- KEYWORDS -->
   <template description='Package declaration' id='go_lang_package' name='go_lang_package' toReformat='true' toShortenFQNames='true'
             value='package $NAME$'>
-    <variable alwaysStopAt='true' defaultValue='' expression='directoryName()' name='NAME'/>
+    <variable alwaysStopAt='true' defaultValue='' expression='complete()' name='NAME'/>
     <context>
       <option name='GO' value='true'/>
     </context>

src/com/goide/completion/GoCompletionContributor.java

@@ -0,0 +1,38 @@
+package com.goide.completion;
+
+import com.goide.GoConstants;
+import com.goide.GoTypes;
+import com.goide.psi.GoPackageClause;
+import com.goide.util.GoUtil;
+import com.intellij.codeInsight.completion.CompletionContributor;
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionResultSet;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+public class GoCompletionContributor extends CompletionContributor {
+  @Override
+  public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
+    PsiElement position = parameters.getPosition();
+    if (position.getParent() instanceof GoPackageClause && position.getNode().getElementType() == GoTypes.IDENTIFIER) {
+      PsiDirectory directory = parameters.getOriginalFile().getParent();
+      Collection<String> packagesInDirectory = GoUtil.getAllPackagesInDirectory(directory);
+      for (String packageName : packagesInDirectory) {
+        result.addElement(LookupElementBuilder.create(packageName));
+      }
+
+      if (packagesInDirectory.isEmpty() && directory != null) {
+        String packageFromDirectory = FileUtil.sanitizeFileName(directory.getName());
+        if (!packageFromDirectory.isEmpty()) {
+          result.addElement(LookupElementBuilder.create(packageFromDirectory));
+        }
+      }
+      result.addElement(LookupElementBuilder.create(GoConstants.MAIN));
+    }
+  }
+}

src/com/goide/psi/GoFile.java

@@ -27,6 +27,7 @@
 import com.goide.stubs.GoFileStub;
 import com.goide.stubs.GoVarSpecStub;
 import com.goide.stubs.types.*;
+import com.goide.util.GoUtil;
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.parser.GeneratedParserUtilBase;
 import com.intellij.openapi.fileTypes.FileType;
@@ -38,7 +39,6 @@
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubTree;
 import com.intellij.psi.tree.IElementType;
@@ -203,7 +203,7 @@ public MultiMap<String, GoImportSpec> getImportMap() {
       }
       GoImportString string = spec.getImportString();
       PsiDirectory dir = string.resolve();
-      final Collection<String> packagesInDirectory = getAllPackagesInDirectory(dir);
+      Collection<String> packagesInDirectory = GoUtil.getAllPackagesInDirectory(dir);
       if (!packagesInDirectory.isEmpty()) {
         for (String packageNames : packagesInDirectory) {
           if (!StringUtil.isEmpty(packageNames)) {
@@ -263,28 +263,6 @@ public Result<List<GoConstDefinition>> compute() {
     });
   }
 
-  private static Collection<String> getAllPackagesInDirectory(@Nullable final PsiDirectory dir) {
-    if (dir == null) {
-      return Collections.emptyList();
-    }
-    return CachedValuesManager.getCachedValue(dir, new CachedValueProvider<Collection<String>>() {
-      @Nullable
-      @Override
-      public Result<Collection<String>> compute() {
-        Collection<String> set = ContainerUtil.newLinkedHashSet();
-        for (PsiFile file : dir.getFiles()) {
-          if (file instanceof GoFile) {
-            String name = ((GoFile)file).getPackageName();
-            if (name != null && !GoConstants.MAIN.equals(name)) {
-              set.add(StringUtil.trimEnd(name, GoConstants.TEST_SUFFIX));
-            }
-          }
-        }
-        return Result.create(set, dir);
-      }
-    });
-  }
-
   @NotNull
   private List<GoTypeSpec> calcTypes() {
     final List<GoTypeSpec> result = ContainerUtil.newArrayList();

src/com/goide/util/GoUtil.java

@@ -33,15 +33,20 @@
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.CharSequenceHashingStrategy;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -158,4 +163,27 @@ public static boolean couldBeReferenceTo(@NotNull PsiElement definition, @NotNul
     }
     return true;
   }
+
+  @NotNull
+  public static Collection<String> getAllPackagesInDirectory(@Nullable final PsiDirectory dir) {
+    if (dir == null) {
+      return Collections.emptyList();
+    }
+    return CachedValuesManager.getCachedValue(dir, new CachedValueProvider<Collection<String>>() {
+      @Nullable
+      @Override
+      public Result<Collection<String>> compute() {
+        Collection<String> set = ContainerUtil.newLinkedHashSet();
+        for (PsiFile file : dir.getFiles()) {
+          if (file instanceof GoFile) {
+            String name = ((GoFile)file).getPackageName();
+            if (name != null && !GoConstants.MAIN.equals(name)) {
+              set.add(StringUtil.trimEnd(name, GoConstants.TEST_SUFFIX));
+            }
+          }
+        }
+        return Result.create(set, dir);
+      }
+    });
+  }
 }

testData/completion/packageKeywordInEmptyFile_after.go

@@ -1 +1 @@
-package src<caret>
+package <caret>

testData/completion/packageKeyword_after.go

@@ -1,4 +1,4 @@
-package src<caret>
+package <caret>
 
 func main() {
 

tests/com/goide/completion/GoCompletionTest.java

@@ -16,16 +16,19 @@
 
 package com.goide.completion;
 
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.TreePrintCondition;
 import com.intellij.util.containers.ContainerUtil;
 
+import java.io.IOException;
 import java.util.List;
 
 public class GoCompletionTest extends GoCompletionTestBase {
   public void testPackageWithoutAlias() {
     doTestInclude("package foo; import `fmt`; func main(){<caret>}", "fmt");
   }
-  
+
   public void testLocalFunction() {
     doTestInclude("package foo; func foo() {}; func main() {<caret>}", "foo", "main");
   }
@@ -90,7 +93,7 @@ public void testBlockKeywords() {
     myFixture.testCompletionVariants(getTestName(true) + ".go", "for", "const", "var", "return", "if", "switch", "go", "defer", "select",
                                      "fallthrough", "goto", "main");
   }
-  
+
   public void testBlockKeywordsInsideOneLineFunction() {
     myFixture.testCompletionVariants(getTestName(true) + ".go", "for", "const", "var", "return", "if", "switch", "go", "defer", "select",
                                      "fallthrough", "goto", "main");
@@ -152,15 +155,15 @@ public void testMapKeywordInsertHandler() {
   public void testMapKeywordInsertHandlerDoNotInsertBrackets() {
     doTestCompletion();
   }
-  
+
   public void testElseKeyword() {
     doTestCompletion();
   }
-  
+
   public void testElseKeywordRegression() {
     doTestEmptyCompletion();
   }
-  
+
   public void testIfKeywordAfterElse() {
     doTestCompletion();
   }
@@ -180,7 +183,7 @@ public void testFunctionInGo() {
   public void testPackageKeyword() {
     doTestCompletion();
   }
-  
+
   public void testPackageKeywordInEmptyFile() {
     doTestCompletion();
   }
@@ -219,7 +222,7 @@ public void testReceiverCompletion() {
   public void testInterfaceTypesNoStruct() {
     doTestExclude("package foo; type E struct {}; type B interface {<caret>}", "E");
   }
-  
+
   public void testOnlyTypesInParameters() {
     doTestExclude("package foo; const a int = 1; var b = 2; func main(<caret>) {}", "a", "b", "main");
   }
@@ -243,15 +246,15 @@ public void testInterfaceType2() {
   public void testLabel() {
     doTestInclude("package foo; func main() { goto <caret>; Label1: 1}", "Label1");
   }
-  
+
   public void testNoMainAnymore() {
     doTestEquals("package foo; func ma<caret> { }");
   }
-  
+
   public void testNoChanOrMap() {
     doTestEquals("package foo; func ma(f int.<caret>) { }");
   }
-  
+
   public void testOnTopLevel() {
     doTestEquals("package foo; func ma() { }\n<caret>", "var", "const", "func", "type");
   }
@@ -282,7 +285,7 @@ public void testNoDuplicates() {
     assertSize(1, ContainerUtil.filter(stringList, new TreePrintCondition.Include("a")));
   }
 
-  public void testTypeCastAsVar() throws Exception {
+  public void testTypeCastAsVar() {
     doTestInclude("package main\n" +
                   "var fooVar int = 1\n" +
                   "func main() {\n" +
@@ -291,20 +294,39 @@ public void testTypeCastAsVar() throws Exception {
                   "}", "fooVar");
   }
 
-  public void testStructConstructions() throws Exception {
-    doCheckResult("package main; func main() {WaitGr<caret>}; type WaitGroup struct {sema *uint32}", 
+  public void testStructConstructions() {
+    doCheckResult("package main; func main() {WaitGr<caret>}; type WaitGroup struct {sema *uint32}",
                   "package main; func main() {WaitGroup{<caret>}}; type WaitGroup struct {sema *uint32}");
   }
 
-  public void testIntConversion() throws Exception {
+  public void testIntConversion() {
     doCheckResult("package main; func main() {int<caret>}; type int int",
                   "package main; func main() {int(<caret>)}; type int int");
   }
 
+  @SuppressWarnings("ConstantConditions")
+  public void testPackageNames() {
+    myFixture.configureByText("test_test.go", "package fromTest_test");
+    myFixture.configureByText("test_file.go", "package fromFile");
+    myFixture.configureByText("test.go", "package <caret>");
+    myFixture.completeBasic();
+    assertSameElements(myFixture.getLookupElementStrings(), "fromTest", "fromFile", "main");
+  }
+
+  @SuppressWarnings("ConstantConditions")
+  public void testPackageNamesInEmptyDirectory() throws IOException {
+    VirtualFile dir = myFixture.getTempDirFixture().findOrCreateDir("directory-name");
+    VirtualFile file = dir.createChildData(this, "test.go");
+    VfsUtil.saveText(file, "package <caret>");
+    myFixture.configureFromExistingVirtualFile(file);
+    myFixture.completeBasic();
+    assertSameElements(myFixture.getLookupElementStrings(), "directory_name", "main");
+  }
+
   private void doTestCompletion() {
     myFixture.testCompletion(getTestName(true) + ".go", getTestName(true) + "_after.go");
   }
-  
+
   private void doTestEmptyCompletion() {
     myFixture.testCompletionVariants(getTestName(true) + ".go");
   }