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 branch 'master' of git.labs.intellij.net:idea/ultimate

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-05-17 11:31:21 +04:00
parent d5a7274bf2 a0273d04cf
commit 0308ee59f8
14 changed files with 84 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/generator3.py
+2 -2
View File
@@ -24,7 +24,7 @@ but seemingly no one uses them in C extensions yet anyway.
# * re.search-bound, ~30% time, in likes of builtins and _gtk with complex docstrings.
# None of this can seemingly be easily helped. Maybe there's a simpler and faster parser library?
VERSION = "1.87" # Must be a number-dot-number string, updated with each change that affects generated skeletons
VERSION = "1.88" # Must be a number-dot-number string, updated with each change that affects generated skeletons
# Note: DON'T FORGET TO UPDATE!
import sys
@@ -790,7 +790,7 @@ class ModuleRedeclarator(object):
(None, "range"): "(start=None, stop=None, step=None)", # suboptimal: allows empty arglist
(None, "filter"): "(function_or_none, sequence)",
(None, "iter"): "(source, sentinel=None)",
('frozenset', "__init__"): "(seq=())",
('frozenset', "__init__"): "(self, seq=())",
}
if version[0] < 3:
python/helpers/required_gen_version
+1 -1
View File
@@ -6,7 +6,7 @@
(default) 1.85 # anything not explicitly marked
(built-in) 1.87 # skeletons of all built-in modules are built together
(built-in) 1.88 # skeletons of all built-in modules are built together
# Note: modules like itertools, etc are "(built-in)" and are ignored if given separately
# pygame._numericsndarray 1.81
python/src/com/jetbrains/python/PyBundle.properties
+3 -3
View File
@@ -444,9 +444,9 @@ refactoring.extract.super.name.0.must.be.ident=Name ''{0}'' is invalid.<br/>Must
# move
refactoring.move.class.or.function=Move class or function
refactoring.move.class.or.function.dialog.title=Move Class or Function
refactoring.move.class.$0=Move class {0}
refactoring.move.function.$0=Move function {0}()
refactoring.move.selected.elements=Move selected elements
refactoring.move.class.$0=Move class {0} to file:
refactoring.move.function.$0=Move function {0}() to file:
refactoring.move.selected.elements=Move selected elements to file:
refactoring.move.class.or.function.choose.destination.file.title=Choose Destination File
refactoring.move.class.or.function.to.file=To file:
refactoring.move.class.or.function.error.cannot.place.elements.into.nonpython.file=Cannot place elements into a non-Python file
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+2 -21
View File
@@ -159,12 +159,12 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
@Override
public void visitPyNamedParameter(final PyNamedParameter node) {
final ReadWriteInstruction instruction = ReadWriteInstruction.write(myBuilder, node, node.getName());
myBuilder.addNode(instruction);
final PyExpression defaultValue = node.getDefaultValue();
if (defaultValue != null) {
defaultValue.accept(this);
}
final ReadWriteInstruction instruction = ReadWriteInstruction.write(myBuilder, node, node.getName());
myBuilder.addNode(instruction);
myBuilder.checkPending(instruction);
}
@@ -610,25 +610,6 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
@Override
public void visitPyLambdaExpression(final PyLambdaExpression node) {
myBuilder.startNode(node);
for (PyParameter parameter : node.getParameterList().getParameters()){
final PyExpression value = parameter.getDefaultValue();
if (value != null){
value.accept(this);
}
final PyNamedParameter namedParameter = parameter.getAsNamed();
if (namedParameter != null){
final PsiElement paramName = namedParameter.getFirstChild();
final ReadWriteInstruction instruction = ReadWriteInstruction.newInstruction(myBuilder, paramName,
parameter.getName(),
ReadWriteInstruction.ACCESS.WRITE);
myBuilder.addNode(instruction);
myBuilder.checkPending(instruction);
}
}
final PyExpression body = node.getBody();
if (body != null){
body.accept(this);
}
}
@Override
python/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java
+7 -1
View File
@@ -46,8 +46,14 @@ public class ScopeUtil {
@Nullable
public static ScopeOwner getDeclarationScopeOwner(PyReferenceExpression node) {
final String name = node.getName();
PsiElement element = node;
if (name != null) {
ScopeOwner owner = PsiTreeUtil.getParentOfType(node, ScopeOwner.class);
// References in default values of parameters are defined somewhere in outer scopes
if (PsiTreeUtil.getParentOfType(node, PyParameter.class) != null) {
element = PsiTreeUtil.getParentOfType(node, ScopeOwner.class);
}
ScopeOwner owner = PsiTreeUtil.getParentOfType(element, ScopeOwner.class);
while (owner != null) {
Scope scope = ControlFlowCache.getScope(owner);
if (scope.containsDeclaration(name)) {
python/src/com/jetbrains/python/inspections/PyUnboundLocalVariableInspection.java
+7 -2
View File
@@ -17,6 +17,7 @@ import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache;
import com.jetbrains.python.codeInsight.controlflow.ReadWriteInstruction;
import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
import com.jetbrains.python.codeInsight.dataflow.scope.Scope;
import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil;
import com.jetbrains.python.codeInsight.dataflow.scope.ScopeVariable;
import com.jetbrains.python.console.PydevConsoleRunner;
import com.jetbrains.python.psi.*;
@@ -56,8 +57,12 @@ public class PyUnboundLocalVariableInspection extends PyInspection {
if (PyImportStatementNavigator.getImportStatementByElement(node) != null){
return;
}
final ScopeOwner owner = PsiTreeUtil.getParentOfType(node, ScopeOwner.class);
if (owner == null){
final ScopeOwner owner = ScopeUtil.getDeclarationScopeOwner(node);
if (owner == null) {
return;
}
// Ignore references declared in outer scopes
if (owner != PsiTreeUtil.getParentOfType(node, ScopeOwner.class)) {
return;
}
final String name = node.getReferencedName();
python/src/com/jetbrains/python/inspections/PyUnusedLocalInspectionVisitor.java
+1 -1
View File
@@ -69,7 +69,7 @@ class PyUnusedLocalInspectionVisitor extends PyInspectionVisitor {
@Override
public void visitPyLambdaExpression(final PyLambdaExpression node) {
processScope(PsiTreeUtil.getParentOfType(node, ScopeOwner.class), node);
processScope(node, node);
}
static class DontPerformException extends RuntimeException {}
python/src/com/jetbrains/python/psi/PyLambdaExpression.java
+2 -1
View File
@@ -1,11 +1,12 @@
package com.jetbrains.python.psi;
import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public interface PyLambdaExpression extends PyExpression, Callable {
public interface PyLambdaExpression extends PyExpression, Callable, ScopeOwner {
@Nullable
PyExpression getBody();
}
python/src/com/jetbrains/python/psi/impl/PyLambdaExpressionImpl.java
+7
View File
@@ -6,6 +6,7 @@ import com.intellij.psi.ResolveState;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.types.PyType;
import com.jetbrains.python.psi.types.TypeEvalContext;
@@ -57,6 +58,12 @@ public class PyLambdaExpressionImpl extends PyElementImpl implements PyLambdaExp
return processParamLayer(parameters, processor, state, lastParent);
}
@Override
public void subtreeChanged() {
super.subtreeChanged();
ControlFlowCache.clear(this);
}
private boolean processParamLayer(@NotNull final PyParameter[] parameters,
@NotNull final PsiScopeProcessor processor,
@NotNull final ResolveState state,
python/src/com/jetbrains/python/refactoring/move/PyMoveClassOrFunctionDialog.java
+5
View File
@@ -80,6 +80,11 @@ public class PyMoveClassOrFunctionDialog extends RefactoringDialog {
close(OK_EXIT_CODE);
}
@Override
protected String getHelpId() {
return "refactoring.moveClass";
}
private static String getContainingFileName(PsiElement element) {
VirtualFile file = element.getContainingFile().getVirtualFile();
if (file != null) {
python/src/com/jetbrains/python/refactoring/move/PyMoveClassOrFunctionPanel.form
+4 -12
View File
@@ -6,11 +6,11 @@
<xy x="20" y="20" width="543" height="467"/>
</constraints>
<properties>
<preferredSize width="320" height="240"/>
<preferredSize width="320" height="160"/>
</properties>
<border type="none"/>
<children>
<grid id="38299" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="38299" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="5" left="5" bottom="5" right="5"/>
<constraints>
<grid row="0" column="0" row-span="4" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -20,7 +20,7 @@
<children>
<vspacer id="f71eb">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="e9a03" class="javax.swing.JLabel" binding="myElementsToMove">
@@ -33,18 +33,10 @@
</component>
<component id="2a1d8" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myBrowseTargetFileButton">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="7a408" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="com/jetbrains/python/PyBundle" key="refactoring.move.class.or.function.to.file"/>
</properties>
</component>
</children>
</grid>
</children>
python/testData/codeInsight/controlflow/function.py
+1 -1
View File
@@ -1,4 +1,4 @@
def help(object, spacing=10, collapse=1):
def help(object, spacing=foo, collapse=1):
"""Выводит методы и строки документации.
В качестве аргумента может использоваться модуль, класс, список, словарь
python/testData/codeInsight/controlflow/function.txt
+39 -42
View File
@@ -1,44 +1,41 @@
0(1) element: null
1(2) WRITE ACCESS: object
2(3) WRITE ACCESS: spacing
3(4) WRITE ACCESS: collapse
4(5) element: PyExpressionStatement
5(6) element: PyAssignmentStatement
6(7) element: PyListCompExpression
7(8) element: PyCallExpression: dir
8(9) READ ACCESS: dir
9(10,19) READ ACCESS: object
10(11) element: PyTargetExpression: method
11(12) WRITE ACCESS: method
12(13) element: PyCallExpression: callable
13(14) READ ACCESS: callable
14(15) READ ACCESS: getattr
15(16) READ ACCESS: object
16(10,17,19) READ ACCESS: method
17(18) element: PyReferenceExpression: method. Condition: callable(getattr(object, method)):true
18(10,19) READ ACCESS: method
19(20) WRITE ACCESS: methodList
20(21) element: PyAssignmentStatement
21(22) READ ACCESS: collapse
22(23) element: PyLambdaExpression
23(24) WRITE ACCESS: s
24(25) READ ACCESS: s
25(26) element: PyLambdaExpression
26(27) WRITE ACCESS: s
27(28) READ ACCESS: s
28(29) WRITE ACCESS: processFunc
29(30) element: PyPrintStatement
30(31) element: PyListCompExpression
31(32) element: PyReferenceExpression: methodList
32(33,43) READ ACCESS: methodList
33(34) element: PyTargetExpression: method
34(35) WRITE ACCESS: method
35(36) element: PyBinaryExpression
36(37) READ ACCESS: method
37(38) READ ACCESS: spacing
38(39) READ ACCESS: processFunc
39(40) READ ACCESS: str
40(41) READ ACCESS: getattr
41(42) READ ACCESS: object
42(33,43) READ ACCESS: method
43() element: null
2(3) READ ACCESS: foo
3(4) WRITE ACCESS: spacing
4(5) WRITE ACCESS: collapse
5(6) element: PyExpressionStatement
6(7) element: PyAssignmentStatement
7(8) element: PyListCompExpression
8(9) element: PyCallExpression: dir
9(10) READ ACCESS: dir
10(11,20) READ ACCESS: object
11(12) element: PyTargetExpression: method
12(13) WRITE ACCESS: method
13(14) element: PyCallExpression: callable
14(15) READ ACCESS: callable
15(16) READ ACCESS: getattr
16(17) READ ACCESS: object
17(11,18,20) READ ACCESS: method
18(19) element: PyReferenceExpression: method. Condition: callable(getattr(object, method)):true
19(11,20) READ ACCESS: method
20(21) WRITE ACCESS: methodList
21(22) element: PyAssignmentStatement
22(23) READ ACCESS: collapse
23(24) element: PyLambdaExpression
24(25) element: PyLambdaExpression
25(26) WRITE ACCESS: processFunc
26(27) element: PyPrintStatement
27(28) element: PyListCompExpression
28(29) element: PyReferenceExpression: methodList
29(30,40) READ ACCESS: methodList
30(31) element: PyTargetExpression: method
31(32) WRITE ACCESS: method
32(33) element: PyBinaryExpression
33(34) READ ACCESS: method
34(35) READ ACCESS: spacing
35(36) READ ACCESS: processFunc
36(37) READ ACCESS: str
37(38) READ ACCESS: getattr
38(39) READ ACCESS: object
39(30,40) READ ACCESS: method
40() element: null
python/testData/codeInsight/controlflow/lambda.txt
+3 -6
View File
@@ -2,12 +2,9 @@
1(2) element: PyExpressionStatement
2(3) element: PySetCompExpression
3(4) element: PyCallExpression: range
4(5,12) READ ACCESS: range
4(5,9) READ ACCESS: range
5(6) element: PyTargetExpression: i
6(7) WRITE ACCESS: i
7(8) element: PyParenthesizedExpression
8(9) element: PyLambdaExpression
9(10) READ ACCESS: i
10(11) WRITE ACCESS: i
11(5,12) READ ACCESS: i
12() element: null
8(5,9) element: PyLambdaExpression
9() element: null