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

[java-core] Extract JavaPsiModuleUtil with minimized dependencies; new module intellij.java.codeserver.core

Browse Source 
Part of IDEA-365344 Create a new Java error highlighter with minimal dependencies (PSI only)

GitOrigin-RevId: 328779172e877b737a68624fa09ea88cf5fd1954
This commit is contained in:
Tagir Valeev
2025-02-07 16:16:32 +00:00
committed by intellij-monorepo-bot
parent 02933bbb0c
commit 0e57ef0ef0
40 changed files with 400 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/util/JavaMultiReleaseUtil.java
+27 -5
View File
@@ -23,7 +23,7 @@ public final class JavaMultiReleaseUtil {
* Minimal JDK version which supports multi-release Jars
*/
public static final LanguageLevel MIN_MULTI_RELEASE_VERSION = LanguageLevel.JDK_1_9;
private static class VersionRootInfo {
final @NotNull LanguageLevel level;
final @NotNull VirtualFile versionRoot;
@@ -98,17 +98,39 @@ public final class JavaMultiReleaseUtil {
* @param file file that represents a non-version-specific file from an MR-JAR
* @param level desired language level
* @return a version of the file, which should be loaded on the specified language level. Returns
* input file if there's no more-specific version of the file, or the input file is not located inside MR-JAR.
* the input file if there's no more-specific version of the file, or the input file is not located inside MR-JAR.
*/
public static @NotNull VirtualFile findVersionSpecificFile(@NotNull VirtualFile file, @NotNull LanguageLevel level) {
VirtualFile root = VfsUtilCore.getRootFile(file);
if (!(root.getFileType() instanceof ArchiveFileType)) return file;
String relativePath = VfsUtilCore.getRelativePath(file, root);
if (relativePath == null) return file;
return findFileImpl(file, level, root, relativePath);
}
/**
* @param root content root
* @param relativePath path to the file relative to content root
* @param level desired language level
* @return a version of the file, which should be loaded on the specified language level. Returns null if the file is not found.
*/
public static @Nullable VirtualFile findVersionSpecificFile(@NotNull VirtualFile root,
@NotNull String relativePath,
@NotNull LanguageLevel level) {
VirtualFile file = root.findFileByRelativePath(relativePath);
if (!(root.getFileType() instanceof ArchiveFileType)) return file;
return findFileImpl(file, level, root, relativePath);
}
@Contract("!null, _, _, _ -> !null")
private static @Nullable VirtualFile findFileImpl(@Nullable VirtualFile defaultFile,
@NotNull LanguageLevel level,
@NotNull VirtualFile root,
@NotNull String relativePath) {
VirtualFile metaInf = root.findChild("META-INF");
if (metaInf == null) return file;
if (metaInf == null) return defaultFile;
VirtualFile versions = metaInf.findChild("versions");
if (versions == null) return file;
if (versions == null) return defaultFile;
int feature = level.feature();
int minFeature = MIN_MULTI_RELEASE_VERSION.feature();
while (feature >= minFeature) {
@@ -121,7 +143,7 @@ public final class JavaMultiReleaseUtil {
}
feature--;
}
return file;
return defaultFile;
}
/**