CPP-434 Usage scale description was added to configuration XMLs; in CLion plugin...

diff --git a/python/python-configure/resources/META-INF/python-configure-core.xml b/python/python-configure/resources/META-INF/python-configure-core.xml
index 8fb02ef8c1dd0a17416ad3962e1027a7b56f49f8..fcf209f60c7ab6c041c6895d635093482ac2f166 100644 (file)
--- a/python/python-configure/resources/META-INF/python-configure-core.xml
+++ b/python/python-configure/resources/META-INF/python-configure-core.xml
@@ -1,4 +1,9 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
+  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+       Both Community and Professional editions. -->
+
+  <!-- Components and extensions declared in this file work in CLion Python Plugin to configure Python toolchain -->
+

   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
                     serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
                     serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>

diff --git a/python/python-configure/resources/META-INF/python-configure.xml b/python/python-configure/resources/META-INF/python-configure.xml
index e05d804843ab649bd63720d363e06d7a37c2c5e7..9467c46e181e9709c85c91e4d3bde04e6d32c0cb 100644 (file)
--- a/python/python-configure/resources/META-INF/python-configure.xml
+++ b/python/python-configure/resources/META-INF/python-configure.xml
@@ -1,4 +1,7 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">

+  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+       Both Community and Professional editions. -->
+

   <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="project"
   <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="project"

diff --git a/python/src/META-INF/python-core-buildout.xml b/python/src/META-INF/python-core-buildout.xml
index 0a87e9b65c5960e3ec19ba38626edb71822dc1e8..77395466c21e3329afdc96f71675f3e36488a2c6 100644 (file)
--- a/python/src/META-INF/python-core-buildout.xml
+++ b/python/src/META-INF/python-core-buildout.xml
@@ -1,4 +1,7 @@
 <idea-plugin version="2">
 <idea-plugin version="2">

+  <!-- Components and extensions declared in this file work both in PyCharm and Python plugin (but not in CLion).
+       Both Community and Professional editions. -->
+

   <extensions defaultExtensionNs="com.intellij">
     <!-- Buildout -->
     <facetType implementation="com.jetbrains.python.buildout.BuildoutFacetType"/>
   <extensions defaultExtensionNs="com.intellij">
     <!-- Buildout -->
     <facetType implementation="com.jetbrains.python.buildout.BuildoutFacetType"/>

diff --git a/python/src/META-INF/python-core-ide.xml b/python/src/META-INF/python-core-ide.xml
index 7d11d7ab6531985b2dc0fcd945327e2db7aac467..e8f0574a9658e2f819c6d2dd76b9993c05fdacb5 100644 (file)
--- a/python/src/META-INF/python-core-ide.xml
+++ b/python/src/META-INF/python-core-ide.xml
@@ -1,4 +1,7 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">

+  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+       Both Community and Professional editions. -->
+

   <xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.intellij.psi.search.ProjectScopeBuilder"
   <xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.intellij.psi.search.ProjectScopeBuilder"

diff --git a/python/src/META-INF/python-core-plugin.xml b/python/src/META-INF/python-core-plugin.xml
index ebac43f7f238a000457fcad5fcf22bff7fe2ba8b..0122494064080702c8dcbfd51e2d260a0146312c 100644 (file)
--- a/python/src/META-INF/python-core-plugin.xml
+++ b/python/src/META-INF/python-core-plugin.xml
@@ -1,4 +1,7 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">

+  <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
+       Both Community and Professional editions. -->
+

   <!-- python-core-common.xml need to be the first for resource-bundle definition -->
   <xi:include href="/META-INF/python-core-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-core-buildout.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- python-core-common.xml need to be the first for resource-bundle definition -->
   <xi:include href="/META-INF/python-core-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-core-buildout.xml" xpointer="xpointer(/idea-plugin/*)"/>