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

canged compatibility inspection

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-12-09 12:57:10 +04:00
parent 5b0c732f37
commit 571e28c40d
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/tools/versions.xml
+1 -1
View File
File diff suppressed because one or more lines are too long
python/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java
+22 -17
View File
@@ -160,18 +160,17 @@ public class PyCompatibilityInspection extends PyInspection {
commonRegisterProblem(message, " not have method " + node.getCallee().getText(),
len, node, null, false);
}
@Override
public void visitPyImportStatement(PyImportStatement node) {
super.visitPyImportStatement(node);
PyIfStatement ifParent = PsiTreeUtil.getParentOfType(node, PyIfStatement.class);
public void visitPyImportElement(PyImportElement importElement) {
PyIfStatement ifParent = PsiTreeUtil.getParentOfType(importElement, PyIfStatement.class);
if (ifParent != null)
return;
PyImportElement[] importElements = node.getImportElements();
int len = 0;
String moduleName = "";
StringBuilder message = new StringBuilder("Python version ");
PyTryExceptStatement tryExceptStatement = PsiTreeUtil.getParentOfType(node, PyTryExceptStatement.class);
PyTryExceptStatement tryExceptStatement = PsiTreeUtil.getParentOfType(importElement, PyTryExceptStatement.class);
if (tryExceptStatement != null) {
PyExceptPart[] parts = tryExceptStatement.getExceptParts();
for (PyExceptPart part : parts) {
@@ -181,18 +180,24 @@ public class PyCompatibilityInspection extends PyInspection {
}
}
PyQualifiedName sourceName = null;
PyFromImportStatement fromImportStatement = PsiTreeUtil.getParentOfType(importElement, PyFromImportStatement.class);
if (fromImportStatement != null) {
sourceName = fromImportStatement.getImportSourceQName();
}
for (int i = 0; i != myVersionsToProcess.size(); ++i) {
LanguageLevel languageLevel = myVersionsToProcess.get(i);
for (PyImportElement importElement : importElements) {
final PyQualifiedName qName = importElement.getImportedQName();
if (qName != null && !qName.matches("builtins") && !qName.matches("__builtin__")) {
moduleName = qName.toString();
if (UnsupportedFeaturesUtil.MODULES.get(languageLevel).contains(moduleName))
len = appendLanguageLevel(message, len, languageLevel);
final PyQualifiedName qName = importElement.getImportedQName();
if (qName != null && !qName.matches("builtins") && !qName.matches("__builtin__")) {
if (sourceName != null) moduleName = sourceName.append(qName.toString()).toString();
else moduleName = qName.toString();
if (UnsupportedFeaturesUtil.MODULES.get(languageLevel).contains(moduleName)) {
len = appendLanguageLevel(message, len, languageLevel);
}
}
}
commonRegisterProblem(message, " not have module " + moduleName, len, node, null);
commonRegisterProblem(message, " not have module " + moduleName, len, importElement, null);
}
@Override
@@ -200,17 +205,17 @@ public class PyCompatibilityInspection extends PyInspection {
super.visitPyFromImportStatement(node);
int len = 0;
StringBuilder message = new StringBuilder("Python version ");
PyReferenceExpression importSource = node.getImportSource();
if (importSource != null) {
String name = importSource.getText();
PyQualifiedName name = node.getImportSourceQName();
PyReferenceExpression source = node.getImportSource();
if (name != null) {
for (int i = 0; i != myVersionsToProcess.size(); ++i) {
LanguageLevel languageLevel = myVersionsToProcess.get(i);
if (UnsupportedFeaturesUtil.MODULES.get(languageLevel).contains(name)) {
if (UnsupportedFeaturesUtil.MODULES.get(languageLevel).contains(name.toString())) {
len = appendLanguageLevel(message, len, languageLevel);
}
}
commonRegisterProblem(message, " not have module " + name,
len, node, null, false);
len, source, null, false);
}
}
}
python/src/com/jetbrains/python/validation/VersionsParser.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class VersionsParser extends DefaultHandler {
String qName,
Attributes attr) throws SAXException {
myContent.reset();
if ( localName.equals( "python" ) ) {
if (localName.equals("python")) {
UnsupportedFeaturesUtil.BUILTINS.put(LanguageLevel.fromPythonVersion(attr.getValue("version")), new HashSet<String>());
UnsupportedFeaturesUtil.MODULES.put(LanguageLevel.fromPythonVersion(attr.getValue("version")), new HashSet<String>());
myCurrentLevel = LanguageLevel.fromPythonVersion(attr.getValue("version"));
python/testData/inspections/PyCompatibilityInspection/fromImportStatement.py
+1 -1
View File
@@ -1,4 +1,4 @@
<warning descr="Python version 2.4 doesn't support this syntax.">from . import smth</warning>
<warning descr="Python version 2.4 doesn't support this syntax.">from .module import name1, name2</warning>
<warning descr="Python version 3.0, 3.1 do not have module Bastion">from Bastion import BastionClass</warning>
from <warning descr="Python version 3.0, 3.1 do not have module Bastion">Bastion</warning> import BastionClass
python/testData/inspections/PyCompatibilityInspection/importElement.py
+1 -1
View File
@@ -1 +1 @@
<warning descr="Python version 3.0, 3.1 do not have module Bastion">import Bastion</warning>
import <warning descr="Python version 3.0, 3.1 do not have module Bastion">Bastion</warning>