mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-16 14:23:28 +07:00
[java] cleanup: get rid of fake packages in content modules of Java Frontend plugin (IDEA-366600)
Fake packages were used to ensure that the main plugin classloader is used to load the classes from content modules. Now the same can be achieved explicitly with loading="embedded" attribute. This is also needed to ensure that the classpath for content modules can be properly specified (this is needed for IJPL-165692). Also, it's possible to use auto-layout for the plugin, so there is no need to specify it explicitly. GitOrigin-RevId: 6a75b4868b796215018d230949752bc978c60476
This commit is contained in:
committed by
intellij-monorepo-bot
parent
ea9aa44089
commit
3c560d0268
@@ -1,5 +1,4 @@
|
||||
<!--suppress PluginXmlValidity -->
|
||||
<idea-plugin package="com.intellij.java.debugger.impl.shared.fake">
|
||||
<idea-plugin>
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<applicationService serviceImplementation="com.intellij.debugger.settings.DebuggerSettings"/>
|
||||
<applicationSettings service="com.intellij.debugger.settings.DebuggerSettings"/>
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This file is added as a temporary workaround to have fake root package in intellij.java.debugger.impl.shared module.
|
||||
It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
|
||||
@@ -1,4 +1,4 @@
|
||||
<idea-plugin package="com.intellij.java.frontback.impl.fake">
|
||||
<idea-plugin>
|
||||
<module value="com.intellij.java.frontback.impl" />
|
||||
<extensionPoints>
|
||||
<!--suppress PluginXmlValidity -->
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This file is added as a temporary workaround to have fake root package in intellij.java.frontback.impl module.
|
||||
It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
|
||||
@@ -1,2 +1,2 @@
|
||||
<idea-plugin package="com.intellij.java.frontback.psi.fake">
|
||||
<idea-plugin>
|
||||
</idea-plugin>
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This file is added as a temporary workaround to have fake root package in intellij.java.frontback.psi module.
|
||||
It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
|
||||
@@ -1,4 +1,4 @@
|
||||
<idea-plugin package="com.intellij.java.frontback.psi.impl.fake">
|
||||
<idea-plugin>
|
||||
<module value="com.intellij.java.frontback.psi.impl" />
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<!--suppress PluginXmlValidity -->
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This file is added as a temporary workaround to have fake root package in intellij.java.frontback.psi.impl module.
|
||||
It can be removed when Java Frontend plugin is properly migrated to Plugin Model v2.
|
||||
@@ -6,7 +6,6 @@ import org.jetbrains.intellij.build.impl.PluginLayout
|
||||
|
||||
object JavaPluginLayout {
|
||||
const val MAIN_MODULE_NAME = "intellij.java.plugin"
|
||||
const val MAIN_FRONTEND_MODULE_NAME = "intellij.java.frontend"
|
||||
|
||||
fun javaPlugin(addition: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
|
||||
return PluginLayout.plugin(mainModuleName = MAIN_MODULE_NAME, auto = true) { spec ->
|
||||
@@ -107,19 +106,4 @@ object JavaPluginLayout {
|
||||
spec.excludeProjectLibrary("jetbrains-annotations-java5")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A special plugin for JetBrains Client
|
||||
*/
|
||||
fun javaFrontendPlugin(): PluginLayout {
|
||||
return PluginLayout.plugin(MAIN_FRONTEND_MODULE_NAME) { spec ->
|
||||
@Suppress("SpellCheckingInspection")
|
||||
spec.withModules(listOf(
|
||||
"intellij.java.frontback.impl",
|
||||
"intellij.java.frontback.psi",
|
||||
"intellij.java.frontback.psi.impl",
|
||||
"intellij.java.debugger.impl.shared",
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user