MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

[wobbler] get resolution to jdk working

Browse Source 
GitOrigin-RevId: 98f16eb5685309cfe15faf92adf1969b7f5a22a6
This commit is contained in:
Andrey Zaytsev
2025-02-01 16:06:29 +00:00
committed by intellij-monorepo-bot
parent c2c5590b88
commit f3e3f0c4dd
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+12 -9
View File
@@ -134,15 +134,18 @@ public final class JavaFileManagerImpl implements JavaFileManager, Disposable {
private boolean hasAcceptablePackage(@NotNull VirtualFile vFile) {
if (FileTypeRegistry.getInstance().isFileOfType(vFile, JavaClassFileType.INSTANCE)) {
// See IDEADEV-5626
ProjectFileIndex index = ProjectRootManager.getInstance(myManager.getProject()).getFileIndex();
boolean checkMultiRelease = index.isInLibrary(vFile);
VirtualFile root = index.getClassRootForFile(vFile);
VirtualFile parent = vFile.getParent();
PsiNameHelper nameHelper = PsiNameHelper.getInstance(myManager.getProject());
while (parent != null && !Comparing.equal(parent, root) &&
(!checkMultiRelease || JavaMultiReleaseUtil.getVersionForVersionRoot(root, parent) == null)) {
if (!nameHelper.isIdentifier(parent.getName())) return false;
parent = parent.getParent();
var prm = ProjectRootManager.getInstance(myManager.getProject());
if (prm != null) {
ProjectFileIndex index = prm.getFileIndex();
boolean checkMultiRelease = index.isInLibrary(vFile);
VirtualFile root = index.getClassRootForFile(vFile);
VirtualFile parent = vFile.getParent();
PsiNameHelper nameHelper = PsiNameHelper.getInstance(myManager.getProject());
while (parent != null && !Comparing.equal(parent, root) &&
(!checkMultiRelease || JavaMultiReleaseUtil.getVersionForVersionRoot(root, parent) == null)) {
if (!nameHelper.isIdentifier(parent.getName())) return false;
parent = parent.getParent();
}
}
}
java/java-frontback-psi-api/src/com/intellij/psi/compiled/ClassFileDecompilers.java
+1 -1
View File
@@ -73,7 +73,7 @@ public final class ClassFileDecompilers {
return ApplicationManager.getApplication().getService(ClassFileDecompilers.class);
}
public final ExtensionPointName<Decompiler> EP_NAME = new ExtensionPointName<>("com.intellij.psi.classFileDecompiler");
public static final ExtensionPointName<Decompiler> EP_NAME = new ExtensionPointName<>("com.intellij.psi.classFileDecompiler");
private ClassFileDecompilers() {
Application app = ApplicationManager.getApplication();
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
+4 -1
View File
@@ -2,6 +2,7 @@
package com.intellij.psi.impl.java.stubs.index;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.psi.PsiClass;
import com.intellij.psi.impl.search.JavaSourceFilterScope;
import com.intellij.psi.search.GlobalSearchScope;
@@ -34,7 +35,9 @@ public final class JavaFullClassNameIndex extends CharSequenceHashStubIndexExten
}
public Collection<PsiClass> getClasses(@NotNull CharSequence name, @NotNull Project project, @NotNull GlobalSearchScope scope) {
return StubIndex.getElements(getKey(), name, project, new JavaSourceFilterScope(scope), PsiClass.class);
var prm = ProjectRootManager.getInstance(project);
var scopePrime = prm != null ? new JavaSourceFilterScope(scope) : scope;
return StubIndex.getElements(getKey(), name, project, scopePrime, PsiClass.class);
}
@Override
platform/indexing-api/src/com/intellij/psi/stubs/CharSequenceHashInlineKeyDescriptor.java
+2 -1
View File
@@ -38,7 +38,8 @@ final class CharSequenceHashInlineKeyDescriptor extends InlineKeyDescriptor<Char
@Override
public boolean equals(Object obj) {
throw new UnsupportedOperationException();
return obj instanceof CharSequence && obj.hashCode() == hashCode;
// throw new UnsupportedOperationException();
}
@Override