Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/io/flutter/devtools/DevToolsUrl.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.flutter.bazel.WorkspaceCache;
import io.flutter.sdk.FlutterSdkUtil;
import io.flutter.sdk.FlutterSdkVersion;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -211,7 +212,8 @@ public String getUrlString() {
if (widgetId != null) {
params.add("inspectorRef=" + widgetId);
}
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?" + String.join("&", params);
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?"
+ StringUtil.join(params, "&");
}

public boolean maybeUpdateColor() {
Expand Down
3 changes: 2 additions & 1 deletion src/io/flutter/run/daemon/DaemonApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.intellij.execution.process.ProcessOutputTypes;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import io.flutter.logging.PluginLogger;
import io.flutter.utils.JsonUtils;
import io.flutter.utils.StdoutJsonParser;
Expand Down Expand Up @@ -236,7 +237,7 @@ private <T> CompletableFuture<T> send(String method, @Nullable Params<T> params)
*/
public String getStderrTail() {
final String[] lines = stderr.toArray(new String[]{ });
return String.join("", lines);
return StringUtil.join(lines, "");
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/io/flutter/run/test/TestFields.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.execution.ParametersListUtil;
import io.flutter.pub.PubRoot;
import io.flutter.run.FlutterDevice;
Expand Down Expand Up @@ -299,7 +300,7 @@ private String adjustArgs(@NotNull PubRoot root, @NotNull VirtualFile fileOrDir,
}
args.add(0, "-d");
args.add(1, device.deviceId());
return String.join(" ", args);
return StringUtil.join(args, " ");
}

private void checkSdk(@NotNull Project project) throws RuntimeConfigurationError {
Expand Down
5 changes: 3 additions & 2 deletions src/io/flutter/sdk/FlutterCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import io.flutter.FlutterBundle;
import io.flutter.FlutterMessages;
Expand Down Expand Up @@ -69,7 +70,7 @@ public class FlutterCommand {
words.add("flutter");
words.addAll(type.subCommand);
words.addAll(args);
return String.join(" ", words);
return StringUtil.join(words, " ");
}

/**
Expand All @@ -93,7 +94,7 @@ public String getSanitizedDisplayCommand() {
}

words.addAll(newArgs);
return String.join(" ", words);
return StringUtil.join(words, " ");
}

protected boolean isPubRelatedCommand() {
Expand Down
Loading