From a6e3008dedcfb3e27b57003e434276fa7d7be4ec Mon Sep 17 00:00:00 2001 From: pq Date: Tue, 20 Apr 2021 22:21:28 +0000 Subject: [PATCH] fix `sort_directives` violations See: https://dart-review.googlesource.com/c/sdk/+/196026 TEST=Code cleanup exclusively (sorting imports); no new tests. Change-Id: Ib07a82ff418138c542d6a83cfab9aabbb285f866 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196180 Auto-Submit: Phil Quitslund Reviewed-by: Phil Quitslund Reviewed-by: Brian Wilkerson Reviewed-by: Ben Konyi Reviewed-by: Bob Nystrom Commit-Queue: Phil Quitslund --- pkg/dartdev/lib/src/commands/compile.dart | 2 +- pkg/dev_compiler/lib/src/kernel/compiler.dart | 4 ++-- .../lib/src/kernel/expression_compiler.dart | 8 ++------ pkg/dev_compiler/lib/src/kernel/target.dart | 4 ++-- .../expression_compiler_worker_test.dart | 3 +-- pkg/dev_compiler/test/modular_suite.dart | 2 +- .../test/nullable_inference_test.dart | 18 +++++++++--------- pkg/test_runner/bin/test_runner.dart | 2 +- pkg/test_runner/lib/src/command_output.dart | 2 +- pkg/vm_service/test/async_scope_test.dart | 8 +++++--- pkg/vm_service/test/capture_stdio_test.dart | 4 +++- .../test/common/service_test_common.dart | 3 ++- pkg/vm_service/test/common/test_helper.dart | 7 +++++-- .../test/evaluate_with_scope_test.dart | 3 ++- pkg/vm_service/test/file_service_test.dart | 2 +- .../test/get_allocation_profile_rpc_test.dart | 2 +- .../test/get_cpu_samples_rpc_test.dart | 2 +- pkg/vm_service/test/get_http_profile_test.dart | 3 ++- pkg/vm_service/test/get_stack_test.dart | 2 +- pkg/vm_service/test/get_version_rpc_test.dart | 2 +- .../test/heap_snapshot_graph_test.dart | 2 +- .../test/object_graph_identity_hash_test.dart | 3 ++- pkg/vm_service/test/regress_44588_test.dart | 2 +- pkg/vm_service/test/regress_44842_test.dart | 2 +- pkg/vm_service/test/rpc_error_test.dart | 2 +- .../test/set_breakpoint_state_test.dart | 2 +- pkg/vm_service/test/throws_sentinel_test.dart | 2 +- .../test/verify_http_timeline_test.dart | 3 ++- 28 files changed, 54 insertions(+), 47 deletions(-) diff --git a/pkg/dartdev/lib/src/commands/compile.dart b/pkg/dartdev/lib/src/commands/compile.dart index 0dea2b7575b..c7e2e8f29ed 100644 --- a/pkg/dartdev/lib/src/commands/compile.dart +++ b/pkg/dartdev/lib/src/commands/compile.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'dart:io'; import 'package:dart2native/generate.dart'; -import 'package:path/path.dart' as path; import 'package:front_end/src/api_prototype/compiler_options.dart' show Verbosity; +import 'package:path/path.dart' as path; import '../core.dart'; import '../experiments.dart'; diff --git a/pkg/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart index a01a3b90dc9..cba549eed05 100644 --- a/pkg/dev_compiler/lib/src/kernel/compiler.dart +++ b/pkg/dev_compiler/lib/src/kernel/compiler.dart @@ -12,11 +12,11 @@ import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/core_types.dart'; import 'package:kernel/kernel.dart' hide MapEntry; import 'package:kernel/library_index.dart'; +import 'package:kernel/src/dart_type_equivalence.dart'; import 'package:kernel/type_algebra.dart'; import 'package:kernel/type_environment.dart'; -import 'package:kernel/src/dart_type_equivalence.dart'; -import 'package:source_span/source_span.dart' show SourceLocation; import 'package:path/path.dart' as p; +import 'package:source_span/source_span.dart' show SourceLocation; import '../compiler/js_names.dart' as js_ast; import '../compiler/js_utils.dart' as js_ast; diff --git a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart index 03c94f767d0..7ac69c9a2cc 100644 --- a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart +++ b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart @@ -6,19 +6,15 @@ import 'dart:async'; -import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart' - show DiagnosticMessage, DiagnosticMessageHandler; - import 'package:_fe_analyzer_shared/src/messages/codes.dart' show Code, Message, PlainAndColorizedString; - +import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart' + show DiagnosticMessage, DiagnosticMessageHandler; import 'package:dev_compiler/dev_compiler.dart'; import 'package:dev_compiler/src/compiler/js_names.dart' as js_ast; import 'package:dev_compiler/src/compiler/module_builder.dart'; import 'package:dev_compiler/src/js_ast/js_ast.dart' as js_ast; - import 'package:front_end/src/api_unstable/ddc.dart'; - import 'package:kernel/ast.dart' show Block, diff --git a/pkg/dev_compiler/lib/src/kernel/target.dart b/pkg/dev_compiler/lib/src/kernel/target.dart index 1f8d5f69575..c585aa49dae 100644 --- a/pkg/dev_compiler/lib/src/kernel/target.dart +++ b/pkg/dev_compiler/lib/src/kernel/target.dart @@ -8,6 +8,8 @@ import 'dart:collection'; import 'package:_fe_analyzer_shared/src/messages/codes.dart' show Message, LocatedMessage; +import 'package:_js_interop_checks/js_interop_checks.dart'; +import 'package:_js_interop_checks/src/transformations/js_util_optimizer.dart'; import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/core_types.dart'; import 'package:kernel/kernel.dart'; @@ -15,8 +17,6 @@ import 'package:kernel/reference_from_index.dart'; import 'package:kernel/target/changed_structure_notifier.dart'; import 'package:kernel/target/targets.dart'; import 'package:kernel/transformations/track_widget_constructor_locations.dart'; -import 'package:_js_interop_checks/js_interop_checks.dart'; -import 'package:_js_interop_checks/src/transformations/js_util_optimizer.dart'; import 'constants.dart' show DevCompilerConstantsBackend; import 'kernel_helpers.dart'; diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart index e5fa0e0676f..8cda5d84630 100644 --- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart +++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart @@ -10,14 +10,13 @@ import 'dart:io' show Directory, File, Platform, Process, stderr, stdout; import 'dart:isolate'; import 'package:build_integration/file_system/multi_root.dart'; +import 'package:dev_compiler/src/kernel/expression_compiler_worker.dart'; import 'package:front_end/src/api_prototype/standard_file_system.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; import 'package:path/path.dart' as p; import 'package:pedantic/pedantic.dart'; import 'package:test/test.dart'; -import 'package:dev_compiler/src/kernel/expression_compiler_worker.dart'; - /// Verbose mode for debugging bool get verbose => false; diff --git a/pkg/dev_compiler/test/modular_suite.dart b/pkg/dev_compiler/test/modular_suite.dart index c93b5cb3cb0..fde41a304fc 100644 --- a/pkg/dev_compiler/test/modular_suite.dart +++ b/pkg/dev_compiler/test/modular_suite.dart @@ -11,8 +11,8 @@ import 'dart:io'; import 'package:modular_test/src/io_pipeline.dart'; import 'package:modular_test/src/pipeline.dart'; -import 'package:modular_test/src/suite.dart'; import 'package:modular_test/src/runner.dart'; +import 'package:modular_test/src/suite.dart'; import 'package:package_config/package_config.dart'; String packageConfigJsonPath = '.dart_tool/package_config.json'; diff --git a/pkg/dev_compiler/test/nullable_inference_test.dart b/pkg/dev_compiler/test/nullable_inference_test.dart index 6177a5bc608..e63b9289e44 100644 --- a/pkg/dev_compiler/test/nullable_inference_test.dart +++ b/pkg/dev_compiler/test/nullable_inference_test.dart @@ -6,19 +6,19 @@ import 'dart:async'; import 'dart:io'; -import 'package:front_end/src/api_unstable/ddc.dart' as fe; -import 'package:kernel/core_types.dart'; -import 'package:kernel/kernel.dart'; -import 'package:kernel/class_hierarchy.dart'; -import 'package:kernel/type_environment.dart'; -import 'package:kernel/src/printer.dart'; -import 'package:kernel/target/targets.dart'; -import 'package:test/test.dart'; import 'package:dev_compiler/src/kernel/command.dart'; -import 'package:dev_compiler/src/kernel/nullable_inference.dart'; import 'package:dev_compiler/src/kernel/js_typerep.dart'; +import 'package:dev_compiler/src/kernel/nullable_inference.dart'; import 'package:dev_compiler/src/kernel/target.dart'; +import 'package:front_end/src/api_unstable/ddc.dart' as fe; +import 'package:kernel/class_hierarchy.dart'; +import 'package:kernel/core_types.dart'; +import 'package:kernel/kernel.dart'; +import 'package:kernel/src/printer.dart'; +import 'package:kernel/target/targets.dart'; +import 'package:kernel/type_environment.dart'; +import 'package:test/test.dart'; const AstTextStrategy astTextStrategy = AstTextStrategy( includeLibraryNamesInTypes: true, diff --git a/pkg/test_runner/bin/test_runner.dart b/pkg/test_runner/bin/test_runner.dart index 1c2d26a3010..654e5f802ee 100644 --- a/pkg/test_runner/bin/test_runner.dart +++ b/pkg/test_runner/bin/test_runner.dart @@ -22,8 +22,8 @@ import 'dart:io'; /// /// The default test directory layout is documented in "test_suite.dart", above /// `factory StandardTestSuite.forDirectory`. -import "package:test_runner/src/options.dart"; import "package:test_runner/src/build_configurations.dart"; +import "package:test_runner/src/options.dart"; import "package:test_runner/src/test_configurations.dart"; /// Runs all of the tests specified by the given command line [arguments]. diff --git a/pkg/test_runner/lib/src/command_output.dart b/pkg/test_runner/lib/src/command_output.dart index 779325c5656..d2807a7a47f 100644 --- a/pkg/test_runner/lib/src/command_output.dart +++ b/pkg/test_runner/lib/src/command_output.dart @@ -7,10 +7,10 @@ import 'dart:convert'; // CommandOutput.exitCode in subclasses of CommandOutput. import 'dart:io' as io; +import 'package:dart2js_tools/deobfuscate_stack_trace.dart'; import 'package:status_file/expectation.dart'; import 'package:test_runner/src/repository.dart'; import 'package:test_runner/src/static_error.dart'; -import 'package:dart2js_tools/deobfuscate_stack_trace.dart'; import 'browser_controller.dart'; import 'command.dart'; diff --git a/pkg/vm_service/test/async_scope_test.dart b/pkg/vm_service/test/async_scope_test.dart index 9451c0a9ee9..f72311b9b45 100644 --- a/pkg/vm_service/test/async_scope_test.dart +++ b/pkg/vm_service/test/async_scope_test.dart @@ -3,13 +3,15 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:developer'; -import 'package:vm_service/vm_service.dart'; + import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; + import 'common/service_test_common.dart'; import 'common/test_helper.dart'; -const int LINE_A = 19; -const int LINE_B = 25; +const int LINE_A = 20; +const int LINE_B = 26; foo() {} diff --git a/pkg/vm_service/test/capture_stdio_test.dart b/pkg/vm_service/test/capture_stdio_test.dart index 2edf76cdc1b..c5037d3e586 100644 --- a/pkg/vm_service/test/capture_stdio_test.dart +++ b/pkg/vm_service/test/capture_stdio_test.dart @@ -6,8 +6,10 @@ import 'dart:async'; import 'dart:convert'; import 'dart:developer'; import 'dart:io'; -import 'package:vm_service/vm_service.dart'; + import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; + import 'common/service_test_common.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/common/service_test_common.dart b/pkg/vm_service/test/common/service_test_common.dart index 8277753833f..4f616ab3d38 100644 --- a/pkg/vm_service/test/common/service_test_common.dart +++ b/pkg/vm_service/test/common/service_test_common.dart @@ -5,8 +5,9 @@ library service_test_common; import 'dart:async'; -import 'package:vm_service/vm_service.dart'; + import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; typedef IsolateTest = Future Function( VmService service, IsolateRef isolate); diff --git a/pkg/vm_service/test/common/test_helper.dart b/pkg/vm_service/test/common/test_helper.dart index c5891772bf4..eee241f7f62 100644 --- a/pkg/vm_service/test/common/test_helper.dart +++ b/pkg/vm_service/test/common/test_helper.dart @@ -7,11 +7,14 @@ library test_helper; import 'dart:async'; import 'dart:convert'; import 'dart:io' as io; + import 'package:process/process.dart'; -import 'package:vm_service/vm_service_io.dart'; -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; +import 'package:vm_service/vm_service_io.dart'; + import 'service_test_common.dart'; + export 'service_test_common.dart' show IsolateTest, VMTest; /// The extra arguments to use diff --git a/pkg/vm_service/test/evaluate_with_scope_test.dart b/pkg/vm_service/test/evaluate_with_scope_test.dart index a10aeee942a..0ec973c8009 100644 --- a/pkg/vm_service/test/evaluate_with_scope_test.dart +++ b/pkg/vm_service/test/evaluate_with_scope_test.dart @@ -2,8 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; + import 'common/test_helper.dart'; int? thing1; diff --git a/pkg/vm_service/test/file_service_test.dart b/pkg/vm_service/test/file_service_test.dart index e8b5713fbca..c4a08d7e0b3 100644 --- a/pkg/vm_service/test/file_service_test.dart +++ b/pkg/vm_service/test/file_service_test.dart @@ -7,8 +7,8 @@ import 'dart:convert'; import 'dart:developer'; import 'dart:io' as io; -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/get_allocation_profile_rpc_test.dart b/pkg/vm_service/test/get_allocation_profile_rpc_test.dart index 30070136d7b..82467322a31 100644 --- a/pkg/vm_service/test/get_allocation_profile_rpc_test.dart +++ b/pkg/vm_service/test/get_allocation_profile_rpc_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/get_cpu_samples_rpc_test.dart b/pkg/vm_service/test/get_cpu_samples_rpc_test.dart index 37973bc009f..ecc6d256f7b 100644 --- a/pkg/vm_service/test/get_cpu_samples_rpc_test.dart +++ b/pkg/vm_service/test/get_cpu_samples_rpc_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/get_http_profile_test.dart b/pkg/vm_service/test/get_http_profile_test.dart index 59219fb80cb..b1114406fd3 100644 --- a/pkg/vm_service/test/get_http_profile_test.dart +++ b/pkg/vm_service/test/get_http_profile_test.dart @@ -8,8 +8,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:math'; import 'dart:typed_data'; -import 'package:vm_service/vm_service.dart'; + import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/get_stack_test.dart b/pkg/vm_service/test/get_stack_test.dart index dc7c05d64f3..f1df2ba9496 100644 --- a/pkg/vm_service/test/get_stack_test.dart +++ b/pkg/vm_service/test/get_stack_test.dart @@ -6,8 +6,8 @@ import 'dart:developer'; -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/service_test_common.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/get_version_rpc_test.dart b/pkg/vm_service/test/get_version_rpc_test.dart index 57be153c848..d8ce3d78210 100644 --- a/pkg/vm_service/test/get_version_rpc_test.dart +++ b/pkg/vm_service/test/get_version_rpc_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/heap_snapshot_graph_test.dart b/pkg/vm_service/test/heap_snapshot_graph_test.dart index 9a65d32f808..09592fd2781 100644 --- a/pkg/vm_service/test/heap_snapshot_graph_test.dart +++ b/pkg/vm_service/test/heap_snapshot_graph_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/object_graph_identity_hash_test.dart b/pkg/vm_service/test/object_graph_identity_hash_test.dart index a0e8c7d325a..9ada6aaa512 100644 --- a/pkg/vm_service/test/object_graph_identity_hash_test.dart +++ b/pkg/vm_service/test/object_graph_identity_hash_test.dart @@ -4,8 +4,9 @@ import 'dart:collection'; -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; + import 'common/test_helper.dart'; class Foo {} diff --git a/pkg/vm_service/test/regress_44588_test.dart b/pkg/vm_service/test/regress_44588_test.dart index 3f0564fa240..b9ab0b34f67 100644 --- a/pkg/vm_service/test/regress_44588_test.dart +++ b/pkg/vm_service/test/regress_44588_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/regress_44842_test.dart b/pkg/vm_service/test/regress_44842_test.dart index 8a794b4d677..f7dc88e4ff2 100644 --- a/pkg/vm_service/test/regress_44842_test.dart +++ b/pkg/vm_service/test/regress_44842_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; const Map kNullInstance = { 'type': '@Instance', diff --git a/pkg/vm_service/test/rpc_error_test.dart b/pkg/vm_service/test/rpc_error_test.dart index c9cf1be83cc..87e87763360 100644 --- a/pkg/vm_service/test/rpc_error_test.dart +++ b/pkg/vm_service/test/rpc_error_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/set_breakpoint_state_test.dart b/pkg/vm_service/test/set_breakpoint_state_test.dart index 7bc96ab780d..61494186058 100644 --- a/pkg/vm_service/test/set_breakpoint_state_test.dart +++ b/pkg/vm_service/test/set_breakpoint_state_test.dart @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. // VMOptions=--verbose_debug -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/service_test_common.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/throws_sentinel_test.dart b/pkg/vm_service/test/throws_sentinel_test.dart index fd95bbe9fd5..b9242b3596f 100644 --- a/pkg/vm_service/test/throws_sentinel_test.dart +++ b/pkg/vm_service/test/throws_sentinel_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:vm_service/vm_service.dart'; import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart'; diff --git a/pkg/vm_service/test/verify_http_timeline_test.dart b/pkg/vm_service/test/verify_http_timeline_test.dart index 033571a78c6..ce9dbde2d6f 100644 --- a/pkg/vm_service/test/verify_http_timeline_test.dart +++ b/pkg/vm_service/test/verify_http_timeline_test.dart @@ -8,8 +8,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:math'; import 'dart:typed_data'; -import 'package:vm_service/vm_service.dart'; + import 'package:test/test.dart'; +import 'package:vm_service/vm_service.dart'; import 'common/test_helper.dart';