1.1 --- a/ruby.hints/src/org/netbeans/modules/ruby/hints/RailsViews.java Sun Nov 24 15:33:07 2013 -0600
1.2 +++ b/ruby.hints/src/org/netbeans/modules/ruby/hints/RailsViews.java Sun Nov 24 15:46:13 2013 -0600
1.3 @@ -91,7 +91,7 @@
1.4 assert file.getName().endsWith("_controller"); // NOI18N
1.5
1.6 if (!(node instanceof MethodDefNode)) return;
1.7 - if (Arity.getDefArity((MethodDefNode) node).acceptsArgs()) return; // Methods with arguments aren't actions
1.8 + if (Arity.getArity((MethodDefNode) node).acceptsArgs()) return; // Methods with arguments aren't actions
1.9
1.10 String name = ((INameNode)node).getName();
1.11
2.1 --- a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/RubyElementCtx.java Sun Nov 24 15:33:07 2013 -0600
2.2 +++ b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/RubyElementCtx.java Sun Nov 24 15:46:13 2013 -0600
2.3 @@ -345,14 +345,14 @@
2.4 public Arity getArity() {
2.5 if (arity == null) {
2.6 if (node instanceof MethodDefNode) {
2.7 - arity = Arity.getDefArity((MethodDefNode) node);
2.8 + arity = Arity.getArity((MethodDefNode) node);
2.9 } else if (AstUtilities.isCall(node)) {
2.10 arity = Arity.getCallArity(node);
2.11 } else if (node instanceof ArgumentNode) {
2.12 AstPath _path = getPath();
2.13
2.14 if (_path.leafParent() instanceof MethodDefNode) {
2.15 - arity = Arity.getDefArity((MethodDefNode) _path.leafParent());
2.16 + arity = Arity.getArity((MethodDefNode) _path.leafParent());
2.17 }
2.18 }
2.19 }
3.1 --- a/ruby/src/org/netbeans/modules/ruby/Arity.java Sun Nov 24 15:33:07 2013 -0600
3.2 +++ b/ruby/src/org/netbeans/modules/ruby/Arity.java Sun Nov 24 15:46:13 2013 -0600
3.3 @@ -48,8 +48,6 @@
3.4 import org.jrubyparser.ast.ArgumentNode;
3.5 import org.jrubyparser.ast.ArrayNode;
3.6 import org.jrubyparser.ast.CallNode;
3.7 -import org.jrubyparser.ast.DefnNode;
3.8 -import org.jrubyparser.ast.DefsNode;
3.9 import org.jrubyparser.ast.FCallNode;
3.10 import org.jrubyparser.ast.ListNode;
3.11 import org.jrubyparser.ast.LocalAsgnNode;
3.12 @@ -188,7 +186,7 @@
3.13 }
3.14 }
3.15
3.16 - public static Arity getDefArity(MethodDefNode method) {
3.17 + public static Arity getArity(MethodDefNode method) {
3.18 Arity arity = new Arity(0, 0);
3.19
3.20 for (Node c : method.childNodes()) {
4.1 --- a/ruby/src/org/netbeans/modules/ruby/AstUtilities.java Sun Nov 24 15:33:07 2013 -0600
4.2 +++ b/ruby/src/org/netbeans/modules/ruby/AstUtilities.java Sun Nov 24 15:46:13 2013 -0600
4.3 @@ -492,7 +492,7 @@
4.4 public static MethodDefNode findMethod(Node node, String name, Arity arity) {
4.5 // Recursively search for methods or method calls that match the name and arity
4.6 if (node instanceof MethodDefNode && (((INameNode) node).getName()).equals(name) &&
4.7 - Arity.matches(arity, Arity.getDefArity((MethodDefNode) node))) return (MethodDefNode) node;
4.8 + Arity.matches(arity, Arity.getArity((MethodDefNode) node))) return (MethodDefNode) node;
4.9
4.10 for (Node child : node.childNodes()) {
4.11 MethodDefNode match = findMethod(child, name, arity);
4.12 @@ -723,7 +723,7 @@
4.13
4.14 // Simple call today...
4.15 return getDefName(method).equals(getCallName(call)) &&
4.16 - Arity.matches(callArity, Arity.getDefArity((MethodDefNode) method));
4.17 + Arity.matches(callArity, Arity.getArity((MethodDefNode) method));
4.18 }
4.19
4.20 // TODO: use the structure analyzer data for more accurate traversal?
5.1 --- a/ruby/src/org/netbeans/modules/ruby/RubyDeclarationFinder.java Sun Nov 24 15:33:07 2013 -0600
5.2 +++ b/ruby/src/org/netbeans/modules/ruby/RubyDeclarationFinder.java Sun Nov 24 15:46:13 2013 -0600
5.3 @@ -1996,7 +1996,7 @@
5.4 // Recursively search for methods or method calls that match the name and arity
5.5 if (node instanceof MethodDefNode) {
5.6 if (((MethodDefNode)node).getName().equals(name) &&
5.7 - Arity.matches(arity, Arity.getDefArity((MethodDefNode) node))) {
5.8 + Arity.matches(arity, Arity.getArity((MethodDefNode) node))) {
5.9 return getLocation(info, node);
5.10 }
5.11 } else if (!ignoreAlias && node instanceof AliasNode) {
6.1 --- a/ruby/src/org/netbeans/modules/ruby/RubyOccurrencesFinder.java Sun Nov 24 15:33:07 2013 -0600
6.2 +++ b/ruby/src/org/netbeans/modules/ruby/RubyOccurrencesFinder.java Sun Nov 24 15:46:13 2013 -0600
6.3 @@ -301,7 +301,7 @@
6.4
6.5 if (range.containsInclusive(astOffset)) {
6.6 String name = ((MethodDefNode)closest).getName();
6.7 - highlightMethod(root, name, Collections.singletonList(Arity.getDefArity((MethodDefNode) closest)), highlights);
6.8 + highlightMethod(root, name, Collections.singletonList(Arity.getArity((MethodDefNode) closest)), highlights);
6.9 }
6.10 } else if (closest instanceof Colon2Node) {
6.11 // A Class definition
6.12 @@ -656,7 +656,7 @@
6.13 Map<OffsetRange, ColoringAttributes> highlights) {
6.14 // Recursively search for methods or method calls that match the name and arity
6.15 if (node instanceof MethodDefNode && ((MethodDefNode)node).getName().equals(name)) {
6.16 - Arity defArity = Arity.getDefArity((MethodDefNode) node);
6.17 + Arity defArity = Arity.getArity((MethodDefNode) node);
6.18
6.19 for (Arity arity : arities) {
6.20 if (Arity.matches(arity, defArity)) {
6.21 @@ -694,7 +694,7 @@
6.22 private void findDefArities(List<Arity> defArities, Node node, String name, Arity callArity) {
6.23 // Recursively search for methods or method calls that match the name and arity
6.24 if (node instanceof MethodDefNode && ((MethodDefNode)node).getName().equals(name)) {
6.25 - Arity defArity = Arity.getDefArity((MethodDefNode) node);
6.26 + Arity defArity = Arity.getArity((MethodDefNode) node);
6.27
6.28 if (Arity.matches(callArity, defArity)) defArities.add(defArity);
6.29 }
7.1 --- a/ruby/src/org/netbeans/modules/ruby/RubyStructureAnalyzer.java Sun Nov 24 15:33:07 2013 -0600
7.2 +++ b/ruby/src/org/netbeans/modules/ruby/RubyStructureAnalyzer.java Sun Nov 24 15:46:13 2013 -0600
7.3 @@ -1189,8 +1189,8 @@
7.4
7.5 if ((kind == ElementKind.METHOD) || (kind == ElementKind.CONSTRUCTOR)) {
7.6 // consider also arity (#131134)
7.7 - Arity arity = Arity.getDefArity((MethodDefNode) node.getNode());
7.8 - Arity darity = Arity.getDefArity((MethodDefNode) d.node.getNode());
7.9 + Arity arity = Arity.getArity((MethodDefNode) node.getNode());
7.10 + Arity darity = Arity.getArity((MethodDefNode) d.node.getNode());
7.11 if (!arity.equals(darity) || !getModifiers().equals(d.getModifiers())) return false;
7.12
7.13 // consider parameters names and thus their arity (issue 101508)
7.14 @@ -1224,7 +1224,7 @@
7.15
7.16 if ((kind == ElementKind.METHOD) || (kind == ElementKind.CONSTRUCTOR)) {
7.17 // consider also arity
7.18 - Arity arity = Arity.getDefArity((MethodDefNode) node.getNode());
7.19 + Arity arity = Arity.getArity((MethodDefNode) node.getNode());
7.20 hash = 37 * hash + arity.hashCode();
7.21 }
7.22
8.1 --- a/ruby/test/unit/src/org/netbeans/modules/ruby/ArityTest.java Sun Nov 24 15:33:07 2013 -0600
8.2 +++ b/ruby/test/unit/src/org/netbeans/modules/ruby/ArityTest.java Sun Nov 24 15:46:13 2013 -0600
8.3 @@ -97,7 +97,7 @@
8.4 for (Node n : nodes) {
8.5 String name = ((INameNode)n).getName();
8.6 if (name.equals(methodName)) {
8.7 - assertEquals(arity, Arity.getDefArity((MethodDefNode) n));
8.8 + assertEquals(arity, Arity.getArity((MethodDefNode) n));
8.9 return;
8.10 }
8.11 }