Skip to content

Fix warning to convert DevToolsInstance class to a record #7927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Fix warning to convert DevToolsInstance class to a record #7927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27065e1
Fix warning to convert DevToolsInstance class to a record
kenzieschmoll Feb 4, 2025
01ff54f
add missing import
kenzieschmoll Feb 4, 2025
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: 2 additions & 2 deletions flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
}

final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
.setDevToolsHost(instance.host)
.setDevToolsPort(instance.port)
.setDevToolsHost(instance.host())
.setDevToolsPort(instance.port())
.setPage("deep-links")
.setEmbed(true)
.setFlutterSdkVersion(sdkVersion)
Expand Down
4 changes: 2 additions & 2 deletions flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
}

final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
.setDevToolsHost(instance.host)
.setDevToolsPort(instance.port)
.setDevToolsHost(instance.host())
.setDevToolsPort(instance.port())
.setHide("all-except-extensions")
.setEmbed(true).setFlutterSdkVersion(sdkVersion)
.setWorkspaceCache(WorkspaceCache.getInstance(project))
Expand Down
4 changes: 2 additions & 2 deletions flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
}

final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
.setDevToolsHost(instance.host)
.setDevToolsPort(instance.port)
.setDevToolsHost(instance.host())
.setDevToolsPort(instance.port())
.setHide("home,inspector,deep-links,extensions")
.setEmbed(true).setFlutterSdkVersion(sdkVersion)
.setWorkspaceCache(WorkspaceCache.getInstance(project))
Expand Down
26 changes: 13 additions & 13 deletions flutter-idea/src/io/flutter/run/OpenDevToolsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Objects;

public class OpenDevToolsAction extends DumbAwareAction {
private static final Logger LOG = Logger.getInstance(OpenDevToolsAction.class);
private static final String title = "Open Flutter DevTools in Browser";
Expand Down Expand Up @@ -68,7 +70,7 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
return;
}

AsyncUtils.whenCompleteUiThread(DevToolsService.getInstance(project).getDevToolsInstance(), (instance, ex) -> {
AsyncUtils.whenCompleteUiThread(Objects.requireNonNull(DevToolsService.getInstance(project).getDevToolsInstance()), (instance, ex) -> {
if (project.isDisposed()) {
return;
}
Expand All @@ -81,18 +83,16 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
final String serviceUrl = myConnector != null && myConnector.getBrowserUrl() != null ? myConnector.getBrowserUrl() : null;

FlutterSdk flutterSdk = FlutterSdk.getFlutterSdk(project);
BrowserLauncher.getInstance().browse(
new DevToolsUrl.Builder()
.setDevToolsHost(instance.host)
.setDevToolsPort(instance.port)
.setVmServiceUri(serviceUrl)
.setFlutterSdkVersion(flutterSdk == null ? null : flutterSdk.getVersion())
.setWorkspaceCache(WorkspaceCache.getInstance(project))
.setIdeFeature(DevToolsIdeFeature.RUN_CONSOLE)
.build()
.getUrlString(),
null
);
assert instance != null;
final String devToolsUrl = new DevToolsUrl.Builder().setDevToolsHost(instance.host())
.setDevToolsPort(instance.port())
.setVmServiceUri(serviceUrl)
.setFlutterSdkVersion(flutterSdk == null ? null : flutterSdk.getVersion())
.setWorkspaceCache(WorkspaceCache.getInstance(project))
.setIdeFeature(DevToolsIdeFeature.RUN_CONSOLE)
.build()
.getUrlString();
BrowserLauncher.getInstance().browse(devToolsUrl,null);
});
}
}
2 changes: 1 addition & 1 deletion flutter-idea/src/io/flutter/run/SdkFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public GeneralCommandLine createFlutterSdkRunCommand(
}
}, "Starting DevTools", false, project);
final DevToolsInstance instance = devToolsFuture.get();
args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host + ":" + instance.port);
args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host() + ":" + instance.port());
}
catch (Exception e) {
LOG.info(e);
Expand Down
2 changes: 1 addition & 1 deletion flutter-idea/src/io/flutter/run/bazel/BazelFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ else if (FlutterSettings.getInstance().isEnableBazelHotRestart() && !hasEnabledA
}
}, "Starting DevTools", false, project);
final DevToolsInstance instance = devToolsFuture.get();
commandLine.addParameter("--devtools-server-address=http://" + instance.host + ":" + instance.port);
commandLine.addParameter("--devtools-server-address=http://" + instance.host() + ":" + instance.port());
}
catch (Exception e) {
LOG.info(e);
Expand Down
9 changes: 1 addition & 8 deletions flutter-idea/src/io/flutter/run/daemon/DevToolsInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@
*/
package io.flutter.run.daemon;

public class DevToolsInstance {
final public String host;
final public int port;

public DevToolsInstance(String host, int port) {
this.host = host;
this.port = port;
}
public record DevToolsInstance(String host, int port) {
}
8 changes: 4 additions & 4 deletions flutter-idea/src/io/flutter/view/FlutterView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ private void addBrowserInspectorViewContent(FlutterApp app,

if (isEmbedded) {
final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
.setDevToolsHost(devToolsInstance.host)
.setDevToolsPort(devToolsInstance.port)
.setDevToolsHost(devToolsInstance.host())
.setDevToolsPort(devToolsInstance.port())
.setVmServiceUri(browserUrl)
.setPage("inspector")
.setEmbed(true)
Expand Down Expand Up @@ -200,8 +200,8 @@ private void addBrowserInspectorViewContent(FlutterApp app,
else {
BrowserLauncher.getInstance().browse(
new DevToolsUrl.Builder()
.setDevToolsHost(devToolsInstance.host)
.setDevToolsPort(devToolsInstance.port)
.setDevToolsHost(devToolsInstance.host())
.setDevToolsPort(devToolsInstance.port())
.setVmServiceUri(browserUrl)
.setPage("inspector")
.setFlutterSdkVersion(flutterSdkVersion)
Expand Down