MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] IDEA-358832 Newer java.lang classes should not be resolved on older language level

Browse Source 
GitOrigin-RevId: de3f26ca24a881d0daf5eeb7349a5b22058ef40d
This commit is contained in:
Tagir Valeev
2024-09-05 15:05:59 +02:00
committed by intellij-monorepo-bot
parent acbedfa955
commit ec5666b7cc
2 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
View File

@@ -13,6 +13,7 @@ import com.intellij.openapi.util.NotNullLazyValue;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.util.text.Strings;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.JavaFeature;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -465,6 +466,10 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
for (PsiJavaCodeReferenceElement aImplicitlyImported : getImplicitlyImportedPackageReferences()) {
PsiElement resolved = aImplicitlyImported.resolve();
if (resolved != null) {
if (resolved instanceof PsiPackage && "java.lang".equals(((PsiPackage)resolved).getQualifiedName())) {
LanguageLevel level = PsiUtil.getLanguageLevel(place);
processor = new JavaLangClassesFilter(processor, level);
}
if (!processOnDemandTarget(resolved, state, place, processor)) return false;
}
}
@@ -681,4 +686,36 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
return myProcessor.execute(element, myState);
}
}
private static class JavaLangClassesFilter extends DelegatingScopeProcessor {
private static final Map<String, LanguageLevel> ourJavaLangClassFeatures = new HashMap<>();
static {
// Only classes appeared in java.lang since Java 9 are listed here
// As --release option works since Java 9
ourJavaLangClassFeatures.put("MatchException", JavaFeature.PATTERNS_IN_SWITCH.getMinimumLevel());
ourJavaLangClassFeatures.put("Module", JavaFeature.MODULES.getMinimumLevel());
ourJavaLangClassFeatures.put("ModuleLayer", JavaFeature.MODULES.getMinimumLevel());
ourJavaLangClassFeatures.put("ProcessHandle", LanguageLevel.JDK_1_9);
ourJavaLangClassFeatures.put("Record", JavaFeature.RECORDS.getMinimumLevel());
ourJavaLangClassFeatures.put("ScopedValue", JavaFeature.SCOPED_VALUES.getMinimumLevel());
ourJavaLangClassFeatures.put("WrongThreadException", LanguageLevel.JDK_19);
}
private final LanguageLevel myLevel;
JavaLangClassesFilter(@NotNull PsiScopeProcessor processor, LanguageLevel level) {
super(processor);
myLevel = level;
}
@Override
public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) {
if (element instanceof PsiClass) {
LanguageLevel classMinLevel = ourJavaLangClassFeatures.get(((PsiClass)element).getName());
if (classMinLevel != null && myLevel.isLessThan(classMinLevel)) return true;
}
return super.execute(element, state);
}
}
}