File tree Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Original file line number Diff line number Diff line change @@ -145,13 +145,16 @@ class Dwds {
145
145
debugSettings.useSseForInjectedClient,
146
146
debugSettings.expressionCompiler,
147
147
injected,
148
- debugSettings.ddsConfiguration.copyWith (
148
+ DartDevelopmentServiceConfiguration (
149
+ // This technically isn't correct, but DartDevelopmentServiceConfiguration.enable
150
+ // is true by default, so this won't break unmigrated tools.
149
151
// ignore: deprecated_member_use_from_same_package
150
- enable: debugSettings.spawnDds,
152
+ enable: debugSettings.spawnDds && debugSettings.ddsConfiguration.enable ,
151
153
// ignore: deprecated_member_use_from_same_package
152
- port: debugSettings.ddsPort,
153
- // TODO(bkonyi): only allow for DDS to serve DevTools.
154
- devToolsServerAddress: launchedDevToolsUri,
154
+ port: debugSettings.ddsPort ?? debugSettings.ddsConfiguration.port,
155
+ devToolsServerAddress:
156
+ launchedDevToolsUri ??
157
+ debugSettings.ddsConfiguration.devToolsServerAddress,
155
158
),
156
159
debugSettings.launchDevToolsInNewWindow,
157
160
useWebSocketConnection: useDwdsWebSocketConnection,
Original file line number Diff line number Diff line change @@ -59,21 +59,6 @@ class DartDevelopmentServiceConfiguration {
59
59
this .devToolsServerAddress,
60
60
});
61
61
62
- DartDevelopmentServiceConfiguration copyWith ({
63
- bool ? enable,
64
- int ? port,
65
- bool ? serveDevTools,
66
- Uri ? devToolsServerAddress,
67
- }) {
68
- return DartDevelopmentServiceConfiguration (
69
- enable: enable ?? this .enable,
70
- port: port ?? this .port,
71
- serveDevTools: serveDevTools ?? this .serveDevTools,
72
- devToolsServerAddress:
73
- devToolsServerAddress ?? this .devToolsServerAddress,
74
- );
75
- }
76
-
77
62
final bool enable;
78
63
final int ? port;
79
64
final bool serveDevTools;
You can’t perform that action at this time.
0 commit comments