fix(matching): Ignore modifiers when building method signature (#57)

jpedroh · Jun 9, 2024 · 26dbc22 · 26dbc22
1 parent 4fccfbd
commit 26dbc22
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/bin/tests/scenarios/method_parameters_differ_on_final_keyword/base.java b/bin/tests/scenarios/method_parameters_differ_on_final_keyword/base.java
@@ -0,0 +1,3 @@
+public abstract class Artifact {
+    public abstract T addChild(final T child) throws IOException;
+}
diff --git a/bin/tests/scenarios/method_parameters_differ_on_final_keyword/left.java b/bin/tests/scenarios/method_parameters_differ_on_final_keyword/left.java
@@ -0,0 +1,3 @@
+public abstract class Artifact {
+    public abstract T addChild(final T child);
+}
diff --git a/bin/tests/scenarios/method_parameters_differ_on_final_keyword/merge.java b/bin/tests/scenarios/method_parameters_differ_on_final_keyword/merge.java
@@ -0,0 +1 @@
+public abstract class Artifact  {   public abstract T addChild  (  T child ) ; }
diff --git a/bin/tests/scenarios/method_parameters_differ_on_final_keyword/right.java b/bin/tests/scenarios/method_parameters_differ_on_final_keyword/right.java
@@ -0,0 +1,3 @@
+public abstract class Artifact {
+    public abstract T addChild(T child);
+}
diff --git a/matching_handlers/src/java/method_declaration.rs b/matching_handlers/src/java/method_declaration.rs
@@ -54,7 +54,7 @@ fn extract_argument_types_from_formal_parameters(node: &CSTNode) -> Vec<String>
                     non_terminal
                         .children
                         .iter()
-                        .filter(|node| node.kind() != "identifier")
+                        .filter(|node| node.kind() != "modifiers" && node.kind() != "identifier")
                         .fold(String::new(), |acc, cur| {
                             format!("{} {}", acc, cur.contents())
                         }),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		public abstract class Artifact { public abstract T addChild ( T child ) ; }