Unwrap else block after return or throw statement (#1028)

greg-at-moderne · TeamModerne · web-flow · commit 030ee82e9bbc · 2025-08-22T06:43:23.000+02:00
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UnwrapElseAfterReturn?organizationId=QUxML09wZW4gU291cmNlL09wZW5SZXdyaXRl Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java b/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java
@@ -273,9 +273,8 @@ private boolean isExcluded(Collection<PathMatcher> exclusionMatchers, Path path)
                     if (workingTreeIterator.getEntryFileMode().equals(FileMode.TREE)) {
                         if (workingTreeIterator.isEntryIgnored()) {
                             return true;
-                        } else {
-                            walk.enterSubtree();
                         }
+                        walk.enterSubtree();
                     }
                 }
             } catch (IOException e) {
diff --git a/src/main/java/org/openrewrite/maven/ResourceParser.java b/src/main/java/org/openrewrite/maven/ResourceParser.java
@@ -305,9 +305,8 @@ private boolean isExcluded(Path path) {
                     if (workingTreeIterator.getEntryFileMode().equals(FileMode.TREE)) {
                         if (workingTreeIterator.isEntryIgnored()) {
                             return true;
-                        } else {
-                            walk.enterSubtree();
                         }
+                        walk.enterSubtree();
                     }
                 }
             } catch (IOException e) {

Original file line number	Diff line number	Diff line change
`@@ -273,9 +273,8 @@ private boolean isExcluded(Collection<PathMatcher> exclusionMatchers, Path path)`
`273`	`273`	`if (workingTreeIterator.getEntryFileMode().equals(FileMode.TREE)) {`
`274`	`274`	`if (workingTreeIterator.isEntryIgnored()) {`
`275`	`275`	`return true;`
`276`		`- } else {`
`277`		`- walk.enterSubtree();`
`278`	`276`	`}`
	`277`	`+ walk.enterSubtree();`
`279`	`278`	`}`
`280`	`279`	`}`
`281`	`280`	`} catch (IOException e) {`
Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,8 @@ private boolean isExcluded(Path path) {`
`305`	`305`	`if (workingTreeIterator.getEntryFileMode().equals(FileMode.TREE)) {`
`306`	`306`	`if (workingTreeIterator.isEntryIgnored()) {`
`307`	`307`	`return true;`
`308`		`- } else {`
`309`		`- walk.enterSubtree();`
`310`	`308`	`}`
	`309`	`+ walk.enterSubtree();`
`311`	`310`	`}`
`312`	`311`	`}`
`313`	`312`	`} catch (IOException e) {`