From 80fb1a56dbf8e1123cc49ada4b8e4aafc3991b33 Mon Sep 17 00:00:00 2001 From: Danny Tuppeny Date: Wed, 11 May 2022 15:28:35 +0000 Subject: [PATCH] [analysis_server] Add shared protocol.dart file for LSP In an upcoming change some types will between these files. To reduce the size of that (already very large) CL and because the distinction between spec-generated/custom-generated types was unnecessary anyway, this adds a single import for LSP protocol-related types. Change-Id: I322447d6c979538c12014d87875176e1bf2adca7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244244 Commit-Queue: Brian Wilkerson Reviewed-by: Brian Wilkerson --- pkg/analysis_server/benchmark/perf/memory_tests.dart | 6 +++--- pkg/analysis_server/lib/lsp_protocol/protocol.dart | 8 ++++++++ pkg/analysis_server/lib/src/cider/document_symbols.dart | 2 +- pkg/analysis_server/lib/src/cider/signature_help.dart | 2 +- .../lib/src/computer/computer_highlights.dart | 2 +- .../src/computer/computer_type_arguments_signature.dart | 2 +- .../lib/src/lsp/channel/lsp_byte_stream_channel.dart | 3 +-- pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart | 2 +- pkg/analysis_server/lib/src/lsp/client_capabilities.dart | 2 +- pkg/analysis_server/lib/src/lsp/constants.dart | 3 +-- .../lib/src/lsp/handlers/commands/abstract_refactor.dart | 3 +-- .../lib/src/lsp/handlers/commands/fix_all.dart | 3 +-- .../lib/src/lsp/handlers/commands/organize_imports.dart | 3 +-- .../lib/src/lsp/handlers/commands/perform_refactor.dart | 3 +-- .../src/lsp/handlers/commands/send_workspace_edit.dart | 3 +-- .../src/lsp/handlers/commands/simple_edit_handler.dart | 3 +-- .../lib/src/lsp/handlers/commands/sort_members.dart | 3 +-- .../lib/src/lsp/handlers/commands/validate_refactor.dart | 3 +-- .../lsp/handlers/custom/handler_diagnostic_server.dart | 4 +--- .../lib/src/lsp/handlers/custom/handler_reanalyze.dart | 3 +-- .../lib/src/lsp/handlers/custom/handler_super.dart | 3 +-- .../lib/src/lsp/handlers/handler_cancel_request.dart | 3 +-- .../lsp/handlers/handler_change_workspace_folders.dart | 3 +-- .../lib/src/lsp/handlers/handler_code_actions.dart | 3 +-- .../lib/src/lsp/handlers/handler_completion.dart | 4 +--- .../lib/src/lsp/handlers/handler_completion_resolve.dart | 5 +---- .../lib/src/lsp/handlers/handler_definition.dart | 3 +-- .../lib/src/lsp/handlers/handler_document_color.dart | 3 +-- .../handlers/handler_document_color_presentation.dart | 3 +-- .../src/lsp/handlers/handler_document_highlights.dart | 3 +-- .../lib/src/lsp/handlers/handler_document_symbols.dart | 3 +-- .../lib/src/lsp/handlers/handler_execute_command.dart | 3 +-- .../lib/src/lsp/handlers/handler_exit.dart | 3 +-- .../lib/src/lsp/handlers/handler_folding.dart | 3 +-- .../lib/src/lsp/handlers/handler_format_on_type.dart | 3 +-- .../lib/src/lsp/handlers/handler_format_range.dart | 3 +-- .../lib/src/lsp/handlers/handler_formatting.dart | 3 +-- .../lib/src/lsp/handlers/handler_hover.dart | 3 +-- .../lib/src/lsp/handlers/handler_implementation.dart | 3 +-- .../lib/src/lsp/handlers/handler_initialize.dart | 3 +-- .../lib/src/lsp/handlers/handler_initialized.dart | 3 +-- .../lib/src/lsp/handlers/handler_references.dart | 3 +-- .../lib/src/lsp/handlers/handler_reject.dart | 3 +-- .../lib/src/lsp/handlers/handler_rename.dart | 3 +-- .../lib/src/lsp/handlers/handler_select_range.dart | 3 +-- .../lib/src/lsp/handlers/handler_semantic_tokens.dart | 3 +-- .../lib/src/lsp/handlers/handler_shutdown.dart | 3 +-- .../lib/src/lsp/handlers/handler_signature_help.dart | 3 +-- .../lib/src/lsp/handlers/handler_states.dart | 3 +-- .../src/lsp/handlers/handler_text_document_changes.dart | 3 +-- .../lib/src/lsp/handlers/handler_type_definition.dart | 3 +-- .../lib/src/lsp/handlers/handler_will_rename_files.dart | 3 +-- .../lsp/handlers/handler_workspace_configuration.dart | 3 +-- .../lib/src/lsp/handlers/handler_workspace_symbols.dart | 3 +-- pkg/analysis_server/lib/src/lsp/handlers/handlers.dart | 3 +-- pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart | 4 +--- pkg/analysis_server/lib/src/lsp/lsp_socket_server.dart | 3 +-- pkg/analysis_server/lib/src/lsp/mapping.dart | 9 ++------- .../lib/src/lsp/notification_manager.dart | 3 +-- pkg/analysis_server/lib/src/lsp/progress.dart | 3 +-- .../lib/src/lsp/semantic_tokens/encoder.dart | 2 +- .../lib/src/lsp/semantic_tokens/legend.dart | 2 +- .../lib/src/lsp/semantic_tokens/mapping.dart | 2 +- .../lib/src/lsp/server_capabilities_computer.dart | 3 +-- pkg/analysis_server/lib/src/lsp/source_edits.dart | 3 +-- .../test/integration/lsp_server/initialization_test.dart | 3 +-- .../test/integration/lsp_server/integration_tests.dart | 2 +- pkg/analysis_server/test/lsp/analyzer_status_test.dart | 2 +- pkg/analysis_server/test/lsp/cancel_request_test.dart | 2 +- pkg/analysis_server/test/lsp/code_actions_abstract.dart | 3 +-- .../test/lsp/code_actions_assists_test.dart | 4 +--- .../test/lsp/code_actions_fixes_test.dart | 2 +- .../test/lsp/code_actions_refactor_test.dart | 3 +-- .../test/lsp/code_actions_source_test.dart | 2 +- pkg/analysis_server/test/lsp/completion.dart | 2 +- pkg/analysis_server/test/lsp/completion_dart_test.dart | 2 +- pkg/analysis_server/test/lsp/configuration_test.dart | 2 +- pkg/analysis_server/test/lsp/definition_test.dart | 2 +- pkg/analysis_server/test/lsp/diagnostic_test.dart | 2 +- pkg/analysis_server/test/lsp/document_changes_test.dart | 3 +-- pkg/analysis_server/test/lsp/document_color_test.dart | 2 +- .../test/lsp/document_highlights_test.dart | 2 +- pkg/analysis_server/test/lsp/document_symbols_test.dart | 2 +- pkg/analysis_server/test/lsp/file_modification_test.dart | 3 +-- pkg/analysis_server/test/lsp/flutter_outline_test.dart | 2 +- pkg/analysis_server/test/lsp/folding_test.dart | 2 +- pkg/analysis_server/test/lsp/format_test.dart | 2 +- pkg/analysis_server/test/lsp/hover_test.dart | 2 +- pkg/analysis_server/test/lsp/implementation_test.dart | 2 +- pkg/analysis_server/test/lsp/initialization_test.dart | 3 +-- pkg/analysis_server/test/lsp/mapping_test.dart | 2 +- pkg/analysis_server/test/lsp/outline_test.dart | 2 +- pkg/analysis_server/test/lsp/reanalyze_test.dart | 2 +- pkg/analysis_server/test/lsp/references_test.dart | 2 +- pkg/analysis_server/test/lsp/rename_test.dart | 2 +- pkg/analysis_server/test/lsp/selection_range_test.dart | 2 +- pkg/analysis_server/test/lsp/semantic_tokens_test.dart | 2 +- pkg/analysis_server/test/lsp/server_abstract.dart | 4 +--- pkg/analysis_server/test/lsp/server_test.dart | 3 +-- pkg/analysis_server/test/lsp/signature_help_test.dart | 2 +- pkg/analysis_server/test/lsp/super_test.dart | 2 +- pkg/analysis_server/test/lsp/type_definition_test.dart | 2 +- pkg/analysis_server/test/lsp/will_rename_files_test.dart | 2 +- pkg/analysis_server/test/lsp/workspace_symbols_test.dart | 3 +-- pkg/analysis_server/test/mocks_lsp.dart | 3 +-- .../test/src/cider/document_symbols_test.dart | 2 +- .../test/src/cider/signature_help_test.dart | 2 +- .../test/tool/lsp_spec/generated_classes_test.dart | 3 +-- pkg/analysis_server/test/tool/lsp_spec/json_test.dart | 3 +-- pkg/analysis_server/test/tool/lsp_spec/matchers.dart | 2 +- 110 files changed, 120 insertions(+), 190 deletions(-) create mode 100644 pkg/analysis_server/lib/lsp_protocol/protocol.dart diff --git a/pkg/analysis_server/benchmark/perf/memory_tests.dart b/pkg/analysis_server/benchmark/perf/memory_tests.dart index 78368148256..c7515423445 100644 --- a/pkg/analysis_server/benchmark/perf/memory_tests.dart +++ b/pkg/analysis_server/benchmark/perf/memory_tests.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:convert' show jsonDecode, jsonEncode; import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/protocol_server.dart'; import 'package:analyzer/instrumentation/instrumentation.dart'; @@ -209,7 +209,7 @@ class LspAnalysisServerBenchmarkTest extends AbstractBenchmarkTest class LspAnalysisServerMemoryUsageTest extends AbstractLspAnalysisServerIntegrationTest with ServerMemoryUsageMixin { - Map> currentAnalysisErrors = {}; + Map> currentAnalysisErrors = {}; @override void expect(Object? actual, Matcher matcher, {String? reason}) => @@ -227,7 +227,7 @@ class LspAnalysisServerMemoryUsageTest ]); await super.setUp(); - errorNotificationsFromServer.listen((NotificationMessage error) { + errorNotificationsFromServer.listen((lsp.NotificationMessage error) { // A server error should never happen during an integration test. fail('${error.toJson()}'); }); diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol.dart b/pkg/analysis_server/lib/lsp_protocol/protocol.dart new file mode 100644 index 00000000000..724354904f9 --- /dev/null +++ b/pkg/analysis_server/lib/lsp_protocol/protocol.dart @@ -0,0 +1,8 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// 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. + +export 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart' + hide jsonEncoder; +export 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +export 'package:analysis_server/lsp_protocol/protocol_special.dart'; diff --git a/pkg/analysis_server/lib/src/cider/document_symbols.dart b/pkg/analysis_server/lib/src/cider/document_symbols.dart index f8c777581d6..0e6fe0ec711 100644 --- a/pkg/analysis_server/lib/src/cider/document_symbols.dart +++ b/pkg/analysis_server/lib/src/cider/document_symbols.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' hide Outline; import 'package:analysis_server/src/computer/computer_outline.dart'; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/cider/signature_help.dart b/pkg/analysis_server/lib/src/cider/signature_help.dart index 107060e9b78..d6fc27a85c3 100644 --- a/pkg/analysis_server/lib/src/cider/signature_help.dart +++ b/pkg/analysis_server/lib/src/cider/signature_help.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_signature.dart'; import 'package:analysis_server/src/computer/computer_type_arguments_signature.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/computer/computer_highlights.dart b/pkg/analysis_server/lib/src/computer/computer_highlights.dart index 8ae64a3662e..5c6934c5d4d 100644 --- a/pkg/analysis_server/lib/src/computer/computer_highlights.dart +++ b/pkg/analysis_server/lib/src/computer/computer_highlights.dart @@ -7,7 +7,7 @@ import 'dart:math' as math; import 'package:_fe_analyzer_shared/src/parser/quote.dart' show analyzeQuote, Quote, firstQuoteLength, lastQuoteLength; import 'package:_fe_analyzer_shared/src/scanner/characters.dart' as char; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart' +import 'package:analysis_server/lsp_protocol/protocol.dart' show SemanticTokenTypes, SemanticTokenModifiers; import 'package:analysis_server/src/lsp/constants.dart' show CustomSemanticTokenModifiers, CustomSemanticTokenTypes; diff --git a/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart b/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart index 800ff38d9a4..d38ba96177d 100644 --- a/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart +++ b/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart' as lsp; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analysis_server/src/computer/computer_hover.dart'; import 'package:analysis_server/src/lsp/dartdoc.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/channel/lsp_byte_stream_channel.dart b/pkg/analysis_server/lib/src/lsp/channel/lsp_byte_stream_channel.dart index 506a745ca4c..4da59dc9f78 100644 --- a/pkg/analysis_server/lib/src/lsp/channel/lsp_byte_stream_channel.dart +++ b/pkg/analysis_server/lib/src/lsp/channel/lsp_byte_stream_channel.dart @@ -6,8 +6,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/channel/lsp_channel.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; import 'package:analysis_server/src/lsp/lsp_packet_transformer.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart b/pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart index d6fa71709bb..236e9d0d830 100644 --- a/pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart +++ b/pkg/analysis_server/lib/src/lsp/channel/lsp_channel.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/lsp_analysis_server.dart'; /// The abstract class [LspServerCommunicationChannel] defines the behavior of diff --git a/pkg/analysis_server/lib/src/lsp/client_capabilities.dart b/pkg/analysis_server/lib/src/lsp/client_capabilities.dart index 9a5068786b3..2a172ca7bc7 100644 --- a/pkg/analysis_server/lib/src/lsp/client_capabilities.dart +++ b/pkg/analysis_server/lib/src/lsp/client_capabilities.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; /// Wraps the client (editor) capabilities to improve performance. /// diff --git a/pkg/analysis_server/lib/src/lsp/constants.dart b/pkg/analysis_server/lib/src/lsp/constants.dart index cb2da7097cd..de28ea1f9b5 100644 --- a/pkg/analysis_server/lib/src/lsp/constants.dart +++ b/pkg/analysis_server/lib/src/lsp/constants.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; /// The characters that will cause the editor to automatically commit the selected /// completion item. diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart index 7c080cbc8ce..c7109519ae9 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/fix_all.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/fix_all.dart index 01f0d88edbf..c0c9aa7c8f0 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/fix_all.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/fix_all.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/organize_imports.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/organize_imports.dart index 5ef9c07e3b2..5e5bcf9bbe8 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/organize_imports.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/organize_imports.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/perform_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/perform_refactor.dart index 4f9fb46ab7e..018892afdb3 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/perform_refactor.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/perform_refactor.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/abstract_refactor.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/send_workspace_edit.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/send_workspace_edit.dart index 228e211e164..004349010e3 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/send_workspace_edit.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/send_workspace_edit.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart index 317d1b9909d..467039dea13 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/simple_edit_handler.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/sort_members.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/sort_members.dart index bb0ff93034e..7634396bc0a 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/sort_members.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/sort_members.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/validate_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/validate_refactor.dart index 402e93420c9..72107e8f905 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/validate_refactor.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/validate_refactor.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/commands/abstract_refactor.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/progress.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart index 3c081c8d894..067b15e74cf 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart @@ -2,9 +2,7 @@ // 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/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart index f3e68d15b82..4dde9915d91 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart index 46ab360f634..b9b0cd92423 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_cancel_request.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_cancel_request.dart index a2d3280346e..abc26444f65 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_cancel_request.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_cancel_request.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; class CancelRequestHandler extends MessageHandler { diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_change_workspace_folders.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_change_workspace_folders.dart index ee5e4013cf6..590e49d92ef 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_change_workspace_folders.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_change_workspace_folders.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; class WorkspaceFoldersHandler diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart index 93248df5b21..82d2c4bd890 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart index b624eed35c5..0440ae0ff25 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart @@ -4,9 +4,7 @@ import 'dart:math' as math; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/domains/completion/available_suggestions.dart'; import 'package:analysis_server/src/lsp/client_capabilities.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart index 4a7b49bdce5..f7c418cd1bc 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart @@ -2,10 +2,7 @@ // 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/lsp_protocol/protocol_custom_generated.dart' - hide Element; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' hide Element; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart index 39e7fe82660..a066a4c4b2b 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' hide Element; import 'package:analysis_server/protocol/protocol_generated.dart' hide AnalysisGetNavigationParams; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color.dart index d63203923d7..51e1a16370b 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_color.dart' show ColorComputer, ColorReference; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart index 3a14093309a..e5958a274ae 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_color_presentation.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analysis_server/src/utilities/flutter.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_highlights.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_highlights.dart index 4b3bba573b8..0ffe8e5fbfa 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_highlights.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_highlights.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/domains/analysis/occurrences.dart'; import 'package:analysis_server/src/domains/analysis/occurrences_dart.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_symbols.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_symbols.dart index 38754f93fd3..1e674409979 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_document_symbols.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_document_symbols.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' hide Outline; import 'package:analysis_server/src/computer/computer_outline.dart'; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_execute_command.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_execute_command.dart index 4cbde6811a4..ebf7cdc4b77 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_execute_command.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_execute_command.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/commands/fix_all.dart'; import 'package:analysis_server/src/lsp/handlers/commands/organize_imports.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart index 56923e82ecc..e351b483feb 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart @@ -4,8 +4,7 @@ import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; class ExitMessageHandler extends MessageHandler { diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_folding.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_folding.dart index 27590e6f25d..8c93f1c5d32 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_folding.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_folding.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_folding.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_format_on_type.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_format_on_type.dart index 23cfd7da3ed..f2d4a052f3c 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_format_on_type.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_format_on_type.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_format_range.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_format_range.dart index ab8a7c1591d..b1200e6a931 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_format_range.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_format_range.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_formatting.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_formatting.dart index 10df92996bf..36dafd68b73 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_formatting.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_formatting.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_hover.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_hover.dart index eaebf098a0b..f7a512218d6 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_hover.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_hover.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/computer/computer_hover.dart'; import 'package:analysis_server/src/lsp/dartdoc.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart index 2d74fe1f7c9..923248d1b58 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart @@ -2,9 +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/lsp_protocol/protocol_generated.dart' +import 'package:analysis_server/lsp_protocol/protocol.dart' hide TypeHierarchyItem; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialize.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialize.dart index 0d08fba6488..131daee8961 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialize.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialize.dart @@ -4,8 +4,7 @@ import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handler_states.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart index 912ab3c3688..e728d79e642 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_initialized.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handler_states.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart index 69aef3b2e35..866b7e882ec 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analysis_server/src/protocol_server.dart' show SearchResult; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart index ddc47404b20..105a9e27adc 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; /// A [MessageHandler] that rejects specific tpyes of messages with a given diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart index bd313fc3de3..9e9088d2321 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/client_configuration.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_select_range.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_select_range.dart index 34a7f0a87e2..01b2e76d03a 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_select_range.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_select_range.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_selection_ranges.dart' hide SelectionRange; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart index cb6ea2a8938..52c5275a6dd 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_highlights.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart index 14a1273745d..4655b6909aa 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handler_states.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_signature_help.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_signature_help.dart index 743f9817249..9d2018ba267 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_signature_help.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_signature_help.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/computer/computer_signature.dart'; import 'package:analysis_server/src/computer/computer_type_arguments_signature.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart index 8b130aea909..5369d17780a 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_states.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/custom/handler_diagnostic_server.dart'; import 'package:analysis_server/src/lsp/handlers/custom/handler_reanalyze.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart index aa59bfc07f8..4376b67350c 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart index 2f7510628d9..27198def03a 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_will_rename_files.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_will_rename_files.dart index a34724b7e38..ee8a2a4001b 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_will_rename_files.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_will_rename_files.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analysis_server/src/services/refactoring/refactoring.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_configuration.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_configuration.dart index 092d62bd8a1..b7bac115d82 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_configuration.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_configuration.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; class WorkspaceDidChangeConfigurationMessageHandler diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart index ad70de71da4..83e5bb5e572 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analyzer/src/dart/analysis/search.dart' as search; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handlers.dart b/pkg/analysis_server/lib/src/lsp/handlers/handlers.dart index a51eed8c0c1..3a80bcac54a 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handlers.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handlers.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/analysis_server_abstract.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handler_cancel_request.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart index 0869d24a949..2a545571514 100644 --- a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart +++ b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart @@ -4,9 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/analysis_server.dart'; import 'package:analysis_server/src/analysis_server_abstract.dart'; import 'package:analysis_server/src/computer/computer_closingLabels.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/lsp_socket_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_socket_server.dart index b2cb46f39c1..34ca0ab0356 100644 --- a/pkg/analysis_server/lib/src/lsp/lsp_socket_server.dart +++ b/pkg/analysis_server/lib/src/lsp/lsp_socket_server.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/analysis_server.dart'; import 'package:analysis_server/src/lsp/channel/lsp_channel.dart'; import 'package:analysis_server/src/lsp/constants.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/mapping.dart b/pkg/analysis_server/lib/src/lsp/mapping.dart index 176162ab17a..31183f40e89 100644 --- a/pkg/analysis_server/lib/src/lsp/mapping.dart +++ b/pkg/analysis_server/lib/src/lsp/mapping.dart @@ -5,13 +5,8 @@ import 'dart:io'; import 'dart:math'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart' - as lsp; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart' as lsp; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart' as lsp; +import 'package:analysis_server/lsp_protocol/protocol.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analysis_server/src/collections.dart'; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/lsp/constants.dart' as lsp; diff --git a/pkg/analysis_server/lib/src/lsp/notification_manager.dart b/pkg/analysis_server/lib/src/lsp/notification_manager.dart index bae8deff5eb..46796d38665 100644 --- a/pkg/analysis_server/lib/src/lsp/notification_manager.dart +++ b/pkg/analysis_server/lib/src/lsp/notification_manager.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/channel/lsp_channel.dart'; import 'package:analysis_server/src/lsp/lsp_analysis_server.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/progress.dart b/pkg/analysis_server/lib/src/lsp/progress.dart index 398d0b0283c..370f54e335f 100644 --- a/pkg/analysis_server/lib/src/lsp/progress.dart +++ b/pkg/analysis_server/lib/src/lsp/progress.dart @@ -5,8 +5,7 @@ import 'dart:async'; import 'dart:math'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/lsp_analysis_server.dart'; /// Reports progress of long-running operations to the LSP client. diff --git a/pkg/analysis_server/lib/src/lsp/semantic_tokens/encoder.dart b/pkg/analysis_server/lib/src/lsp/semantic_tokens/encoder.dart index 170ff223172..9689ab2ef71 100644 --- a/pkg/analysis_server/lib/src/lsp/semantic_tokens/encoder.dart +++ b/pkg/analysis_server/lib/src/lsp/semantic_tokens/encoder.dart @@ -5,7 +5,7 @@ import 'dart:collection'; import 'dart:math' as math; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/semantic_tokens/legend.dart'; import 'package:analysis_server/src/lsp/semantic_tokens/mapping.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/semantic_tokens/legend.dart b/pkg/analysis_server/lib/src/lsp/semantic_tokens/legend.dart index 51063068a12..1a49ca3ca8b 100644 --- a/pkg/analysis_server/lib/src/lsp/semantic_tokens/legend.dart +++ b/pkg/analysis_server/lib/src/lsp/semantic_tokens/legend.dart @@ -4,7 +4,7 @@ import 'dart:math' as math; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/semantic_tokens/mapping.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/semantic_tokens/mapping.dart b/pkg/analysis_server/lib/src/lsp/semantic_tokens/mapping.dart index 68e43fd4ad7..5c9b19fcd00 100644 --- a/pkg/analysis_server/lib/src/lsp/semantic_tokens/mapping.dart +++ b/pkg/analysis_server/lib/src/lsp/semantic_tokens/mapping.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart b/pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart index 7a67a93bfab..d7123e51f5a 100644 --- a/pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart +++ b/pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/client_capabilities.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/lsp_analysis_server.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/source_edits.dart b/pkg/analysis_server/lib/src/lsp/source_edits.dart index 1e2b464925a..e41855ee00b 100644 --- a/pkg/analysis_server/lib/src/lsp/source_edits.dart +++ b/pkg/analysis_server/lib/src/lsp/source_edits.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; import 'package:analysis_server/src/protocol_server.dart' as server show SourceEdit; diff --git a/pkg/analysis_server/test/integration/lsp_server/initialization_test.dart b/pkg/analysis_server/test/integration/lsp_server/initialization_test.dart index 214cf6fe52b..43dfdd4f5c5 100644 --- a/pkg/analysis_server/test/integration/lsp_server/initialization_test.dart +++ b/pkg/analysis_server/test/integration/lsp_server/initialization_test.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart b/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart index 2f6f70bf0fc..7d0ab6c9721 100644 --- a/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart +++ b/pkg/analysis_server/test/integration/lsp_server/integration_tests.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/channel/lsp_byte_stream_channel.dart'; import 'package:analysis_server/src/services/pub/pub_command.dart'; import 'package:analyzer/instrumentation/instrumentation.dart'; diff --git a/pkg/analysis_server/test/lsp/analyzer_status_test.dart b/pkg/analysis_server/test/lsp/analyzer_status_test.dart index b7c9b7924ad..6c213d0187e 100644 --- a/pkg/analysis_server/test/lsp/analyzer_status_test.dart +++ b/pkg/analysis_server/test/lsp/analyzer_status_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/cancel_request_test.dart b/pkg/analysis_server/test/lsp/cancel_request_test.dart index f967928825b..0101b067b58 100644 --- a/pkg/analysis_server/test/lsp/cancel_request_test.dart +++ b/pkg/analysis_server/test/lsp/cancel_request_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/code_actions_abstract.dart b/pkg/analysis_server/test/lsp/code_actions_abstract.dart index cd29ba98929..4eef36f936a 100644 --- a/pkg/analysis_server/test/lsp/code_actions_abstract.dart +++ b/pkg/analysis_server/test/lsp/code_actions_abstract.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:collection/collection.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/code_actions_assists_test.dart b/pkg/analysis_server/test/lsp/code_actions_assists_test.dart index 21685a57e59..6ddcd8043db 100644 --- a/pkg/analysis_server/test/lsp/code_actions_assists_test.dart +++ b/pkg/analysis_server/test/lsp/code_actions_assists_test.dart @@ -4,9 +4,7 @@ import 'dart:convert'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:collection/collection.dart'; diff --git a/pkg/analysis_server/test/lsp/code_actions_fixes_test.dart b/pkg/analysis_server/test/lsp/code_actions_fixes_test.dart index 72ff233d9a0..d058b29135f 100644 --- a/pkg/analysis_server/test/lsp/code_actions_fixes_test.dart +++ b/pkg/analysis_server/test/lsp/code_actions_fixes_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:linter/src/rules.dart'; diff --git a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart index 824d782c128..4fb647d1ff1 100644 --- a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart +++ b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/code_actions_source_test.dart b/pkg/analysis_server/test/lsp/code_actions_source_test.dart index 172c10fab17..0c364d5efeb 100644 --- a/pkg/analysis_server/test/lsp/code_actions_source_test.dart +++ b/pkg/analysis_server/test/lsp/code_actions_source_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:linter/src/rules.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/completion.dart b/pkg/analysis_server/test/lsp/completion.dart index ea8d26b746c..6454ee95813 100644 --- a/pkg/analysis_server/test/lsp/completion.dart +++ b/pkg/analysis_server/test/lsp/completion.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'server_abstract.dart'; diff --git a/pkg/analysis_server/test/lsp/completion_dart_test.dart b/pkg/analysis_server/test/lsp/completion_dart_test.dart index 1ae1b513afa..40f2f70e8cd 100644 --- a/pkg/analysis_server/test/lsp/completion_dart_test.dart +++ b/pkg/analysis_server/test/lsp/completion_dart_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/services/linter/lint_names.dart'; import 'package:analysis_server/src/services/snippets/dart/dart_snippet_producers.dart'; diff --git a/pkg/analysis_server/test/lsp/configuration_test.dart b/pkg/analysis_server/test/lsp/configuration_test.dart index a1bb699699b..c4d5b127a5b 100644 --- a/pkg/analysis_server/test/lsp/configuration_test.dart +++ b/pkg/analysis_server/test/lsp/configuration_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/definition_test.dart b/pkg/analysis_server/test/lsp/definition_test.dart index 3eca8f344e6..6f574ca854c 100644 --- a/pkg/analysis_server/test/lsp/definition_test.dart +++ b/pkg/analysis_server/test/lsp/definition_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart' as lsp; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/diagnostic_test.dart b/pkg/analysis_server/test/lsp/diagnostic_test.dart index 553b8fe62b0..a825b0019e5 100644 --- a/pkg/analysis_server/test/lsp/diagnostic_test.dart +++ b/pkg/analysis_server/test/lsp/diagnostic_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:linter/src/rules.dart'; diff --git a/pkg/analysis_server/test/lsp/document_changes_test.dart b/pkg/analysis_server/test/lsp/document_changes_test.dart index ebdb22bbd54..db378549a54 100644 --- a/pkg/analysis_server/test/lsp/document_changes_test.dart +++ b/pkg/analysis_server/test/lsp/document_changes_test.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/protocol/protocol_internal.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Position; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/document_color_test.dart b/pkg/analysis_server/test/lsp/document_color_test.dart index 2bb92a074a2..5e3a80d30b0 100644 --- a/pkg/analysis_server/test/lsp/document_color_test.dart +++ b/pkg/analysis_server/test/lsp/document_color_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/document_highlights_test.dart b/pkg/analysis_server/test/lsp/document_highlights_test.dart index d8df6ac0c6c..300b61e67f2 100644 --- a/pkg/analysis_server/test/lsp/document_highlights_test.dart +++ b/pkg/analysis_server/test/lsp/document_highlights_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/document_symbols_test.dart b/pkg/analysis_server/test/lsp/document_symbols_test.dart index 43b129bcc63..a64a535c89a 100644 --- a/pkg/analysis_server/test/lsp/document_symbols_test.dart +++ b/pkg/analysis_server/test/lsp/document_symbols_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/file_modification_test.dart b/pkg/analysis_server/test/lsp/file_modification_test.dart index 10c43233130..b4fc00aedf0 100644 --- a/pkg/analysis_server/test/lsp/file_modification_test.dart +++ b/pkg/analysis_server/test/lsp/file_modification_test.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/flutter_outline_test.dart b/pkg/analysis_server/test/lsp/flutter_outline_test.dart index 2059de5a499..c400febef94 100644 --- a/pkg/analysis_server/test/lsp/flutter_outline_test.dart +++ b/pkg/analysis_server/test/lsp/flutter_outline_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/folding_test.dart b/pkg/analysis_server/test/lsp/folding_test.dart index 7f17866a83e..ecb3690190a 100644 --- a/pkg/analysis_server/test/lsp/folding_test.dart +++ b/pkg/analysis_server/test/lsp/folding_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/format_test.dart b/pkg/analysis_server/test/lsp/format_test.dart index 69932f39fd3..238d14113c8 100644 --- a/pkg/analysis_server/test/lsp/format_test.dart +++ b/pkg/analysis_server/test/lsp/format_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/hover_test.dart b/pkg/analysis_server/test/lsp/hover_test.dart index 9c06937b8e9..68e216e610a 100644 --- a/pkg/analysis_server/test/lsp/hover_test.dart +++ b/pkg/analysis_server/test/lsp/hover_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/implementation_test.dart b/pkg/analysis_server/test/lsp/implementation_test.dart index ace85a383a1..75ebbd0fd56 100644 --- a/pkg/analysis_server/test/lsp/implementation_test.dart +++ b/pkg/analysis_server/test/lsp/implementation_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/initialization_test.dart b/pkg/analysis_server/test/lsp/initialization_test.dart index 94d60fab4d3..d0c316fd4bf 100644 --- a/pkg/analysis_server/test/lsp/initialization_test.dart +++ b/pkg/analysis_server/test/lsp/initialization_test.dart @@ -4,8 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; import 'package:analysis_server/src/lsp/server_capabilities_computer.dart'; diff --git a/pkg/analysis_server/test/lsp/mapping_test.dart b/pkg/analysis_server/test/lsp/mapping_test.dart index 196b54712b2..46d86bfa550 100644 --- a/pkg/analysis_server/test/lsp/mapping_test.dart +++ b/pkg/analysis_server/test/lsp/mapping_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart' as lsp; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analysis_server/src/lsp/mapping.dart' as lsp; import 'package:analysis_server/src/protocol_server.dart' as server; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/lsp/outline_test.dart b/pkg/analysis_server/test/lsp/outline_test.dart index 4310ec9d355..7c630a2e035 100644 --- a/pkg/analysis_server/test/lsp/outline_test.dart +++ b/pkg/analysis_server/test/lsp/outline_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/reanalyze_test.dart b/pkg/analysis_server/test/lsp/reanalyze_test.dart index ca2de91b26d..5d4c5c2d001 100644 --- a/pkg/analysis_server/test/lsp/reanalyze_test.dart +++ b/pkg/analysis_server/test/lsp/reanalyze_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'server_abstract.dart'; diff --git a/pkg/analysis_server/test/lsp/references_test.dart b/pkg/analysis_server/test/lsp/references_test.dart index 36c52bf0d63..47bdd84d893 100644 --- a/pkg/analysis_server/test/lsp/references_test.dart +++ b/pkg/analysis_server/test/lsp/references_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/rename_test.dart b/pkg/analysis_server/test/lsp/rename_test.dart index ce69a25b4c4..8132cb370b5 100644 --- a/pkg/analysis_server/test/lsp/rename_test.dart +++ b/pkg/analysis_server/test/lsp/rename_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/selection_range_test.dart b/pkg/analysis_server/test/lsp/selection_range_test.dart index 2a4da460c64..74fb0b0923d 100644 --- a/pkg/analysis_server/test/lsp/selection_range_test.dart +++ b/pkg/analysis_server/test/lsp/selection_range_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/semantic_tokens_test.dart b/pkg/analysis_server/test/lsp/semantic_tokens_test.dart index 696b750a090..1acfef17533 100644 --- a/pkg/analysis_server/test/lsp/semantic_tokens_test.dart +++ b/pkg/analysis_server/test/lsp/semantic_tokens_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/semantic_tokens/legend.dart'; import 'package:analysis_server/src/protocol/protocol_internal.dart'; diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart index 5c619989a1a..1a70f928a0f 100644 --- a/pkg/analysis_server/test/lsp/server_abstract.dart +++ b/pkg/analysis_server/test/lsp/server_abstract.dart @@ -4,9 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/analysis_server.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; diff --git a/pkg/analysis_server/test/lsp/server_test.dart b/pkg/analysis_server/test/lsp/server_test.dart index ec720205b44..b29f98ed79e 100644 --- a/pkg/analysis_server/test/lsp/server_test.dart +++ b/pkg/analysis_server/test/lsp/server_test.dart @@ -4,8 +4,7 @@ import 'dart:io'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/signature_help_test.dart b/pkg/analysis_server/test/lsp/signature_help_test.dart index d5add03f6b9..f7559fed98e 100644 --- a/pkg/analysis_server/test/lsp/signature_help_test.dart +++ b/pkg/analysis_server/test/lsp/signature_help_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/super_test.dart b/pkg/analysis_server/test/lsp/super_test.dart index b9192d92d38..e0609c429fc 100644 --- a/pkg/analysis_server/test/lsp/super_test.dart +++ b/pkg/analysis_server/test/lsp/super_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/type_definition_test.dart b/pkg/analysis_server/test/lsp/type_definition_test.dart index c2ad165c369..8d78416d837 100644 --- a/pkg/analysis_server/test/lsp/type_definition_test.dart +++ b/pkg/analysis_server/test/lsp/type_definition_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/will_rename_files_test.dart b/pkg/analysis_server/test/lsp/will_rename_files_test.dart index 9d8894519da..85688d207aa 100644 --- a/pkg/analysis_server/test/lsp/will_rename_files_test.dart +++ b/pkg/analysis_server/test/lsp/will_rename_files_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/lsp/workspace_symbols_test.dart b/pkg/analysis_server/test/lsp/workspace_symbols_test.dart index c617811985e..1bda6829d44 100644 --- a/pkg/analysis_server/test/lsp/workspace_symbols_test.dart +++ b/pkg/analysis_server/test/lsp/workspace_symbols_test.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/mocks_lsp.dart b/pkg/analysis_server/test/mocks_lsp.dart index 45201cc1610..07358d8b35a 100644 --- a/pkg/analysis_server/test/mocks_lsp.dart +++ b/pkg/analysis_server/test/mocks_lsp.dart @@ -5,8 +5,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart' as lsp; -import 'package:analysis_server/lsp_protocol/protocol_special.dart' as lsp; +import 'package:analysis_server/lsp_protocol/protocol.dart' as lsp; import 'package:analysis_server/src/lsp/channel/lsp_channel.dart'; const _jsonEncoder = JsonEncoder.withIndent(' '); diff --git a/pkg/analysis_server/test/src/cider/document_symbols_test.dart b/pkg/analysis_server/test/src/cider/document_symbols_test.dart index 7f59ea4b82b..7d25c9ebbd4 100644 --- a/pkg/analysis_server/test/src/cider/document_symbols_test.dart +++ b/pkg/analysis_server/test/src/cider/document_symbols_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/cider/document_symbols.dart'; import 'package:test/expect.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/cider/signature_help_test.dart b/pkg/analysis_server/test/src/cider/signature_help_test.dart index ca6c2caf1ba..356b1cfb42e 100644 --- a/pkg/analysis_server/test/src/cider/signature_help_test.dart +++ b/pkg/analysis_server/test/src/cider/signature_help_test.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/cider/signature_help.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:collection/collection.dart'; diff --git a/pkg/analysis_server/test/tool/lsp_spec/generated_classes_test.dart b/pkg/analysis_server/test/tool/lsp_spec/generated_classes_test.dart index a506de99ef4..bba959ab0a2 100644 --- a/pkg/analysis_server/test/tool/lsp_spec/generated_classes_test.dart +++ b/pkg/analysis_server/test/tool/lsp_spec/generated_classes_test.dart @@ -2,8 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:test/test.dart'; void main() { diff --git a/pkg/analysis_server/test/tool/lsp_spec/json_test.dart b/pkg/analysis_server/test/tool/lsp_spec/json_test.dart index 7b8ab8b60b6..c90a2a007ab 100644 --- a/pkg/analysis_server/test/tool/lsp_spec/json_test.dart +++ b/pkg/analysis_server/test/tool/lsp_spec/json_test.dart @@ -4,8 +4,7 @@ import 'dart:convert'; -import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; -import 'package:analysis_server/lsp_protocol/protocol_special.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/tool/lsp_spec/matchers.dart b/pkg/analysis_server/test/tool/lsp_spec/matchers.dart index 65bb7aecd48..64731c3b847 100644 --- a/pkg/analysis_server/test/tool/lsp_spec/matchers.dart +++ b/pkg/analysis_server/test/tool/lsp_spec/matchers.dart @@ -2,7 +2,7 @@ // 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/lsp_protocol/protocol_generated.dart'; +import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:matcher/matcher.dart'; import '../../../tool/lsp_spec/typescript_parser.dart';