Use URL encode and update test

Author: helin24

src/io/flutter/devtools/DevToolsUrl.java

@@ -37,6 +37,7 @@ public class DevToolsUrl {
   private final boolean canUseMultiEmbed;
 
   public final DevToolsIdeFeature ideFeature;
+  private final String ideName;
 
   @NotNull private final DevToolsUtils devToolsUtils;
 
@@ -53,6 +54,7 @@ public static class Builder {
     private @Nullable FlutterSdkVersion flutterSdkVersion;
     private WorkspaceCache workspaceCache;
     private DevToolsIdeFeature ideFeature;
+    private String ideName;
 
     private DevToolsUtils devToolsUtils;
 
@@ -133,6 +135,12 @@ public Builder setFlutterSdkUtil(FlutterSdkUtil flutterSdkUtil) {
       return this;
     }
 
+    @NotNull
+    public Builder setIdeName(String ideName) {
+      this.ideName = ideName;
+      return this;
+    }
+
     @NotNull
     public DevToolsUrl build() {
       if (devToolsUtils == null) {
@@ -164,6 +172,7 @@ private DevToolsUrl(Builder builder) {
     this.flutterSdkVersion = builder.flutterSdkVersion;
     this.ideFeature = builder.ideFeature;
     this.sdkUtil = builder.flutterSdkUtil;
+    this.ideName = builder.ideName != null ? builder.ideName : getIdeName();
 
     if (builder.workspaceCache != null && builder.workspaceCache.isBazel()) {
       this.canUseMultiEmbed = true;
@@ -182,9 +191,10 @@ public String getUrlString() {
     final List<String> params = new ArrayList<>();
 
     String ideValue = sdkUtil.getFlutterHostEnvValue();
-    params.add("ide=" + (ideValue == null ? UNKNOWN_INTELLIJ_NAME : ideValue));
+    String ideParamValue = ideValue == null ? UNKNOWN_INTELLIJ_NAME : ideValue;
+    params.add("ide=" + URLEncoder.encode(ideParamValue, StandardCharsets.UTF_8));
     params.add("dashTool=intellij-plugins");
-    params.add("dashIdeName=" + URLEncoder.encode(getIdeName(), StandardCharsets.UTF_8));
+    params.add("dashIdeName=" + URLEncoder.encode(this.ideName, StandardCharsets.UTF_8));
     if (colorHexCode != null) {
       params.add("backgroundColor=" + colorHexCode);
     }

testSrc/unit/io/flutter/devtools/DevToolsUrlTest.java

@@ -20,24 +20,25 @@ public void testGetUrlString() {
     DevToolsUrl.Builder builder = new DevToolsUrl.Builder()
       .setDevToolsHost("127.0.0.1")
       .setDevToolsPort(9100)
-      .setVmServiceUri("http://127.0.0.1:12345/abc=");
+      .setVmServiceUri("http://127.0.0.1:12345/abc=")
+      .setIdeName("Test IDE Name");
 
     // Mock FlutterSdkUtil to avoid calling real IntelliJ APIs which might fail in unit tests.
     builder.setFlutterSdkUtil(new FlutterSdkUtil() {
       @Override
       public String getFlutterHostEnvValue() {
-        return "TestIDE";
+        return "Test:IDE";
       }
     });
 
     DevToolsUrl devToolsUrl = builder.build();
     String url = devToolsUrl.getUrlString();
 
-    assertTrue(url.contains("ide=TestIDE"));
+    // Test:IDE encoded becomes Test%3AIDE
+    assertTrue(url.contains("ide=Test%3AIDE"));
     assertTrue(url.contains("dashTool=intellij-plugins"));
 
-    // We check that dashIdeName is present. We don't assert the exact value because it depends on the environment
-    // (whether ApplicationInfo is initialized or returns null).
-    assertTrue(url.contains("dashIdeName="));
+    // Test IDE Name encoded becomes Test+IDE+Name
+    assertTrue(url.contains("dashIdeName=Test+IDE+Name"));
   }
 }