From a32a32e1d3ed0da1f84ecdb52b5f9a5813dbffd6 Mon Sep 17 00:00:00 2001
From: Alexey Utkin <alexey.utkin@jetbrains.com>
Date: Mon, 21 Dec 2015 16:47:56 +0300
Subject: [PATCH] PY-17817 Python plugin breaks project scope

---
 python/edu/src/META-INF/PyCharmEduPlugin.xml              | 2 +-
 python/ide/src/META-INF/PyCharmCorePlugin.xml             | 2 +-
 python/pluginResources/META-INF/plugin.xml                | 2 +-
 .../{python-core-core.xml => python-core-common.xml}      | 4 ----
 python/src/META-INF/python-core-ide.xml                   | 8 ++++++++
 python/src/META-INF/python-core-plugin.xml                | 5 +++++
 python/src/META-INF/python-core.xml                       | 5 -----
 7 files changed, 16 insertions(+), 12 deletions(-)
 rename python/src/META-INF/{python-core-core.xml => python-core-common.xml} (99%)
 create mode 100644 python/src/META-INF/python-core-ide.xml
 create mode 100644 python/src/META-INF/python-core-plugin.xml
 delete mode 100644 python/src/META-INF/python-core.xml

diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index 1da5e69be499..29ae11e1ca4e 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -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>
diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index 6548f04111d1..9784c7bc622d 100644
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -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>
diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index 7153807829fb..983b2d14798f 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -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/*)"/>
 
diff --git a/python/src/META-INF/python-core-core.xml b/python/src/META-INF/python-core-common.xml
similarity index 99%
rename from python/src/META-INF/python-core-core.xml
rename to python/src/META-INF/python-core-common.xml
index 0b9eb327a3d3..f62638232286 100644
--- a/python/src/META-INF/python-core-core.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -491,10 +491,6 @@
     <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
index 000000000000..7d11d7ab6531
--- /dev/null
+++ b/python/src/META-INF/python-core-ide.xml
@@ -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
index 000000000000..ebac43f7f238
--- /dev/null
+++ b/python/src/META-INF/python-core-plugin.xml
@@ -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
index d1e93625fab9..000000000000
--- a/python/src/META-INF/python-core.xml
+++ /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