Google Git
Sign in
dart/external/github.com/flutter/devtools/44c57e3dbc5b9c0cef30b60198ff07fbea8c47db^!/.
commit
44c57e3dbc5b9c0cef30b60198ff07fbea8c47db
[log]
author
Kenzie Davisson <43759233+kenzieschmoll@users.noreply.github.com>
Wed Jan 15 15:34:09 2025 -0800
committer
GitHub <noreply@github.com>
Wed Jan 15 15:34:09 2025 -0800
tree
a84bbeca37d4f5d57a00a601994db0ef9311a521
parent
f7a9352d86dd28bc89bb8867278817ec54fdcf88 [diff]
Move `editor/` files (#8755)

* Move `editor/` files

* fix lints
diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart
index c3ed911..51387ba 100644
--- a/packages/devtools_app/lib/devtools_app.dart
+++ b/packages/devtools_app/lib/devtools_app.dart

@@ -60,7 +60,6 @@
 export 'src/screens/vm_developer/vm_service_private_extensions.dart';
 export 'src/service/connected_app/connected_app.dart';
 export 'src/service/connected_app/connection_info.dart';
-export 'src/service/editor/editor_client.dart';
 export 'src/service/json_to_service_cache.dart';
 export 'src/service/service_extensions.dart';
 export 'src/service/service_manager.dart';
@@ -78,6 +77,7 @@
 export 'src/shared/console/widgets/description.dart';
 export 'src/shared/diagnostics/diagnostics_node.dart';
 export 'src/shared/diagnostics/inspector_service.dart';
+export 'src/shared/editor/editor_client.dart';
 export 'src/shared/environment_parameters/environment_parameters_base.dart';
 export 'src/shared/environment_parameters/environment_parameters_external.dart';
 export 'src/shared/framework/routing.dart';

diff --git a/packages/devtools_app/lib/src/framework/theme_manager.dart b/packages/devtools_app/lib/src/framework/theme_manager.dart
index 1d86dd1..4111187 100644
--- a/packages/devtools_app/lib/src/framework/theme_manager.dart
+++ b/packages/devtools_app/lib/src/framework/theme_manager.dart

@@ -9,8 +9,8 @@
 import 'package:dtd/dtd.dart';
 import 'package:logging/logging.dart';
 
-import '../service/editor/api_classes.dart';
 import '../shared/config_specific/post_message/post_message.dart';
+import '../shared/editor/api_classes.dart';
 import '../shared/globals.dart';
 
 final _log = Logger('theme_manager');

diff --git a/packages/devtools_app/lib/src/service/editor/api_classes.dart b/packages/devtools_app/lib/src/shared/editor/api_classes.dart
similarity index 100%
rename from packages/devtools_app/lib/src/service/editor/api_classes.dart
rename to packages/devtools_app/lib/src/shared/editor/api_classes.dart

diff --git a/packages/devtools_app/lib/src/service/editor/editor_client.dart b/packages/devtools_app/lib/src/shared/editor/editor_client.dart
similarity index 99%
rename from packages/devtools_app/lib/src/service/editor/editor_client.dart
rename to packages/devtools_app/lib/src/shared/editor/editor_client.dart
index 9766f78..196bb03 100644
--- a/packages/devtools_app/lib/src/service/editor/editor_client.dart
+++ b/packages/devtools_app/lib/src/shared/editor/editor_client.dart

@@ -8,7 +8,7 @@
 import 'package:dtd/dtd.dart';
 import 'package:logging/logging.dart';
 
-import '../../shared/analytics/constants.dart';
+import '../analytics/constants.dart';
 import 'api_classes.dart';
 
 final _log = Logger('editor_client');

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart
index bd4701e..250ed98 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart

@@ -5,8 +5,8 @@
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/foundation.dart';
 
-import '../../../service/editor/api_classes.dart';
-import '../../../service/editor/editor_client.dart';
+import '../../../shared/editor/api_classes.dart';
+import '../../../shared/editor/editor_client.dart';
 
 class PropertyEditorController extends DisposableController
     with AutoDisposeControllerMixin {

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart
index c1b049e..1293a55 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart

@@ -9,9 +9,9 @@
 import 'package:dtd/dtd.dart';
 import 'package:flutter/material.dart';
 
-import '../../../service/editor/editor_client.dart';
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart';
+import '../../../shared/editor/editor_client.dart';
 import '../../../shared/ui/common_widgets.dart';
 import 'property_editor_controller.dart';
 import 'property_editor_view.dart';

diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart
index 684bfbc..05eadbd 100644
--- a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart

@@ -6,7 +6,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import '../../../service/editor/api_classes.dart';
+import '../../../shared/editor/api_classes.dart';
 import '../../../shared/primitives/utils.dart';
 import 'property_editor_controller.dart';
 

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart
index f63616d..e06706d 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart

@@ -7,11 +7,11 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/material.dart';
 
-import '../../service/editor/api_classes.dart';
-import '../../service/editor/editor_client.dart';
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/constants.dart';
+import '../../shared/editor/api_classes.dart';
+import '../../shared/editor/editor_client.dart';
 
 class DebugSessions extends StatelessWidget {
   const DebugSessions({

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart
index 3890fe5..9880c26 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devices.dart

@@ -7,10 +7,10 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/material.dart';
 
-import '../../service/editor/api_classes.dart';
-import '../../service/editor/editor_client.dart';
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/analytics/constants.dart' as gac;
+import '../../shared/editor/api_classes.dart';
+import '../../shared/editor/editor_client.dart';
 
 class Devices extends StatelessWidget {
   Devices({

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart
index eff5564..7c32d05 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart

@@ -7,10 +7,10 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/material.dart';
 
-import '../../../service/editor/api_classes.dart';
-import '../../../service/editor/editor_client.dart';
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;
+import '../../../shared/editor/api_classes.dart';
+import '../../../shared/editor/editor_client.dart';
 import '../../../shared/framework/screen.dart';
 import '../../../shared/primitives/utils.dart';
 import '../../../shared/ui/common_widgets.dart';

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart
index bacbfcb..25c6b6e 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart

@@ -9,10 +9,10 @@
 import 'package:flutter/material.dart';
 
 import '../../../extensions/extension_screen.dart';
-import '../../../service/editor/api_classes.dart';
-import '../../../service/editor/editor_client.dart';
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;
+import '../../../shared/editor/api_classes.dart';
+import '../../../shared/editor/editor_client.dart';
 import 'shared.dart';
 import 'sidebar_extensions_controller.dart';
 

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart
index 30c0f02..dbe0666 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart

@@ -7,9 +7,9 @@
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/material.dart';
 
-import '../../../service/editor/editor_client.dart';
 import '../../../shared/analytics/analytics.dart' as ga;
 import '../../../shared/analytics/constants.dart' as gac;
+import '../../../shared/editor/editor_client.dart';
 
 typedef DevToolsButtonData =
     ({

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/sidebar_extensions_controller.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/sidebar_extensions_controller.dart
index c4a9071..130e590 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/sidebar_extensions_controller.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/sidebar_extensions_controller.dart

@@ -11,7 +11,7 @@
 
 import '../../../extensions/extension_service.dart';
 import '../../../extensions/extension_service_helpers.dart';
-import '../../../service/editor/api_classes.dart';
+import '../../../shared/editor/api_classes.dart';
 import '../../../shared/globals.dart';
 
 final _devToolsExtensionsLog = Logger('Flutter Sidebar - DevTools Extensions');

diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart
index f5c73e8..a1c0821 100644
--- a/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart
+++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart

@@ -9,9 +9,9 @@
 import 'package:dtd/dtd.dart';
 import 'package:flutter/material.dart';
 
-import '../../service/editor/api_classes.dart';
-import '../../service/editor/editor_client.dart';
 import '../../shared/analytics/analytics.dart' as ga;
+import '../../shared/editor/api_classes.dart';
+import '../../shared/editor/editor_client.dart';
 import '../../shared/ui/common_widgets.dart';
 import 'debug_sessions.dart';
 import 'devices.dart';

diff --git a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor_test.dart b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor_test.dart
index 12d64cc..51a1013 100644
--- a/packages/devtools_app/test/standalone_ui/ide_shared/property_editor_test.dart
+++ b/packages/devtools_app/test/standalone_ui/ide_shared/property_editor_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:devtools_app/devtools_app.dart';
-import 'package:devtools_app/src/service/editor/api_classes.dart';
+import 'package:devtools_app/src/shared/editor/api_classes.dart';
 import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart';
 import 'package:devtools_app/src/standalone_ui/ide_shared/property_editor/property_editor_view.dart';
 import 'package:devtools_app_shared/ui.dart';

diff --git a/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart b/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart
index 762eddc..501c5e4 100644
--- a/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart
+++ b/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:devtools_app/devtools_app.dart';
-import 'package:devtools_app/src/service/editor/api_classes.dart';
 import 'package:devtools_app/src/shared/constants.dart';
+import 'package:devtools_app/src/shared/editor/api_classes.dart';
 import 'package:devtools_app/src/standalone_ui/vs_code/debug_sessions.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';

diff --git a/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart b/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart
index b60eb03..4c9112b 100644
--- a/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart
+++ b/packages/devtools_app/test/standalone_ui/vs_code/devtools_test.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:devtools_app/devtools_app.dart';
-import 'package:devtools_app/src/service/editor/api_classes.dart';
 import 'package:devtools_app/src/shared/development_helpers.dart';
+import 'package:devtools_app/src/shared/editor/api_classes.dart';
 import 'package:devtools_app/src/standalone_ui/vs_code/devtools/devtools_view.dart';
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart
index bbedd29..47b826c 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart

@@ -7,7 +7,7 @@
 
 import 'dart:async';
 
-import 'package:devtools_app/src/service/editor/api_classes.dart';
+import 'package:devtools_app/src/shared/editor/api_classes.dart';
 import 'package:dtd/dtd.dart';
 import 'package:json_rpc_2/json_rpc_2.dart';
 import 'package:stream_channel/stream_channel.dart';

diff --git a/packages/devtools_app/test/test_infra/utils/sidebar_utils.dart b/packages/devtools_app/test/test_infra/utils/sidebar_utils.dart
index 36d07af..534a6ad 100644
--- a/packages/devtools_app/test/test_infra/utils/sidebar_utils.dart
+++ b/packages/devtools_app/test/test_infra/utils/sidebar_utils.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:devtools_app/src/service/editor/api_classes.dart';
+import 'package:devtools_app/src/shared/editor/api_classes.dart';
 
 EditorDebugSession generateDebugSession({
   required String debuggerType,