[bugfix] fix completion/resolution for types when using the qualified…

… form. Signed-off-by: Mihai Claudiu Toader <mtoader@gmail.com>
addie9000 · Jul 31, 2012 · b43fb5f · b43fb5f
1 parent 8bd1a43
commit b43fb5f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2" url="http://github.com/mtoader/google-go-lang-idea-plugin">
     <id>ro.redeul.google.go</id>
     <name>Google Go language</name>
-    <version>0.9.3</version>
+    <version>0.9.4</version>
     <vendor email="mtoader@gmail.com" url="http://redeul.ro">mtoader@gmail.com</vendor>
     <description>
         <![CDATA[
@@ -51,6 +51,11 @@
     </description>
     <change-notes>
         <![CDATA[
+         <h3>0.9.4 changes:</h3>
+            <ul>
+                <li>[bugfix] Fix typename resolution for qualified types.</li>
+            </ul>
+
          <h3>0.9.3 changes:</h3>
             <ul>
                 <li>[feature] Added a warning about corrupt SDK inside a project.</li>

diff --git a/src/ro/redeul/google/go/lang/completion/GoCompletionContributor.java b/src/ro/redeul/google/go/lang/completion/GoCompletionContributor.java
@@ -11,6 +11,7 @@
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiErrorElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.DebugUtil;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.ProcessingContext;
@@ -31,6 +32,7 @@
 import ro.redeul.google.go.lang.psi.statements.GoExpressionStatement;
 import ro.redeul.google.go.lang.psi.statements.GoGoStatement;
 import ro.redeul.google.go.lang.psi.toplevel.GoImportDeclaration;
+import ro.redeul.google.go.lang.psi.toplevel.GoImportDeclarations;
 import ro.redeul.google.go.lang.psi.toplevel.GoPackageDeclaration;
 import ro.redeul.google.go.lang.psi.types.GoPsiTypeName;
 import ro.redeul.google.go.lang.psi.typing.GoTypes;
@@ -162,6 +164,25 @@ protected void addCompletions(@NotNull CompletionParameters params,
             }
         };
 
+    CompletionProvider<CompletionParameters> localImportsCompletion = new CompletionProvider<CompletionParameters>() {
+        @Override
+        protected void addCompletions(@NotNull CompletionParameters parameters,
+                                      ProcessingContext context,
+                                      @NotNull CompletionResultSet result) {
+            PsiFile originalFile = parameters.getOriginalFile();
+            if (!(originalFile instanceof GoFile))
+                return;
+
+            GoFile file = (GoFile) originalFile;
+
+            for (GoImportDeclarations importDecls : file.getImportDeclarations()) {
+                for (GoImportDeclaration importDecl : importDecls.getDeclarations()) {
+                    result.addElement(LookupElementBuilder.create(importDecl.getVisiblePackageName() + "."));
+                }
+            }
+        }
+    };
+
     CompletionProvider<CompletionParameters> debuggingCompletionProvider = new CompletionProvider<CompletionParameters>() {
         @Override
         protected void addCompletions(@NotNull CompletionParameters parameters,

diff --git a/src/ro/redeul/google/go/lang/psi/resolve/references/TypeNameReference.java b/src/ro/redeul/google/go/lang/psi/resolve/references/TypeNameReference.java
@@ -67,7 +67,7 @@ public boolean isReferenceTo(PsiElement element) {
                 = (GoTypeNameDeclaration) element;
 
             return matchesVisiblePackageName(typeNameDecl,
-                                             getElement().getName());
+                                             getElement().getIdentifier().getName());
         }
 
         return false;
@@ -101,6 +101,7 @@ protected boolean addDeclaration(PsiElement declaration, PsiElement childDeclara
                     variants.add(
                         createLookupElement(
                             goDeclaration,
+                            name,
                             goChildDeclaration));
                     return true;