Skip to content

Commit 059326d

Browse files
auto-submit[bot]auto-submit[bot]
and
auto-submit[bot]
authored
Reverts "[ Widget Preview ] Add initial support for communications over the Dart Tooling Daemon (DTD) (flutter#166698)" (flutter#166866)
<!-- start_original_pr_link --> Reverts: flutter#166698 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: jonahwilliams <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: tests are timing out in presubmit <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: bkonyi <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {jyameo} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: This will eventually be used as the main communication channel between the widget preview scaffold, the Flutter tool, and other developer tooling (e.g., IDEs). Fixes flutter#166417 <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 4ab2102 commit 059326d

File tree

14 files changed

+3
-305
lines changed

14 files changed

+3
-305
lines changed

Diff for: packages/flutter_tools/lib/executable.dart

-2
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ List<FlutterCommand> generateCommands({required bool verboseHelp, required bool
258258
platform: globals.platform,
259259
shutdownHooks: globals.shutdownHooks,
260260
os: globals.os,
261-
processManager: globals.processManager,
262-
artifacts: globals.artifacts!,
263261
),
264262
UpgradeCommand(verboseHelp: verboseHelp),
265263
SymbolizeCommand(stdio: globals.stdio, fileSystem: globals.fs),

Diff for: packages/flutter_tools/lib/src/commands/widget_preview.dart

-56
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import 'package:args/args.dart';
66
import 'package:meta/meta.dart';
77
import 'package:package_config/package_config.dart';
8-
import 'package:process/process.dart';
98

10-
import '../artifacts.dart';
119
import '../base/common.dart';
1210
import '../base/deferred_component.dart';
1311
import '../base/file_system.dart';
@@ -26,8 +24,6 @@ import '../linux/build_linux.dart';
2624
import '../macos/build_macos.dart';
2725
import '../project.dart';
2826
import '../runner/flutter_command.dart';
29-
import '../runner/flutter_command_runner.dart';
30-
import '../widget_preview/dtd_services.dart';
3127
import '../widget_preview/preview_code_generator.dart';
3228
import '../widget_preview/preview_detector.dart';
3329
import '../widget_preview/preview_manifest.dart';
@@ -45,8 +41,6 @@ class WidgetPreviewCommand extends FlutterCommand {
4541
required Platform platform,
4642
required ShutdownHooks shutdownHooks,
4743
required OperatingSystemUtils os,
48-
required ProcessManager processManager,
49-
required Artifacts artifacts,
5044
}) {
5145
addSubcommand(
5246
WidgetPreviewStartCommand(
@@ -58,8 +52,6 @@ class WidgetPreviewCommand extends FlutterCommand {
5852
platform: platform,
5953
shutdownHooks: shutdownHooks,
6054
os: os,
61-
processManager: processManager,
62-
artifacts: artifacts,
6355
),
6456
);
6557
addSubcommand(
@@ -126,8 +118,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
126118
required this.platform,
127119
required this.shutdownHooks,
128120
required this.os,
129-
required this.processManager,
130-
required this.artifacts,
131121
}) {
132122
addPubOptions();
133123
argParser
@@ -162,9 +152,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
162152
static const String kHeadlessWeb = 'headless-web';
163153
static const String kWidgetPreviewScaffoldOutputDir = 'scaffold-output-dir';
164154

165-
/// Environment variable used to pass the DTD URI to the widget preview scaffold.
166-
static const String kWidgetPreviewDtdUriEnvVar = 'WIDGET_PREVIEW_DTD_URI';
167-
168155
@override
169156
Future<Set<DevelopmentArtifact>> get requiredArtifacts async => const <DevelopmentArtifact>{
170157
// Ensure the Flutter Web SDK is installed.
@@ -198,10 +185,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
198185

199186
final OperatingSystemUtils os;
200187

201-
final ProcessManager processManager;
202-
203-
final Artifacts artifacts;
204-
205188
late final FlutterProject rootProject = getRootProject();
206189

207190
late final PreviewDetector _previewDetector = PreviewDetector(
@@ -220,12 +203,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
220203
cache: cache,
221204
);
222205

223-
late final WidgetPreviewDtdServices _dtdService = WidgetPreviewDtdServices(
224-
logger: logger,
225-
shutdownHooks: shutdownHooks,
226-
dtdLauncher: DtdLauncher(logger: logger, artifacts: artifacts, processManager: processManager),
227-
);
228-
229206
/// The currently running instance of the widget preview scaffold.
230207
AppInstance? _widgetPreviewApp;
231208

@@ -307,7 +284,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
307284
shutdownHooks.addShutdownHook(() async {
308285
await _widgetPreviewApp?.stop();
309286
});
310-
await configureDtd();
311287
_widgetPreviewApp = await runPreviewEnvironment(
312288
widgetPreviewScaffoldProject: rootProject.widgetPreviewScaffoldProject,
313289
);
@@ -333,31 +309,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
333309
_populatePreviewPubspec(rootProject: rootProject);
334310
}
335311

336-
/// Configures the Dart Tooling Daemon connection.
337-
///
338-
/// If --dtd-uri is provided, the existing DTD instance will be used. If the tool fails to
339-
/// connect to this URI, it will start its own DTD instance.
340-
///
341-
/// If --dtd-uri is not provided, a DTD instance managed by the tool will be started.
342-
Future<void> configureDtd() async {
343-
final String? existingDtdUriStr = stringArg(FlutterGlobalOptions.kDtdUrl, global: true);
344-
Uri? existingDtdUri;
345-
try {
346-
if (existingDtdUriStr != null) {
347-
existingDtdUri = Uri.parse(existingDtdUriStr);
348-
}
349-
} on FormatException {
350-
logger.printWarning('Failed to parse value of --dtd-uri: $existingDtdUriStr.');
351-
}
352-
if (existingDtdUri == null) {
353-
logger.printTrace('Launching a fresh DTD instance...');
354-
await _dtdService.launchAndConnect();
355-
} else {
356-
logger.printTrace('Connecting to existing DTD instance at: $existingDtdUri...');
357-
await _dtdService.connect(dtdWsUri: existingDtdUri);
358-
}
359-
}
360-
361312
/// Builds the application binary for the widget preview scaffold the first
362313
/// time the widget preview command is run.
363314
///
@@ -506,12 +457,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
506457
BuildMode.debug,
507458
null,
508459
treeShakeIcons: false,
509-
// Provide the DTD connection information directly to the preview scaffold.
510-
// This could, in theory, be provided via a follow up call to a service extension
511-
// registered by the preview scaffold, but there's some uncertainty around how service
512-
// extensions will work with Flutter web embedded in VSCode without a Chrome debugger
513-
// connection.
514-
dartDefines: <String>['$kWidgetPreviewDtdUriEnvVar=${_dtdService.dtdUri}'],
515460
extraFrontEndOptions:
516461
isWeb ? <String>['--dartdevc-canary', '--dartdevc-module-format=ddc'] : null,
517462
packageConfigPath: widgetPreviewScaffoldProject.packageConfig.path,
@@ -654,7 +599,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
654599
if (offline) '--offline',
655600
'--directory',
656601
widgetPreviewScaffoldProject.directory.path,
657-
'dtd',
658602
'flutter_lints',
659603
'stack_trace',
660604
],

Diff for: packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ abstract final class FlutterGlobalOptions {
3636
static const String kMachineFlag = 'machine';
3737
static const String kPackagesOption = 'packages';
3838
static const String kPrefixedErrorsFlag = 'prefixed-errors';
39-
static const String kDtdUrl = 'dtd-url';
4039
static const String kPrintDtd = 'print-dtd';
4140
static const String kQuietFlag = 'quiet';
4241
static const String kShowTestDeviceFlag = 'show-test-device';
@@ -152,12 +151,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
152151
hide: !verboseHelp,
153152
help: 'Path to your "package_config.json" file.',
154153
);
155-
argParser.addOption(
156-
FlutterGlobalOptions.kDtdUrl,
157-
help:
158-
'The address of an existing Dart Tooling Daemon instance to be used by the Flutter CLI.',
159-
hide: !verboseHelp,
160-
);
161154
argParser.addFlag(
162155
FlutterGlobalOptions.kPrintDtd,
163156
negatable: false,

Diff for: packages/flutter_tools/lib/src/widget_preview/dtd_services.dart

-101
This file was deleted.

Diff for: packages/flutter_tools/templates/template_manifest.json

-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
"templates/widget_preview_scaffold/lib/src/widget_preview.dart.tmpl",
357357
"templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl",
358358
"templates/widget_preview_scaffold/lib/src/controls.dart.tmpl",
359-
"templates/widget_preview_scaffold/lib/src/dtd_services.dart.tmpl",
360359
"templates/widget_preview_scaffold/lib/src/generated_preview.dart.tmpl",
361360
"templates/widget_preview_scaffold/lib/src/utils.dart.tmpl",
362361
"templates/widget_preview_scaffold/pubspec.yaml.tmpl",

Diff for: packages/flutter_tools/templates/widget_preview_scaffold/lib/src/dtd_services.dart.tmpl

-33
This file was deleted.

Diff for: packages/flutter_tools/templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:flutter/services.dart';
1313
import 'package:stack_trace/stack_trace.dart';
1414

1515
import 'controls.dart';
16-
import 'dtd_services.dart';
1716
import 'generated_preview.dart';
1817
import 'utils.dart';
1918
import 'widget_preview.dart';
@@ -411,8 +410,6 @@ class PreviewAssetBundle extends PlatformAssetBundle {
411410
/// the preview scaffold project which prevents us from being able to use hot
412411
/// restart to iterate on this file.
413412
Future<void> mainImpl() async {
414-
// TODO(bkonyi): store somewhere.
415-
await WidgetPreviewScaffoldDtdServices().connect();
416413
runApp(_WidgetPreviewScaffold());
417414
}
418415

Diff for: packages/flutter_tools/templates/widget_preview_scaffold/pubspec.yaml.tmpl

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ dependencies:
1212
flutter_test:
1313
sdk: flutter
1414
# These will be replaced with proper constraints after the template is hydrated.
15-
dtd: any
1615
flutter_lints: any
1716
stack_trace: any
1817

Diff for: packages/flutter_tools/test/commands.shard/hermetic/widget_preview/widget_preview_test.dart

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
import 'package:file/memory.dart';
6-
import 'package:flutter_tools/src/artifacts.dart';
76
import 'package:flutter_tools/src/base/file_system.dart';
87
import 'package:flutter_tools/src/base/logger.dart';
98
import 'package:flutter_tools/src/base/os.dart';
@@ -48,8 +47,6 @@ void main() {
4847
platform: platform,
4948
processManager: processManager,
5049
),
51-
processManager: FakeProcessManager.any(),
52-
artifacts: Artifacts.test(fileSystem: fileSystem),
5350
);
5451
rootProject = FakeFlutterProject(
5552
projectRoot: 'some_project',

Diff for: packages/flutter_tools/test/commands.shard/permeable/widget_preview_test.dart

-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:io' as io show IOOverrides;
66

77
import 'package:args/command_runner.dart';
88
import 'package:file_testing/file_testing.dart';
9-
import 'package:flutter_tools/src/artifacts.dart';
109
import 'package:flutter_tools/src/base/bot_detector.dart';
1110
import 'package:flutter_tools/src/base/common.dart';
1211
import 'package:flutter_tools/src/base/file_system.dart';
@@ -81,8 +80,6 @@ void main() {
8180
logger: logger,
8281
platform: platform,
8382
),
84-
artifacts: Artifacts.test(),
85-
processManager: FakeProcessManager.any(),
8683
),
8784
);
8885
await runner.run(<String>['widget-preview', ...arguments]);

0 commit comments

Comments
 (0)