Fix nullable values

thrift/src/main/java/com/intellij/plugins/thrift/completion/ThriftGotoDeclarationHandler.java

@@ -0,0 +1,89 @@
+package com.intellij.plugins.thrift.completion;
+
+import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.plugins.thrift.index.ThriftDeclarationIndex;
+import com.intellij.plugins.thrift.lang.psi.ThriftDeclaration;
+import com.intellij.psi.*;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.scala.lang.psi.api.base.ScReference;
+import org.jetbrains.plugins.scala.lang.resolve.ScalaResolveResult;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class ThriftGotoDeclarationHandler implements GotoDeclarationHandler {
+
+    @NotNull
+    private List<ThriftDeclaration> getThriftDeclarations(List<String> fullyQualifiedNames, Project project) {
+        return fullyQualifiedNames.stream()
+                .filter(name -> getElementName(name) != null && getPackageName(name) != null)
+                .map(name -> ThriftDeclarationIndex.findDeclaration(getElementName(name), getPackageName(name), project, GlobalSearchScope.allScope(project)))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public PsiElement @Nullable [] getGotoDeclarationTargets(@Nullable PsiElement sourceElement, int offset, Editor editor) {
+        if(sourceElement == null) {
+            return null;
+        }
+
+        PsiFile containingFile = sourceElement.getContainingFile();
+        if(containingFile == null) {
+            return null;
+        }
+        PsiReference psiReference = containingFile.findReferenceAt(sourceElement.getTextRange().getStartOffset());
+        List<String> fullyQualifiedNames = Collections.emptyList();
+
+        if (psiReference instanceof PsiJavaCodeReferenceElement) {
+            fullyQualifiedNames = Arrays.stream(((PsiJavaCodeReferenceElement) psiReference).multiResolve(/*incompleteCode = */ false))
+                    .map(ResolveResult::getElement)
+                    .filter(javaResolveResult -> javaResolveResult instanceof PsiClass)
+                    .map(javaResolveResult -> ((PsiClass) javaResolveResult).getQualifiedName())
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        } else if (psiReference instanceof ScReference){
+            fullyQualifiedNames = Stream.of(((ScReference) psiReference).multiResolveScala(/*incompleteCode = */ false))
+                    .map(ScalaResolveResult::qualifiedNameId)
+                    .filter(Objects::nonNull)
+                    .map(qualifiedName -> qualifiedName.substring(qualifiedName.lastIndexOf(":") + 1))
+                    .distinct()
+                    .collect(Collectors.toList());
+        }
+
+        if(!fullyQualifiedNames.isEmpty()) {
+            PsiElement[] thriftMatches = getThriftDeclarations(fullyQualifiedNames, sourceElement.getProject()).stream()
+                    .map(PsiElement::getNavigationElement)
+                    .toArray(PsiElement[]::new);
+            if(thriftMatches.length > 0) {
+                return thriftMatches;
+            }
+        }
+        return null;
+    }
+
+    private String getPackageName(String qualifiedName) {
+        int lastIndexOf = qualifiedName.lastIndexOf(".");
+        if(lastIndexOf >= 0) {
+            return qualifiedName.substring(0, lastIndexOf);
+        }
+        return null;
+    }
+
+    private String getElementName(String qualifiedName) {
+        int lastIndexOf = qualifiedName.lastIndexOf(".");
+        if(lastIndexOf >= 0) {
+            return qualifiedName.substring(lastIndexOf + 1);
+        }
+        return null;
+    }
+}

thrift/src/main/java/com/intellij/plugins/thrift/index/ThriftDeclarationIndex.java

@@ -3,8 +3,8 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.plugins.thrift.ThriftFileType;
-import com.intellij.plugins.thrift.lang.psi.ThriftDeclaration;
-import com.intellij.plugins.thrift.lang.psi.ThriftTopLevelDeclaration;
+import com.intellij.plugins.thrift.lang.psi.*;
+import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
@@ -87,25 +87,52 @@ public boolean process(String name) {
   public static List<ThriftDeclaration> findDeclaration(@NotNull final String name,
                                                         @NotNull Project project,
                                                         @NotNull GlobalSearchScope scope) {
-    final List<ThriftDeclaration> result = new ArrayList<ThriftDeclaration>();
+    final List<ThriftDeclaration> result = new ArrayList<>();
     final PsiManager manager = PsiManager.getInstance(project);
     FileBasedIndex.getInstance().getFilesWithKey(
-      THRIFT_DECLARATION_INDEX,
-      Collections.singleton(name),
-      new Processor<VirtualFile>() {
-        @Override
-        public boolean process(VirtualFile file) {
-          PsiFile psiFile = manager.findFile(file);
-          if (psiFile != null) {
-            for (PsiElement child : psiFile.getChildren()) {
-              if (child instanceof ThriftTopLevelDeclaration && name.equals(((ThriftDeclaration)child).getName())) {
-                result.add((ThriftDeclaration)child);
+            THRIFT_DECLARATION_INDEX,
+            Collections.singleton(name),
+            file -> {
+              PsiFile psiFile = manager.findFile(file);
+              if (psiFile != null) {
+                for (PsiElement child : psiFile.getChildren()) {
+                  if (child instanceof ThriftTopLevelDeclaration && name.equals(((ThriftDeclaration) child).getName())) {
+                    result.add((ThriftDeclaration) child);
+                  }
+                }
               }
-            }
-          }
-          return true;
-        }
-      },
+              return true;
+            },
+            scope
+    );
+    return result;
+  }
+
+  public static List<ThriftDeclaration> findDeclaration(@NotNull final String name,
+                                                        @NotNull String requiredNamespace,
+                                                        @NotNull Project project,
+                                                        @NotNull GlobalSearchScope scope) {
+    final List<ThriftDeclaration> result = new ArrayList<>();
+    final PsiManager manager = PsiManager.getInstance(project);
+    FileBasedIndex.getInstance().getFilesWithKey(
+            THRIFT_DECLARATION_INDEX,
+            Collections.singleton(name),
+            file -> {
+              PsiFile psiFile = manager.findFile(file);
+              List<String> availableNamespaces = new ArrayList<>(Collections.emptyList());
+              if (psiFile != null) {
+                for (PsiElement child : psiFile.getChildren()) {
+                  if (child instanceof ThriftNamespace || (child instanceof PsiComment && child.getText().contains("namespace"))) {
+                    String fullNamespaceName = child.getText();
+                    availableNamespaces.add(fullNamespaceName.substring(fullNamespaceName.lastIndexOf(" ") + 1));
+                  }
+                  if (child instanceof ThriftTopLevelDeclaration && name.equals(((ThriftDeclaration) child).getName()) && availableNamespaces.contains(requiredNamespace)) {
+                    result.add((ThriftDeclaration) child);
+                  }
+                }
+              }
+              return true;
+            },
       scope
     );
     return result;

thrift/src/main/resources/META-INF/plugin.xml

@@ -85,6 +85,9 @@
     <frameworkSupport implementation="com.intellij.plugins.thrift.config.facet.ThriftFacetSupportProvider"/>
     <facetType implementation="com.intellij.plugins.thrift.config.facet.ThriftFacetType"/>
     <compileServer.plugin classpath="thrift-jps.jar" />
+
+   <gotoDeclarationHandler order="first" implementation="com.intellij.plugins.thrift.completion.ThriftGotoDeclarationHandler"/>
+
   </extensions>
 
   <actions>