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

[kotlin] KTIJ-29467 a kotlin plugin module should be treated like a regular intellij module

Browse Source 
todo: split package in kotlin.highlighting.shared

GitOrigin-RevId: a01c2bf2952f0de7a97c03e99cb3f5554c96cfd1
This commit is contained in:
Andrew Kozlov
2024-04-26 15:14:38 +02:00
committed by intellij-monorepo-bot
parent c00b7acf42
commit d997b48c16
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/core-impl/src/com/intellij/ide/plugins/PluginXmlPathResolver.kt
View File

@@ -22,7 +22,8 @@ class PluginXmlPathResolver(private val pluginJarFiles: List<Path>, private val
fun toLoadPath(relativePath: String, base: String?): String {
return when {
relativePath[0] == '/' -> relativePath.substring(1)
relativePath.startsWith("intellij.") -> relativePath
relativePath.startsWith("intellij.")
|| relativePath.startsWith("kotlin.") -> relativePath
base == null -> "META-INF/$relativePath"
else -> "$base/$relativePath"
}

0
plugins/kotlin/highlighting/highlighting-shared/resources/META-INF/kotlin.highlighting.shared.xml → plugins/kotlin/highlighting/highlighting-shared/resources/kotlin.highlighting.shared.xml
View File

0
plugins/kotlin/plugin/k1/resources/META-INF/k1.xml → plugins/kotlin/plugin/k1/resources/kotlin.plugin.k1.xml
View File

2
plugins/kotlin/plugin/k1/testResources/META-INF/plugin.xml
View File

@@ -10,5 +10,5 @@
<plugin id="com.intellij.java"/>
</dependencies>
<xi:include href="k1.xml"/>
<xi:include href="kotlin.plugin.k1.xml"/>
</idea-plugin>

13
plugins/kotlin/plugin/k2/resources/META-INF/k2.xml → plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml
View File

@@ -1,13 +1,10 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<depends optional="true" config-file="gradle.xml">com.intellij.gradle</depends>
<depends optional="true" config-file="dep-groovy.xml">org.intellij.groovy</depends>
<depends optional="true" config-file="maven-common.xml">org.jetbrains.idea.maven</depends>
<depends optional="true" config-file="dep-maven.xml">org.jetbrains.idea.maven</depends>
<depends optional="true" config-file="dep-jvm-decompiler.xml">org.jetbrains.java.decompiler</depends>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.java</depends>
<depends>com.intellij.modules.java-capable</depends>
<dependencies>
<plugin id="com.intellij.modules.platform"/>
<plugin id="com.intellij.modules.java"/>
<plugin id="com.intellij.modules.java-capable"/>
</dependencies>
<xi:include href="/META-INF/analysis-api/analysis-api-fir.xml"/> <!-- comes from the Kotlin compiler -->

2
plugins/kotlin/plugin/k2/testResources/META-INF/plugin.xml
View File

@@ -10,5 +10,5 @@
<plugin id="com.intellij.java"/>
</dependencies>
<xi:include href="k2.xml"/>
<xi:include href="kotlin.plugin.k2.xml"/>
</idea-plugin>

4
plugins/kotlin/plugin/resources/META-INF/plugin.xml
View File

@@ -255,6 +255,6 @@
<!-- IJ/AS-INCOMPATIBLE-PLACEHOLDER -->
<xi:include href="k1.xml" includeUnless="idea.kotlin.plugin.use.k2"/>
<xi:include href="k2.xml" includeIf="idea.kotlin.plugin.use.k2"/>
<xi:include href="kotlin.plugin.k1.xml" includeUnless="idea.kotlin.plugin.use.k2"/>
<xi:include href="kotlin.plugin.k2.xml" includeIf="idea.kotlin.plugin.use.k2"/>
</idea-plugin>