azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use only hard dependency to java module and use include for jvm.xml (KT-23638)

Browse Source 
Trick with both optional/non-optional dependency doesn't work in IDEA,
as it doesn't do an additional check optional dependency is found.

See com.intellij.ide.plugins.PluginManagerCore#checkDependants(
  IdeaPluginDescriptor, Function<PluginId, IdeaPluginDescriptor>,
  Condition<PluginId>, Set<PluginId>)

 #KT-23638 Fixed
This commit is contained in:
Nikolay Krasko
2018-04-11 21:07:56 +03:00
parent 03cca448d3
commit c4917d6d1c
7 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+6 -3
View File
@@ -27,11 +27,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2822,6 +2821,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
idea/src/META-INF/plugin.xml.172
+6 -3
View File
@@ -27,11 +27,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2824,6 +2823,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
idea/src/META-INF/plugin.xml.181
+6 -3
View File
@@ -27,11 +27,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2822,6 +2821,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
idea/src/META-INF/plugin.xml.182
+6 -3
View File
@@ -28,11 +28,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2823,6 +2822,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
idea/src/META-INF/plugin.xml.as31
+6 -3
View File
@@ -28,11 +28,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2823,6 +2822,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
idea/src/META-INF/plugin.xml.as32
+6 -3
View File
@@ -29,11 +29,10 @@
<!-- ULTIMATE-PLUGIN-PLACEHOLDER --> <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<!-- CLION-PLUGIN-PLACEHOLDER-START --> <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
<depends>com.intellij.modules.java</depends> <depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="jvm.xml">com.intellij.modules.java</depends>
<depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends> <depends optional="true" config-file="javaScriptDebug.xml">JavaScriptDebugger</depends>
<!-- CLION-PLUGIN-PLACEHOLDER-END --> <!-- CIDR-PLUGIN-PLACEHOLDER-END -->
<project-components> <project-components>
<component> <component>
@@ -2824,6 +2823,10 @@
<checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/> <checkinHandlerFactory implementation="org.jetbrains.kotlin.idea.vcs.BunchFileCheckInHandlerFactory"/>
</extensions> </extensions>
<!-- CIDR-PLUGIN-EXCLUDE-START -->
<xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- CIDR-PLUGIN-EXCLUDE-END -->
<xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/> <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
prepare/cidr-plugin/build.gradle.kts
+7 -1
View File
@@ -30,8 +30,13 @@ val pluginXml by tasks.creating {
doFirst { doFirst {
val placeholderRegex = Regex( val placeholderRegex = Regex(
"""<!-- CLION-PLUGIN-PLACEHOLDER-START -->(.*)<!-- CLION-PLUGIN-PLACEHOLDER-END -->""", """<!-- CIDR-PLUGIN-PLACEHOLDER-START -->(.*)<!-- CIDR-PLUGIN-PLACEHOLDER-END -->""",
RegexOption.DOT_MATCHES_ALL) RegexOption.DOT_MATCHES_ALL)
val excludeRegex = Regex(
"""<!-- CIDR-PLUGIN-EXCLUDE-START -->(.*)<!-- CIDR-PLUGIN-EXCLUDE-END -->""",
RegexOption.DOT_MATCHES_ALL)
val versionRegex = Regex("""<version>([^<]+)</version>""") val versionRegex = Regex("""<version>([^<]+)</version>""")
zipTree(inputs.files.singleFile) zipTree(inputs.files.singleFile)
@@ -39,6 +44,7 @@ val pluginXml by tasks.creating {
.singleFile .singleFile
.readText() .readText()
.replace(placeholderRegex, "") .replace(placeholderRegex, "")
.replace(excludeRegex, "")
.replace(versionRegex, "<version>$pluginFullVersionNumber</version>") .replace(versionRegex, "<version>$pluginFullVersionNumber</version>")
.also { pluginXmlText -> .also { pluginXmlText ->
outputs.files.singleFile.writeText(pluginXmlText) outputs.files.singleFile.writeText(pluginXmlText)