DAS plugins: Move two files to be in the public API Change-Id: I7230dead69b8c82ea758e48a0a3fbc56902cb05d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/417945 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/lib/src/cider/assists.dart b/pkg/analysis_server/lib/src/cider/assists.dart index a075036..0983d0a 100644 --- a/pkg/analysis_server/lib/src/cider/assists.dart +++ b/pkg/analysis_server/lib/src/cider/assists.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:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/src/correction/assist_processor.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart'; import 'package:analyzer/dart/analysis/session.dart';
diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_assists.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_assists.dart index de66f43..4b7f51d 100644 --- a/pkg/analysis_server/lib/src/handler/legacy/edit_get_assists.dart +++ b/pkg/analysis_server/lib/src/handler/legacy/edit_get_assists.dart
@@ -10,8 +10,8 @@ import 'package:analysis_server/src/legacy_analysis_server.dart'; import 'package:analysis_server/src/plugin/result_converter.dart'; import 'package:analysis_server/src/request_handler_mixin.dart'; -import 'package:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/src/correction/assist_performance.dart'; import 'package:analysis_server_plugin/src/correction/assist_processor.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart index 7e25c5d..ab4da6b 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart
@@ -15,9 +15,9 @@ import 'package:analysis_server/src/services/refactoring/framework/refactoring_context.dart'; import 'package:analysis_server/src/services/refactoring/framework/refactoring_processor.dart'; import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart'; -import 'package:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; import 'package:analysis_server_plugin/src/correction/assist_performance.dart'; import 'package:analysis_server_plugin/src/correction/assist_processor.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
diff --git a/pkg/analysis_server/test/src/cider/assists_test.dart b/pkg/analysis_server/test/src/cider/assists_test.dart index 7fe13f8..c924ad5 100644 --- a/pkg/analysis_server/test/src/cider/assists_test.dart +++ b/pkg/analysis_server/test/src/cider/assists_test.dart
@@ -5,7 +5,7 @@ import 'package:analysis_server/src/cider/assists.dart'; import 'package:analysis_server/src/services/correction/assist.dart'; import 'package:analysis_server/src/services/correction/assist_internal.dart'; -import 'package:analysis_server_plugin/src/correction/assist_core.dart'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' show SourceEdit; import 'package:analyzer_plugin/utilities/assist/assist.dart';
diff --git a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart index fbeaffa..98385c4 100644 --- a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart +++ b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.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:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/src/correction/assist_processor.dart'; import 'package:analysis_server_plugin/src/correction/change_workspace.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
diff --git a/pkg/analysis_server_plugin/lib/src/correction/assist_core.dart b/pkg/analysis_server_plugin/lib/edit/assist/assist.dart similarity index 100% rename from pkg/analysis_server_plugin/lib/src/correction/assist_core.dart rename to pkg/analysis_server_plugin/lib/edit/assist/assist.dart
diff --git a/pkg/analysis_server_plugin/lib/src/correction/assist_dart.dart b/pkg/analysis_server_plugin/lib/edit/assist/dart_assist_context.dart similarity index 100% rename from pkg/analysis_server_plugin/lib/src/correction/assist_dart.dart rename to pkg/analysis_server_plugin/lib/edit/assist/dart_assist_context.dart
diff --git a/pkg/analysis_server_plugin/lib/src/correction/assist_processor.dart b/pkg/analysis_server_plugin/lib/src/correction/assist_processor.dart index 0e6204b..20593ce 100644 --- a/pkg/analysis_server_plugin/lib/src/correction/assist_processor.dart +++ b/pkg/analysis_server_plugin/lib/src/correction/assist_processor.dart
@@ -2,9 +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:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/edit/dart/correction_producer.dart'; -import 'package:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; import 'package:analysis_server_plugin/src/correction/assist_generators.dart'; import 'package:analysis_server_plugin/src/correction/assist_performance.dart'; import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
diff --git a/pkg/analysis_server_plugin/lib/src/plugin_server.dart b/pkg/analysis_server_plugin/lib/src/plugin_server.dart index bb07d7f..0a0da44 100644 --- a/pkg/analysis_server_plugin/lib/src/plugin_server.dart +++ b/pkg/analysis_server_plugin/lib/src/plugin_server.dart
@@ -4,11 +4,11 @@ import 'dart:async'; +import 'package:analysis_server_plugin/edit/assist/assist.dart'; +import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart'; import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart'; import 'package:analysis_server_plugin/edit/fix/fix.dart'; import 'package:analysis_server_plugin/plugin.dart'; -import 'package:analysis_server_plugin/src/correction/assist_core.dart'; -import 'package:analysis_server_plugin/src/correction/assist_dart.dart'; import 'package:analysis_server_plugin/src/correction/assist_processor.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart'; import 'package:analysis_server_plugin/src/correction/fix_processor.dart';