From e5e7e637558ba1f6b980e02b3b19a95a701b9b0f Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Sun, 20 Nov 2016 16:08:38 +0100
Subject: [PATCH] Add legacy completion contributor for Python language in
 Rider

(cherry picked from commit a2eff8aa3b513068fb8d460932e16f7454d2316a)
---
 python/pluginResources/META-INF/plugin.xml              | 2 +-
 python/pluginResources/META-INF/python-plugin-rider.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 python/pluginResources/META-INF/python-plugin-rider.xml

diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index efe58d844c80..d5d7b2594cb9 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -24,7 +24,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 
   <depends optional="true" config-file="python-community-plugin-java.xml">com.intellij.modules.java</depends>
   <depends optional="true" config-file="python-plugin-minor-ide.xml">com.intellij.modules.clion</depends>
-  <depends optional="true" config-file="python-plugin-minor-ide.xml">com.intellij.modules.rider</depends>
+  <depends optional="true" config-file="python-plugin-rider.xml">com.intellij.modules.rider</depends>
 
   <!-- Two different versions of this file exist: one is used when building from sources (when auxiliary
      plugins are loaded as separate plugins) and another is used for the real release build (when auxiliary
diff --git a/python/pluginResources/META-INF/python-plugin-rider.xml b/python/pluginResources/META-INF/python-plugin-rider.xml
new file mode 100644
index 000000000000..a1d7c5586dbf
--- /dev/null
+++ b/python/pluginResources/META-INF/python-plugin-rider.xml
@@ -0,0 +1,8 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+  <xi:include href="/META-INF/python-plugin-minor-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <completion.contributor language="Python" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor" id="legacy"
+                            order="last"/>
+  </extensions>
+</idea-plugin>