From 73dcad36e86e709c3b272f9af068dec87a069306 Mon Sep 17 00:00:00 2001
From: Stanislav Utikeev <stanislav.utikeev@jetbrains.com>
Date: Tue, 22 Sep 2020 17:39:56 +0300
Subject: [PATCH] LAB-31 Move TensorFlow members providers to psi-impl

GitOrigin-RevId: 5283df23d8abdc7795fde7850281b876c73a25a0
---
 python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml   | 3 +++
 .../src/com/jetbrains/python/packaging/PyPackageVersion.kt    | 0
 .../jetbrains/python/packaging/PyPackageVersionComparator.kt  | 0
 .../python/packaging/PyPackageVersionNormalizer.java          | 0
 .../src/com/jetbrains/python/packaging/PyRequirementImpl.kt   | 0
 .../com/jetbrains/python/packaging/PyRequirementParser.java   | 0
 .../src/com/jetbrains/python/packaging/PyRequirements.kt      | 0
 .../src/com/jetbrains/tensorFlow/PyTensorFlow.kt              | 0
 .../com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt    | 0
 .../jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt | 0
 python/src/META-INF/python-core-common.xml                    | 4 ----
 11 files changed, 3 insertions(+), 4 deletions(-)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyPackageVersion.kt (100%)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt (100%)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java (100%)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyRequirementImpl.kt (100%)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyRequirementParser.java (100%)
 rename python/{python-sdk => python-psi-impl}/src/com/jetbrains/python/packaging/PyRequirements.kt (100%)
 rename python/{ => python-psi-impl}/src/com/jetbrains/tensorFlow/PyTensorFlow.kt (100%)
 rename python/{ => python-psi-impl}/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt (100%)
 rename python/{ => python-psi-impl}/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt (100%)

diff --git a/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml b/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
index c2d9764ddaea..244e7fb5bbb5 100644
--- a/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
+++ b/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
@@ -446,6 +446,9 @@
     <pyClassMembersProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibClassMembersProvider"/>
     <pyModuleMembersProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibOverridingModuleMembersProvider"/>
 
+    <!-- TensorFlow -->
+    <importResolver implementation="com.jetbrains.tensorFlow.PyTensorFlowImportResolver"/>
+    <pyModuleMembersProvider implementation="com.jetbrains.tensorFlow.PyTensorFlowModuleMembersProvider"/>
 
   </extensions>
 
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersion.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersion.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersion.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersion.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementImpl.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementParser.java b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementParser.java
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementParser.java
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementParser.java
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirements.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirements.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirements.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirements.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlow.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 0dd4d94cd1b5..df917aa66b43 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -503,10 +503,6 @@
     <!-- PyQt -->
     <typeProvider implementation="com.jetbrains.pyqt.PyQtTypeProvider"/>
 
-    <!-- TensorFlow -->
-    <importResolver implementation="com.jetbrains.tensorFlow.PyTensorFlowImportResolver"/>
-    <pyModuleMembersProvider implementation="com.jetbrains.tensorFlow.PyTensorFlowModuleMembersProvider"/>
-
     <!-- PyFunctionTypeAnnotation -->
     <visitorFilter language="PyFunctionTypeComment"
                    implementationClass="com.jetbrains.python.inspections.PyFunctionTypeAnnotationVisitorFilter"/>