[java] excludes multi-release classes from search (IDEA-164460)

java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java

@@ -49,10 +49,14 @@ public class JavaSourceFilterScope extends DelegatingGlobalSearchScope {
     }
 
     if (JavaClassFileType.INSTANCE == file.getFileType()) {
-      return myIndex.isInLibraryClasses(file);
+      return myIndex.isInLibraryClasses(file) && !isVersioned(file);
     }
 
     return myIndex.isInSourceContent(file) ||
            myBaseScope.isForceSearchingInLibrarySources() && myIndex.isInLibrarySource(file);
   }
+
+  private static boolean isVersioned(VirtualFile file) {
+    return file.getPath().contains("/META-INF/versions/");
+  }
 }

java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/MultiReleaseJarTest.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.java.codeInsight.daemon
+
+import com.intellij.codeInsight.completion.CompletionType
+import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiJavaReference
+import com.intellij.psi.search.FilenameIndex
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.search.ProjectScope
+import com.intellij.psi.search.PsiShortNamesCache
+import org.assertj.core.api.Assertions.assertThat
+
+class MultiReleaseJarTest : LightJava9ModulesCodeInsightFixtureTestCase() {
+  private lateinit var scope: GlobalSearchScope
+
+  override fun setUp() {
+    super.setUp()
+    scope = ProjectScope.getLibrariesScope(project)
+  }
+
+  fun testResolve() {
+    myFixture.configureByText("a.java", "import com.example.*;\nclass a { <caret>MultiReleaseClass f; }")
+    assertUnversioned((myFixture.getReferenceAtCaretPosition() as PsiJavaReference).multiResolve(false).map { it.element })
+  }
+
+  fun testCompletion() {
+    myFixture.configureByText("a.java", "class a { MultiReleaseClass<caret> f; }")
+    assertUnversioned(myFixture.complete(CompletionType.BASIC).map { it.psiElement })
+  }
+
+  fun testFindClassByFullName() =
+    assertUnversioned(myFixture.javaFacade.findClass("com.example.MultiReleaseClass", scope))
+
+  fun testFindClassByShortName() =
+    assertUnversioned(PsiShortNamesCache.getInstance(project).getClassesByName("MultiReleaseClass", scope).toList())
+
+  fun testFindMethod() {
+    assertUnversioned(PsiShortNamesCache.getInstance(project).getMethodsByName("multiReleaseDefaultImpl", scope).toList())
+    assertThat(PsiShortNamesCache.getInstance(project).getMethodsByName("multiReleaseJava9Impl", scope)).isEmpty()
+  }
+
+  fun testFindFile() {
+    assertThat(FilenameIndex.getFilesByName(project, "MultiReleaseClass.class", scope)).hasSize(3)
+  }
+
+  private fun assertUnversioned(elements: List<PsiElement?>) {
+    assertThat(elements).hasSize(1)
+    assertUnversioned(elements[0])
+  }
+
+  private fun assertUnversioned(element: PsiElement?) {
+    assertThat(element).isNotNull()
+    assertThat(element!!.containingFile.virtualFile.path).doesNotContain("/META-INF/versions/")
+  }
+}