PY-17817 Python plugin breaks project scope
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 21 Dec 2015 13:47:56 +0000 (16:47 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 21 Dec 2015 13:47:56 +0000 (16:47 +0300)
python/edu/src/META-INF/PyCharmEduPlugin.xml
python/ide/src/META-INF/PyCharmCorePlugin.xml
python/pluginResources/META-INF/plugin.xml
python/src/META-INF/python-core-common.xml [moved from python/src/META-INF/python-core-core.xml with 99% similarity]
python/src/META-INF/python-core-ide.xml [new file with mode: 0644]
python/src/META-INF/python-core-plugin.xml [new file with mode: 0644]
python/src/META-INF/python-core.xml [deleted file]

index 1da5e69be499ee879b79a8cdcdb093bafcc1edff..29ae11e1ca4e67abc982ef8670a96071639a74f7 100644 (file)
@@ -10,7 +10,7 @@
 
   <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-core-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
   
   <application-components>
     <component>
index 6548f04111d1a8dcf2349e0d637b9f3230c1604e..9784c7bc622df7de0a1bf561e6776dec5ec6897b 100644 (file)
@@ -1,6 +1,6 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-core-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>
index 7153807829fb61b77376ee38d42c607a9bda3726..983b2d14798f897e71029e3e184eb96acca0e982 100644 (file)
@@ -20,7 +20,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 
 
   <vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
-  <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-community-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-community-plugin-java.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
similarity index 99%
rename from python/src/META-INF/python-core-core.xml
rename to python/src/META-INF/python-core-common.xml
index 0b9eb327a3d37f8402c78d2072f0a8e867cf2052..f6263823228630dbbd8358eb48f0e150148c8579 100644 (file)
     <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringTagCompletionContributor"/>
     <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringSectionHeaderCompletionContributor"/>
 
-    <projectService serviceInterface="com.intellij.psi.search.ProjectScopeBuilder"
-                    serviceImplementation="com.jetbrains.python.psi.search.PyProjectScopeBuilder"
-                    overrides="true"/>
-
     <treeStructureProvider implementation="com.jetbrains.python.projectView.PyTreeStructureProvider"/>
 
     <project.converterProvider implementation="com.jetbrains.python.testing.converters.PythonTestConverterProvider"/>
diff --git a/python/src/META-INF/python-core-ide.xml b/python/src/META-INF/python-core-ide.xml
new file mode 100644 (file)
index 0000000..7d11d7a
--- /dev/null
@@ -0,0 +1,8 @@
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceInterface="com.intellij.psi.search.ProjectScopeBuilder"
+                    serviceImplementation="com.jetbrains.python.psi.search.PyProjectScopeBuilder"
+                    overrides="true"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/python-core-plugin.xml b/python/src/META-INF/python-core-plugin.xml
new file mode 100644 (file)
index 0000000..ebac43f
--- /dev/null
@@ -0,0 +1,5 @@
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <!-- 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/*)"/>
+</idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
deleted file mode 100644 (file)
index d1e9362..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- python-core-core.xml need to be the first for resource-bundle definition -->
-  <xi:include href="/META-INF/python-core-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core-buildout.xml" xpointer="xpointer(/idea-plugin/*)"/>
-</idea-plugin>
\ No newline at end of file