Merge commit 'a85b798667f6a81500b21eda3c8d508a28cb969c' into egorzhdan/coverage

GitOrigin-RevId: 55b653eb620e8dc5642c467b0308e447a5ac32a7
This commit is contained in:
Vyacheslav Karpukhin
2019-06-12 17:37:11 +02:00
committed by intellij-monorepo-bot
parent 6449013904
commit 8f41ae3227
272 changed files with 2427 additions and 3771 deletions

View File

@@ -1,16 +1,16 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" use-idea-classloader="true">
<!-- we need to use the platform classloader to make the plugin compatible with CLion until IDEA-187832 is fixed,
see cidr-external-system/resources/META-INF/plugin.xml for details -->
<id>com.intellij.java</id>
<name>Java</name>
<description>Java language support.</description>
<vendor>JetBrains</vendor>
<resource-bundle>messages.ActionsBundle</resource-bundle>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.vcs</depends>
<depends>com.intellij.modules.xdebugger</depends>
<depends>com.intellij.modules.xml</depends>
<xi:include href="/META-INF/JavaPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<!-- todo: these files are present in Java plugin for IDEA Ultimate only, they should be extract to a different plugin.xml -->
@@ -27,8 +27,7 @@
<depends optional="true" config-file="profiler-java.xml">com.intellij.modules.profiler</depends>
<depends optional="true" config-file="structuralsearch-java.xml">com.intellij.modules.structuralsearch</depends>
<depends optional="true" config-file="RemoteServersJava.xml">com.intellij.modules.remoteServers</depends>
<depends optional="true" config-file="JavaCMakeActionPatcher.xml">com.intellij.modules.clion.cmake</depends> <!-- a workaround for IDEA-209728 -->
<depends optional="true" config-file="JavaCMakeActionPatcher.xml">com.intellij.modules.clion.cmake</depends> <!-- this is a workaround for IDEA-209728 -->
<extensions defaultExtensionNs="com.intellij">
<moduleType id="JAVA_MODULE" classpathProvider="true" implementationClass="com.intellij.openapi.module.JavaModuleType"/>
</extensions>