Rename idea/src/META-INF/extensions/{common.xml -> compiler.xml}
To emphasize that this file declares extensions to be registered in the compiler, not only in the IDE
This commit is contained in:
@@ -379,7 +379,7 @@
|
||||
<fileset dir="${basedir}/resources" includes="kotlinManifest.properties"/>
|
||||
|
||||
<fileset dir="idea/src">
|
||||
<include name="META-INF/extensions/common.xml"/>
|
||||
<include name="META-INF/extensions/compiler.xml"/>
|
||||
</fileset>
|
||||
|
||||
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
|
||||
|
||||
@@ -77,7 +77,7 @@ val jar: Jar by tasks
|
||||
jar.apply {
|
||||
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
|
||||
from("../idea/src").apply {
|
||||
include("META-INF/extensions/common.xml")
|
||||
include("META-INF/extensions/compiler.xml")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -474,7 +474,7 @@ class KotlinCoreEnvironment private constructor(
|
||||
override fun createJrtFileSystem(): VirtualFileSystem? = CoreJrtFileSystem()
|
||||
}
|
||||
|
||||
registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/common.xml")
|
||||
registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/compiler.xml")
|
||||
|
||||
registerApplicationServicesForCLI(applicationEnvironment)
|
||||
registerApplicationServices(applicationEnvironment)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator"/>
|
||||
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator"/>
|
||||
|
||||
<!-- diagnosticSuppressor decelerated in common.xml -->
|
||||
<!-- diagnosticSuppressor declared in compiler.xml -->
|
||||
<diagnosticSuppressor implementation="org.jetbrains.kotlin.idea.debugger.DiagnosticSuppressorForDebugger"/>
|
||||
|
||||
<scriptDefinitionContributor
|
||||
|
||||
@@ -2721,7 +2721,7 @@
|
||||
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
|
||||
|
||||
<extensionPoints>
|
||||
<xi:include href="extensions/common.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
|
||||
<xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
|
||||
</extensionPoints>
|
||||
|
||||
<extensions defaultExtensionNs="org.jetbrains.kotlin">
|
||||
|
||||
Reference in New Issue
Block a user