Merge branch 'main' into tim/issue-7548

Author: timtebeek

rewrite-java/src/main/java/org/openrewrite/java/InlineMethodCalls.java

@@ -35,6 +35,7 @@
 @Value
 public class InlineMethodCalls extends Recipe {
     private static final Pattern TEMPLATE_IDENTIFIER = Pattern.compile("#\\{(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*):any\\(.*?\\)}");
+    private static final Pattern BARE_METHOD_CALL = Pattern.compile("^\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\(");
 
     @Option(displayName = "Method pattern",
             description = "A method pattern that is used to find matching method invocations.",
@@ -199,6 +200,11 @@ private String createTemplateString(MethodCall original, JavaType.Method methodT
                         ((J.MethodInvocation) original).getSelect() == null &&
                         replacement.startsWith("this.")) {
                     templateString = replacement.substring(5);
+                } else if (original instanceof J.MethodInvocation &&
+                        ((J.MethodInvocation) original).getSelect() != null &&
+                        BARE_METHOD_CALL.matcher(replacement).find()) {
+                    // Original had a select but replacement is a bare method call; preserve the select
+                    templateString = "#{this:any()}." + replacement;
                 } else {
                     templateString = replacement.replaceAll("\\bthis\\b", "#{this:any()}");
                 }

rewrite-java/src/test/java/org/openrewrite/java/InlineMethodCallsTest.java

@@ -508,6 +508,53 @@ void foo(Builder builder) {
         );
     }
 
+    @Test
+    void preserveSelectWhenReplacementIsBareMethodCall() {
+        //language=java
+        rewriteRun(
+          spec -> spec.recipe(new InlineMethodCalls(
+              "Lib getTotalHits()",
+              "getTotalHitsCount()",
+              null,
+              null,
+              null)),
+          java(
+            """
+              class Lib {
+                  @Deprecated
+                  public int getTotalHits() {
+                      return getTotalHitsCount();
+                  }
+
+                  public int getTotalHitsCount() {
+                      return 0;
+                  }
+
+                  static int usage(Lib lib) {
+                      return lib.getTotalHits();
+                  }
+              }
+              """,
+            """
+              class Lib {
+                  @Deprecated
+                  public int getTotalHits() {
+                      return getTotalHitsCount();
+                  }
+
+                  public int getTotalHitsCount() {
+                      return 0;
+                  }
+
+                  static int usage(Lib lib) {
+                      return lib.getTotalHitsCount();
+                  }
+              }
+              """
+          )
+        );
+    }
+
     @Test
     void sameArgumentUsedTwice() {
         //language=java

rewrite-javascript/build.gradle.kts

@@ -253,6 +253,24 @@ val npmPublish = tasks.register<NpmTask>("npmPublish") {
     }
 
     workingDir.set(file("rewrite"))
+
+    // npm has no `--skip-duplicate`; the daily scheduled publish would fail with a 403
+    // whenever no new commit had landed since the previous run (the snapshot version is
+    // derived from the latest commit timestamp). Skip the task if the version already exists.
+    onlyIf {
+        val versionToCheck = extractVersionFromJar() ?: datedSnapshotVersion
+        val process = ProcessBuilder("npm", "view", "@openrewrite/rewrite@$versionToCheck", "version")
+            .directory(file("rewrite"))
+            .redirectErrorStream(true)
+            .start()
+        process.waitFor()
+        val output = process.inputStream.bufferedReader().readText().trim()
+        val alreadyPublished = output.contains(versionToCheck)
+        if (alreadyPublished) {
+            logger.lifecycle("Skipping npmPublish: @openrewrite/rewrite@$versionToCheck already published")
+        }
+        !alreadyPublished
+    }
 }
 
 tasks.named("publish") {