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

[java-highlighting] JpmsModuleAccessInfo: replace lambda with JpmsModuleAccessMode

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

GitOrigin-RevId: 6433be5cf21b45ca79fbbaa1650f52e9249e4f26
This commit is contained in:
Tagir Valeev
2025-02-24 11:43:33 +00:00
committed by intellij-monorepo-bot
parent d843df8aa8
commit 8492a12ace
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/codeserver/core/src/com/intellij/java/codeserver/core/JpmsModuleAccessInfo.kt
+29 -7
View File
@@ -34,9 +34,24 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
JPS_DEPENDENCY_PROBLEM
}
/**
* Access mode to determine whether the target is accessible
*/
enum class JpmsModuleAccessMode {
/**
* Consider the target as accessible if the source actually reads the target
*/
READ,
/**
* Consider the target as accessible if it's exported to the source (even if the source doesn't read it)
*/
EXPORT
}
fun checkAccess(
place: PsiFileSystemItem,
isAccessible: (JpmsModuleAccessInfo) -> Boolean,
accessMode: JpmsModuleAccessMode,
): JpmsModuleAccessProblem? {
val targetModule = target.module
if (targetModule != null) {
@@ -53,7 +68,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
return null // a target is not on the mandatory module path
}
if (!accessibleFromJdkModules(place, isAccessible) &&
if (!accessibleFromJdkModules(place, accessMode) &&
!inAddedModules(currentJpsModule, targetModule.name) &&
!hasUpgrade(currentJpsModule, targetModule.name, target.packageName, place)) {
return JpmsModuleAccessProblem.PACKAGE_NOT_IN_GRAPH
@@ -69,7 +84,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
if (current.module != null &&
targetModule.name != PsiJavaModule.JAVA_BASE &&
!isAccessible(this) &&
!this.isAccessible(accessMode) &&
!inAddedReads(current.module, targetModule)) {
return when {
PsiNameHelper.isValidModuleName(targetModule.name, current.module) -> JpmsModuleAccessProblem.PACKAGE_DOES_NOT_READ
@@ -82,7 +97,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
if (autoModule.module == null) {
return JpmsModuleAccessProblem.TO_UNNAMED
}
else if (!isAccessible(JpmsModuleAccessInfo(current, autoModule)) &&
else if (!JpmsModuleAccessInfo(current, autoModule).isAccessible(accessMode) &&
!inAddedReads(current.module, null) &&
!inSameMultiReleaseModule(current, target)) {
return JpmsModuleAccessProblem.TO_UNNAMED
@@ -92,6 +107,13 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
return null
}
private fun isAccessible(accessMode: JpmsModuleAccessMode): Boolean {
return when (accessMode) {
JpmsModuleAccessMode.READ -> isAccessible()
JpmsModuleAccessMode.EXPORT -> isExported()
}
}
/**
* @param place place where the target module is accessed
* @return access problem, or null if the target module is accessible without any problem
@@ -115,7 +137,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
return JpmsModuleAccessProblem.JPS_DEPENDENCY_PROBLEM
}
if (!accessibleFromJdkModules(place, { it.isAccessible() }) &&
if (!accessibleFromJdkModules(place, JpmsModuleAccessMode.READ) &&
!inAddedModules(currentJpsModule, targetModule.name)) {
return JpmsModuleAccessProblem.NOT_IN_GRAPH
}
@@ -157,7 +179,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
private fun accessibleFromJdkModules(
place: PsiElement,
isAccessible: (JpmsModuleAccessInfo) -> Boolean,
accessMode: JpmsModuleAccessMode,
): Boolean {
val jpsModule = current.jpsModule ?: return false
val targetModule = target.module ?: return false
@@ -176,7 +198,7 @@ data class JpmsModuleAccessInfo(val current: JpmsModuleInfo.CurrentModuleInfo, v
if (javaSE != null) {
{ module ->
(!module.name.startsWith("java.") && module.exports.any { e -> e.moduleNames.isEmpty() }) ||
isAccessible(JpmsModuleAccessInfo(JpmsModuleInfo.CurrentModuleInfo(javaSE, current.name) { jpsModule }, target))
JpmsModuleAccessInfo(JpmsModuleInfo.CurrentModuleInfo(javaSE, current.name) { jpsModule }, target).isAccessible(accessMode)
}
}
else {