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

[java] do not suggest JPMS options in the undocumented format (IDEA-224965)

Browse Source 
GitOrigin-RevId: 2ada5760d7e1441294722ce1f36cb980bb06d9dc
This commit is contained in:
Roman Shevchenko
2019-12-13 15:29:40 +01:00
committed by intellij-monorepo-bot
parent 0aaebad465
commit fcfe92f31b
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
View File

@@ -189,7 +189,7 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
private abstract class CompilerOptionFix(private val module: Module) : IntentionAction {
override fun getFamilyName() = "dfd4a2c1-da18-4651-9aa8-d7d31cae10be" // random string; never visible
override fun getFamilyName() = "dfd4a2c1-da18-4651-9aa8-d7d31cae10be" // random string; not visible
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = !module.isDisposed
@@ -211,7 +211,7 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
private class AddExportsOptionFix(module: Module, targetName: String, packageName: String, private val useName: String) : CompilerOptionFix(module) {
private val qualifier = "${targetName}/${packageName}"
override fun getText() = QuickFixBundle.message("add.compiler.option.fix.name", "--add-exports=${qualifier}=${useName}")
override fun getText() = QuickFixBundle.message("add.compiler.option.fix.name", "--add-exports ${qualifier}=${useName}")
override fun update(options: MutableList<String>) {
var idx = -1; var candidate = -1; var offset = 0
@@ -227,19 +227,15 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
}
}
}
when {
idx == -1 -> options += "--add-exports=${qualifier}=${useName}"
candidate == options.size -> options[idx - 1] = "--add-exports=${qualifier}=${useName}"
else -> {
val value = options[idx]
options[idx] = if (value.endsWith('=') || value.endsWith(',')) value + useName else "${value},${useName}"
}
when (idx) {
-1 -> options += listOf("--add-exports", "${qualifier}=${useName}")
else -> options[idx] = "${options[idx].trimEnd(',')},${useName}"
}
}
}
private class AddModulesOptionFix(module: Module, private val moduleName: String) : CompilerOptionFix(module) {
override fun getText() = QuickFixBundle.message("add.compiler.option.fix.name", "--add-modules=${moduleName}")
override fun getText() = QuickFixBundle.message("add.compiler.option.fix.name", "--add-modules ${moduleName}")
override fun update(options: MutableList<String>) {
var idx = -1
@@ -250,8 +246,8 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
}
}
when (idx) {
-1 -> options += "--add-modules=${moduleName}"
options.size -> options[idx - 1] = "--add-modules=${moduleName}"
-1 -> options += listOf("--add-modules", moduleName)
options.size -> options += moduleName
else -> {
val value = options[idx]
options[idx] = if (value.endsWith('=') || value.endsWith(',')) value + moduleName else "${value},${moduleName}"