Skip to content

Commit d2009be

Browse files
authored
Migrate String.join to StringUtil.join (#8703)
Replaces standard Java String.join with IntelliJ's StringUtil.join across the codebase (FlutterCommand, DaemonApi, TestFields, DevToolsUrl) to improve consistency with the platform API usage.
1 parent 3c437a0 commit d2009be

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/io/flutter/devtools/DevToolsUrl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.flutter.bazel.WorkspaceCache;
99
import io.flutter.sdk.FlutterSdkUtil;
1010
import io.flutter.sdk.FlutterSdkVersion;
11+
import com.intellij.openapi.util.text.StringUtil;
1112
import org.jetbrains.annotations.NotNull;
1213
import org.jetbrains.annotations.Nullable;
1314

@@ -211,7 +212,8 @@ public String getUrlString() {
211212
if (widgetId != null) {
212213
params.add("inspectorRef=" + widgetId);
213214
}
214-
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?" + String.join("&", params);
215+
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?"
216+
+ StringUtil.join(params, "&");
215217
}
216218

217219
public boolean maybeUpdateColor() {

src/io/flutter/run/daemon/DaemonApi.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.intellij.execution.process.ProcessOutputTypes;
1919
import com.intellij.openapi.diagnostic.Logger;
2020
import com.intellij.openapi.util.Key;
21+
import com.intellij.openapi.util.text.StringUtil;
2122
import io.flutter.logging.PluginLogger;
2223
import io.flutter.utils.JsonUtils;
2324
import io.flutter.utils.StdoutJsonParser;
@@ -236,7 +237,7 @@ private <T> CompletableFuture<T> send(String method, @Nullable Params<T> params)
236237
*/
237238
public String getStderrTail() {
238239
final String[] lines = stderr.toArray(new String[]{ });
239-
return String.join("", lines);
240+
return StringUtil.join(lines, "");
240241
}
241242

242243
/**

src/io/flutter/run/test/TestFields.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.intellij.openapi.vfs.LocalFileSystem;
1414
import com.intellij.openapi.vfs.VfsUtilCore;
1515
import com.intellij.openapi.vfs.VirtualFile;
16+
import com.intellij.openapi.util.text.StringUtil;
1617
import com.intellij.util.execution.ParametersListUtil;
1718
import io.flutter.pub.PubRoot;
1819
import io.flutter.run.FlutterDevice;
@@ -299,7 +300,7 @@ private String adjustArgs(@NotNull PubRoot root, @NotNull VirtualFile fileOrDir,
299300
}
300301
args.add(0, "-d");
301302
args.add(1, device.deviceId());
302-
return String.join(" ", args);
303+
return StringUtil.join(args, " ");
303304
}
304305

305306
private void checkSdk(@NotNull Project project) throws RuntimeConfigurationError {

src/io/flutter/sdk/FlutterCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.intellij.openapi.module.Module;
1414
import com.intellij.openapi.project.Project;
1515
import com.intellij.openapi.util.io.FileUtil;
16+
import com.intellij.openapi.util.text.StringUtil;
1617
import com.intellij.openapi.vfs.VirtualFile;
1718
import io.flutter.FlutterBundle;
1819
import io.flutter.FlutterMessages;
@@ -69,7 +70,7 @@ public class FlutterCommand {
6970
words.add("flutter");
7071
words.addAll(type.subCommand);
7172
words.addAll(args);
72-
return String.join(" ", words);
73+
return StringUtil.join(words, " ");
7374
}
7475

7576
/**
@@ -93,7 +94,7 @@ public String getSanitizedDisplayCommand() {
9394
}
9495

9596
words.addAll(newArgs);
96-
return String.join(" ", words);
97+
return StringUtil.join(words, " ");
9798
}
9899

99100
protected boolean isPubRelatedCommand() {

0 commit comments

Comments
 (0)