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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-14 18:37:59 +02:00
parent 14c84a4646 346ea963ea
commit 20b193d0b6
9 changed files with 71 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/generator3.py
+4
View File
@@ -2244,6 +2244,10 @@ def cut_binary_lib_suffix(path, f):
m = BIN_MODULE_FNAME_PAT.match(f)
if m:
ret = m.group(1)
modlen = len('module')
retlen = len(ret)
if ret.endswith('module') and retlen > modlen and f.endswith('.so'):
ret = ret[:(retlen - modlen)]
if f.endswith('.pyc') or f.endswith('.pyo'):
fullname = os.path.join(path, f[:-1]) # check for __pycache__ is made outside
if os.path.exists(fullname):
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+3 -2
View File
@@ -334,8 +334,9 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
if (list != null) {
myBuilder.startConditionalNode(list, condition, true);
list.accept(this);
if (myBuilder.prevInstruction != null) {
myBuilder.addEdge(myBuilder.prevInstruction, instruction); //loop
final Instruction prevInstruction = myBuilder.prevInstruction != null ? myBuilder.prevInstruction : getPrevInstruction(list);
if (prevInstruction != null) {
myBuilder.addEdge(prevInstruction, instruction); //loop
}
}
myBuilder.prevInstruction = head;
python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java
+14 -10
View File
@@ -2,26 +2,30 @@ package com.jetbrains.python.debugger;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyNamedParameter;
import com.jetbrains.python.psi.PyParameterList;
import com.jetbrains.python.psi.impl.PyWeakTypeFactory;
import com.jetbrains.python.psi.types.*;
import com.jetbrains.python.psi.types.PyType;
import com.jetbrains.python.psi.types.PyTypeParser;
import com.jetbrains.python.psi.types.PyTypeProviderBase;
import com.jetbrains.python.psi.types.TypeEvalContext;
import org.jetbrains.annotations.Nullable;
/**
* @author traff
*/
public class PyCallSignatureTypeProvider extends PyTypeProviderBase {
public PyType getParameterType(final PyNamedParameter param, final PyFunction func, TypeEvalContext context) {
if (!(param.getParent() instanceof PyParameterList)) return null;
String type = ((PySignatureCacheManagerImpl)PySignatureCacheManager.getInstance(param.getProject())).findParameterType(param);
if (type != null) {
PyType typeByName = PyTypeParser.getTypeByName(param, type);
return buildWeakType(typeByName);
}
else {
return null;
final String name = param.getName();
if (name != null) {
final String type = ((PySignatureCacheManagerImpl)PySignatureCacheManager.getInstance(param.getProject())).findParameterType(func, name);
if (type != null) {
final PyType typeByName = PyTypeParser.getTypeByName(param, type);
return buildWeakType(typeByName);
}
}
return null;
}
@Nullable
private static PyType buildWeakType(PyType type) {
return PyWeakTypeFactory.create(type);
}
python/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java
+4 -9
View File
@@ -9,11 +9,9 @@ import com.intellij.openapi.vfs.newvfs.FileAttribute;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.ProjectScopeBuilder;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.django.util.VirtualFileUtil;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyNamedParameter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -103,13 +101,10 @@ public class PySignatureCacheManagerImpl extends PySignatureCacheManager {
}
@Nullable
public static String findParameterType(@NotNull PyNamedParameter parameter) {
PyFunction function = PsiTreeUtil.getParentOfType(parameter, PyFunction.class);
if (function != null) {
PySignature signature = findSignature(function);
if (signature != null) {
return signature.getArgType(parameter.getName());
}
public static String findParameterType(@NotNull PyFunction function, @NotNull String name) {
final PySignature signature = findSignature(function);
if (signature != null) {
return signature.getArgType(name);
}
return null;
}
python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
+6 -11
View File
@@ -111,9 +111,6 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
@Nullable PyExpression location,
@NotNull AccessDirection direction,
@NotNull PyResolveContext resolveContext) {
if (myClass == null) {
return null;
}
if (resolveContext.allowProperties()) {
Property property = myClass.findProperty(name);
if (property != null) {
@@ -141,14 +138,12 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
PyType first_arg_type = first_arg.getType(resolveContext.getTypeEvalContext());
if (first_arg_type instanceof PyClassType) {
PyClass derived_class = ((PyClassType)first_arg_type).getPyClass();
if (derived_class != null) {
final Iterator<PyClass> base_it = derived_class.iterateAncestorClasses().iterator();
if (base_it.hasNext()) {
return new PyClassTypeImpl(base_it.next(), true).resolveMember(name, location, direction, resolveContext);
}
else {
return null; // no base classes = super() cannot proxy anything meaningful from a base class
}
final Iterator<PyClass> base_it = derived_class.iterateAncestorClasses().iterator();
if (base_it.hasNext()) {
return new PyClassTypeImpl(base_it.next(), true).resolveMember(name, location, direction, resolveContext);
}
else {
return null; // no base classes = super() cannot proxy anything meaningful from a base class
}
}
}
python/src/com/jetbrains/python/psi/types/PyTypeChecker.java
+19 -18
View File
@@ -323,24 +323,25 @@ public class PyTypeChecker {
if (resolved instanceof PyTypedElement) {
final PyTypedElement typedElement = (PyTypedElement)resolved;
final PyType type = typedElement.getType(context);
if (type instanceof PyFunctionType) {
final PyFunction function = ((PyFunctionType)type).getFunction();
final boolean isRight = PyNames.isRightOperatorName(typedElement.getName());
final PyExpression arg = isRight ? expr.getLeftExpression() : expr.getRightExpression();
final PyExpression receiver = isRight ? expr.getRightExpression() : expr.getLeftExpression();
final PyParameter[] parameters = function.getParameterList().getParameters();
if (parameters.length >= 2) {
final PyNamedParameter param = parameters[1].getAsNamed();
if (arg != null && param != null) {
final Map<PyExpression, PyNamedParameter> arguments = new LinkedHashMap<PyExpression, PyNamedParameter>();
arguments.put(arg, param);
final AnalyzeCallResults results = new AnalyzeCallResults(function, receiver, arguments);
if (firstResults == null) {
firstResults = results;
}
if (match(param.getType(context), arg.getType(context), context)) {
return results;
}
if (!(type instanceof PyFunctionType)) {
return null;
}
final PyFunction function = ((PyFunctionType)type).getFunction();
final boolean isRight = PyNames.isRightOperatorName(typedElement.getName());
final PyExpression arg = isRight ? expr.getLeftExpression() : expr.getRightExpression();
final PyExpression receiver = isRight ? expr.getRightExpression() : expr.getLeftExpression();
final PyParameter[] parameters = function.getParameterList().getParameters();
if (parameters.length >= 2) {
final PyNamedParameter param = parameters[1].getAsNamed();
if (arg != null && param != null) {
final Map<PyExpression, PyNamedParameter> arguments = new LinkedHashMap<PyExpression, PyNamedParameter>();
arguments.put(arg, param);
final AnalyzeCallResults results = new AnalyzeCallResults(function, receiver, arguments);
if (firstResults == null) {
firstResults = results;
}
if (match(param.getType(context), arg.getType(context), context)) {
return results;
}
}
}
python/testData/inspections/PyTypeCheckerInspection/AssignedOperator.py
+8
View File
@@ -0,0 +1,8 @@
def f(x):
return x
class C(object):
__div__, __rdiv__ = f(0)
c = C()
print(c / 2)
python/testData/inspections/PyUnusedLocalVariableInspection/test.py
+8
View File
@@ -286,3 +286,11 @@ class C:
# PY-7126
def test_unused_empty_function(<weak_warning descr="Parameter 'x' value is not used">x</weak_warning>):
pass
# PY-7072
def test_unused_variable_in_cycle(x, c):
while x > 0:
x -= 1 #pass
if c:
break
python/testSrc/com/jetbrains/python/inspections/PyTypeCheckerInspectionTest.java
+5
View File
@@ -135,4 +135,9 @@ public class PyTypeCheckerInspectionTest extends PyTestCase {
public void testDecoratedFunction() {
doTest();
}
// PY-6925
public void testAssignedOperator() {
doTest();
}
}