Skip to content

Commit 95d3c8a

Browse files
authored
Remove unsupported DevTools path URL code (#8287)
This was for older SDK versions
1 parent bc8fc55 commit 95d3c8a

File tree

3 files changed

+3
-37
lines changed

3 files changed

+3
-37
lines changed

flutter-idea/src/io/flutter/devtools/DevToolsUrl.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class DevToolsUrl {
3030
private final FlutterSdkVersion flutterSdkVersion;
3131
private final FlutterSdkUtil sdkUtil;
3232

33-
private final boolean canUseDevToolsPathUrl;
3433
private final boolean canUseMultiEmbed;
3534

3635
public final DevToolsIdeFeature ideFeature;
@@ -163,15 +162,12 @@ private DevToolsUrl(Builder builder) {
163162
this.sdkUtil = builder.flutterSdkUtil;
164163

165164
if (builder.workspaceCache != null && builder.workspaceCache.isBazel()) {
166-
this.canUseDevToolsPathUrl = true;
167165
this.canUseMultiEmbed = true;
168166
}
169167
else if (flutterSdkVersion != null) {
170-
this.canUseDevToolsPathUrl = flutterSdkVersion.canUseDevToolsPathUrls();
171168
this.canUseMultiEmbed = flutterSdkVersion.canUseDevToolsMultiEmbed();
172169
}
173170
else {
174-
this.canUseDevToolsPathUrl = false;
175171
this.canUseMultiEmbed = false;
176172
}
177173
}
@@ -183,9 +179,6 @@ public String getUrlString() {
183179

184180
String ideValue = sdkUtil.getFlutterHostEnvValue();
185181
params.add("ide=" + (ideValue == null ? "IntelliJPluginUnknown" : ideValue));
186-
if (page != null && !this.canUseDevToolsPathUrl) {
187-
params.add("page=" + page);
188-
}
189182
if (colorHexCode != null) {
190183
params.add("backgroundColor=" + colorHexCode);
191184
}
@@ -218,12 +211,7 @@ public String getUrlString() {
218211
if (widgetId != null) {
219212
params.add("inspectorRef=" + widgetId);
220213
}
221-
if (this.canUseDevToolsPathUrl) {
222-
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?" + String.join("&", params);
223-
}
224-
else {
225-
return "http://" + devToolsHost + ":" + devToolsPort + "/#/?" + String.join("&", params);
226-
}
214+
return "http://" + devToolsHost + ":" + devToolsPort + "/" + (page != null ? page : "") + "?" + String.join("&", params);
227215
}
228216

229217
public void maybeUpdateColor() {

flutter-idea/src/io/flutter/sdk/FlutterSdkVersion.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public final class FlutterSdkVersion implements Comparable<FlutterSdkVersion> {
4242
@NotNull
4343
public static final FlutterSdkVersion MIN_SDK_WITHOUT_SUNSET_WARNING = new FlutterSdkVersion("3.16");
4444

45-
@NotNull
46-
private static final FlutterSdkVersion MIN_SUPPORTS_DEVTOOLS_PATH_URLS = new FlutterSdkVersion("3.3.0");
47-
4845
@NotNull
4946
private static final FlutterSdkVersion MIN_SUPPORTS_TOOL_EVENT_STREAM = new FlutterSdkVersion("3.7.1");
5047

@@ -132,10 +129,6 @@ private boolean supportsVersion(@NotNull FlutterSdkVersion otherVersion) {
132129
return this.compareTo(otherVersion) >= 0;
133130
}
134131

135-
public boolean canUseDevToolsPathUrls() {
136-
return supportsVersion(MIN_SUPPORTS_DEVTOOLS_PATH_URLS);
137-
}
138-
139132
public boolean canUseToolEventStream() {
140133
return supportsVersion(MIN_SUPPORTS_TOOL_EVENT_STREAM);
141134
}

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,24 +96,9 @@ public void testGetUrlStringWithoutColor() {
9696
.getUrlString()
9797
);
9898

99-
FlutterSdkVersion oldVersion = new FlutterSdkVersion("3.0.0");
99+
// No Flutter SDK version set
100100
assertEquals(
101-
"http://127.0.0.1:9100/#/?ide=Android-Studio&page=timeline&uri=http%3A%2F%2F127.0.0.1%3A50224%2FWTFTYus3IPU%3D%2F",
102-
new DevToolsUrl.Builder()
103-
.setDevToolsHost(devtoolsHost)
104-
.setDevToolsPort(devtoolsPort)
105-
.setVmServiceUri(serviceProtocolUri)
106-
.setPage(page)
107-
.setFlutterSdkVersion(oldVersion)
108-
.setWorkspaceCache(notBazelWorkspaceCache)
109-
.setFlutterSdkUtil(mockSdkUtil)
110-
.setDevToolsUtils(noColorUtils)
111-
.build()
112-
.getUrlString()
113-
);
114-
115-
assertEquals(
116-
"http://127.0.0.1:9100/#/?ide=Android-Studio&page=timeline&uri=http%3A%2F%2F127.0.0.1%3A50224%2FWTFTYus3IPU%3D%2F",
101+
"http://127.0.0.1:9100/timeline?ide=Android-Studio&uri=http%3A%2F%2F127.0.0.1%3A50224%2FWTFTYus3IPU%3D%2F",
117102
new DevToolsUrl.Builder()
118103
.setDevToolsHost(devtoolsHost)
119104
.setDevToolsPort(devtoolsPort)

0 commit comments

Comments
 (0)