MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove stdlib specific logic from core ResolveImportUtil class

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-13 12:59:25 +02:00
parent ae0de9fcc5
commit 2afc743052
5 changed files with 84 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java
+15
View File
@@ -0,0 +1,15 @@
package com.jetbrains.python.psi.resolve;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.jetbrains.python.psi.impl.PyQualifiedName;
import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public interface PyCanonicalPathProvider {
ExtensionPointName<PyCanonicalPathProvider> EP_NAME = ExtensionPointName.create("Pythonid.canonicalPathProvider");
@Nullable
PyQualifiedName getCanonicalPath(PyQualifiedName qName);
}
python/src/META-INF/python-plugin-common.xml
+2
View File
@@ -761,6 +761,7 @@
<extensionPoint qualifiedName="Pythonid.visitorFilter" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
<extensionPoint qualifiedName="Pythonid.remoteInterpreterManager" interface="com.jetbrains.python.remote.PythonRemoteInterpreterManager"/>
<extensionPoint qualifiedName="Pythonid.keywordArgumentProvider" interface="com.jetbrains.python.psi.impl.PyKeywordArgumentProvider"/>
<extensionPoint qualifiedName="Pythonid.canonicalPathProvider" interface="com.jetbrains.python.psi.resolve.PyCanonicalPathProvider"/>
</extensionPoints>
<extensions defaultExtensionNs="Pythonid">
@@ -780,6 +781,7 @@
<typeProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibTypeProvider"/>
<pyModuleMembersProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibModuleMembersProvider"/>
<documentationLinkProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibDocumentationLinkProvider"/>
<canonicalPathProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibCanonicalPathProvider"/>
<typeProvider implementation="com.jetbrains.python.debugger.PyCallSignatureTypeProvider"/>
python/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibCanonicalPathProvider.java
+58
View File
@@ -0,0 +1,58 @@
package com.jetbrains.python.codeInsight.stdlib;
import com.jetbrains.python.psi.impl.PyQualifiedName;
import com.jetbrains.python.psi.resolve.PyCanonicalPathProvider;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
/**
* @author yole
*/
public class PyStdlibCanonicalPathProvider implements PyCanonicalPathProvider {
@Nullable
@Override
public PyQualifiedName getCanonicalPath(PyQualifiedName qName) {
return restoreStdlibCanonicalPath(qName);
}
public static PyQualifiedName restoreStdlibCanonicalPath(PyQualifiedName qName) {
if (qName.getComponentCount() > 0) {
final List<String> components = qName.getComponents();
final String head = components.get(0);
if (head.equals("_abcoll") || head.equals("_collections")) {
components.set(0, "collections");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("posix") || head.equals("nt")) {
components.set(0, "os");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_functools")) {
components.set(0, "functools");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_struct")) {
components.set(0, "struct");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_io") || head.equals("_pyio") || head.equals("_fileio")) {
components.set(0, "io");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_datetime")) {
components.set(0, "datetime");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("ntpath") || head.equals("posixpath") || head.equals("path")) {
final List<String> result = new ArrayList<String>();
result.add("os");
components.set(0, "path");
result.addAll(components);
return PyQualifiedName.fromComponents(result);
}
}
return null;
}
}
python/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java
+2 -2
View File
@@ -71,7 +71,7 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
public PyType getConstructorType(@NotNull PyClass cls) {
final String classQName = cls.getQualifiedName();
if (classQName != null) {
final PyQualifiedName canonicalQName = ResolveImportUtil.restoreStdlibCanonicalPath(PyQualifiedName.fromDottedString(classQName));
final PyQualifiedName canonicalQName = PyStdlibCanonicalPathProvider.restoreStdlibCanonicalPath(PyQualifiedName.fromDottedString(classQName));
if (canonicalQName != null) {
final PyQualifiedName qname = canonicalQName.append(PyNames.INIT);
return getReturnTypeByQName(qname.toString(), cls);
@@ -224,7 +224,7 @@ public class PyStdlibTypeProvider extends PyTypeProviderBase {
module,
c != null ? c.getName() + "." : "",
result);
final PyQualifiedName qname = ResolveImportUtil.restoreStdlibCanonicalPath(PyQualifiedName.fromDottedString(result));
final PyQualifiedName qname = PyStdlibCanonicalPathProvider.restoreStdlibCanonicalPath(PyQualifiedName.fromDottedString(result));
if (qname != null) {
return qname.toString();
}
python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
+7 -45
View File
@@ -2,7 +2,7 @@ package com.jetbrains.python.psi.resolve;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
@@ -260,7 +260,7 @@ public class ResolveImportUtil {
@Nullable
private static PythonPathCache getPathCache(PsiElement foothold) {
PythonPathCache cache = null;
final Module module = ModuleUtil.findModuleForPsiElement(foothold);
final Module module = ModuleUtilCore.findModuleForPsiElement(foothold);
if (module != null) {
cache = PythonModulePathCache.getInstance(module);
}
@@ -545,54 +545,16 @@ public class ResolveImportUtil {
}
final PyQualifiedName qname = findShortestImportableQName(foothold != null ? foothold : symbol, virtualFile);
if (qname != null) {
final PyQualifiedName restored = restoreStdlibCanonicalPath(qname);
if (restored != null) {
return restored;
for (PyCanonicalPathProvider provider : Extensions.getExtensions(PyCanonicalPathProvider.EP_NAME)) {
final PyQualifiedName restored = provider.getCanonicalPath(qname);
if (restored != null) {
return restored;
}
}
}
return qname;
}
@Nullable
public static PyQualifiedName restoreStdlibCanonicalPath(PyQualifiedName qname) {
if (qname.getComponentCount() > 0) {
final List<String> components = qname.getComponents();
final String head = components.get(0);
if (head.equals("_abcoll") || head.equals("_collections")) {
components.set(0, "collections");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("posix") || head.equals("nt")) {
components.set(0, "os");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_functools")) {
components.set(0, "functools");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_struct")) {
components.set(0, "struct");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_io") || head.equals("_pyio") || head.equals("_fileio")) {
components.set(0, "io");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("_datetime")) {
components.set(0, "datetime");
return PyQualifiedName.fromComponents(components);
}
else if (head.equals("ntpath") || head.equals("posixpath") || head.equals("path")) {
final List<String> result = new ArrayList<String>();
result.add("os");
components.set(0, "path");
result.addAll(components);
return PyQualifiedName.fromComponents(result);
}
}
return null;
}
/**
* @param element what we test (identifier, reference, import element, etc)
* @return the how the element relates to an enclosing import statement, if any