[analysis_server] Rename some LSP types to match upcoming LSP 3.18

In the upcoming LSP 3.18 spec, many types that were previously inline literal types with no names (that resulted in us auto-generating names) have been made real types with names.

In order to reduce the size of the change when LSP 3.18 arrives, this change renames some of our existing types to match the new names that they will get with LSP 3.18.

There are no functional changes here, I simple added the names to the rename list (removing any redundant values that were previously being renamed differently), regenerated the code, and then updated any remaining references (in non-generated code) to those types to match.

Change-Id: Ic556ce6e52ba94a8d42099371be18288230cd5ef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389160
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: DanTup

pkg/analysis_server/lib/src/lsp/constants.dart

@@ -45,8 +45,8 @@ const dartSignatureHelpTriggerCharacters = <String>['('];
 /// Characters to trigger formatting when format-on-type is enabled.
 const dartTypeFormattingCharacters = ['}', ';'];
 
-/// A [TextDocumentFilterWithScheme] for Analysis Options files.
-final analysisOptionsFile = TextDocumentFilterWithScheme(
+/// A [TextDocumentFilterScheme] for Analysis Options files.
+final analysisOptionsFile = TextDocumentFilterScheme(
     language: 'yaml', scheme: 'file', pattern: '**/analysis_options.yaml');
 
 /// A [ProgressToken] used for reporting progress while the server is analyzing.
@@ -73,14 +73,14 @@ final fileOperationRegistrationOptions = FileOperationRegistrationOptions(
   ],
 );
 
-/// A [TextDocumentFilterWithScheme] for Fix Data files.
-final fixDataFile = TextDocumentFilterWithScheme(
+/// A [TextDocumentFilterScheme] for Fix Data files.
+final fixDataFile = TextDocumentFilterScheme(
     language: 'yaml',
     scheme: 'file',
     pattern: '**/lib/{fix_data.yaml,fix_data/**.yaml}');
 
-/// A [TextDocumentFilterWithScheme] for Pubspec files.
-final pubspecFile = TextDocumentFilterWithScheme(
+/// A [TextDocumentFilterScheme] for Pubspec files.
+final pubspecFile = TextDocumentFilterScheme(
     language: 'yaml', scheme: 'file', pattern: '**/pubspec.yaml');
 
 /// IDs of client-provided commands that the server knows about.

pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart

@@ -247,7 +247,7 @@ class CompletionHandler
 
   /// Computes all supported defaults for completion items based on
   /// [capabilities].
-  CompletionListItemDefaults? _computeCompletionDefaults(
+  CompletionItemDefaults? _computeCompletionDefaults(
     LspClientCapabilities capabilities,
     Range insertionRange,
     Range replacementRange,
@@ -258,7 +258,7 @@ class CompletionHandler
       return null;
     }
 
-    return CompletionListItemDefaults(
+    return CompletionItemDefaults(
       insertTextMode:
           capabilities.completionDefaultTextMode ? InsertTextMode.asIs : null,
       editRange: _computeDefaultEditRange(
@@ -268,7 +268,7 @@ class CompletionHandler
 
   /// Computes the default completion edit range based on [capabilities] and
   /// whether the insert/replacement ranges differ.
-  Either2<CompletionItemEditRange, Range>? _computeDefaultEditRange(
+  Either2<EditRangeWithInsertReplace, Range>? _computeDefaultEditRange(
     LspClientCapabilities capabilities,
     Range insertionRange,
     Range replacementRange,
@@ -279,10 +279,10 @@ class CompletionHandler
 
     if (!capabilities.insertReplaceCompletionRanges ||
         insertionRange == replacementRange) {
-      return Either2<CompletionItemEditRange, Range>.t2(replacementRange);
+      return Either2<EditRangeWithInsertReplace, Range>.t2(replacementRange);
     } else {
-      return Either2<CompletionItemEditRange, Range>.t1(
-        CompletionItemEditRange(
+      return Either2<EditRangeWithInsertReplace, Range>.t1(
+        EditRangeWithInsertReplace(
           insert: insertionRange,
           replace: replacementRange,
         ),
@@ -306,7 +306,7 @@ class CompletionHandler
     required int offset,
     required LineInfo lineInfo,
     required bool Function(String input) filter,
-    CompletionListItemDefaults? defaults,
+    CompletionItemDefaults? defaults,
   }) async {
     var request = DartSnippetRequest(
       unit: unit,
@@ -845,7 +845,7 @@ class CompletionRegistrations extends FeatureRegistration
               previewCommitCharacters ? dartCompletionCommitCharacters : null,
           resolveProvider: true,
           completionItem:
-              CompletionOptionsCompletionItem(labelDetailsSupport: true),
+              ServerCompletionItemOptions(labelDetailsSupport: true),
         ),
       ),
       (
@@ -862,7 +862,7 @@ class CompletionRegistrations extends FeatureRegistration
   ///
   /// We use two dynamic registrations because for Dart we support trigger
   /// characters but for other kinds of files we do not.
-  List<TextDocumentFilterWithScheme> get nonDartCompletionTypes {
+  List<TextDocumentFilterScheme> get nonDartCompletionTypes {
     var pluginTypesExcludingDart =
         pluginTypes.where((filter) => filter.pattern != '**/*.dart');
 
@@ -883,8 +883,7 @@ class CompletionRegistrations extends FeatureRegistration
         allCommitCharacters:
             previewCommitCharacters ? dartCompletionCommitCharacters : null,
         resolveProvider: true,
-        completionItem:
-            CompletionOptionsCompletionItem(labelDetailsSupport: true),
+        completionItem: ServerCompletionItemOptions(labelDetailsSupport: true),
       );
 
   @override
@@ -908,7 +907,7 @@ class _CompletionResults {
   /// Item defaults for completion items.
   ///
   /// Defaults are only supported on Dart server items (not plugins).
-  final CompletionListItemDefaults? defaults;
+  final CompletionItemDefaults? defaults;
 
   _CompletionResults({
     this.rankedItems = const [],

pkg/analysis_server/lib/src/lsp/handlers/handler_initialize.dart

@@ -74,7 +74,7 @@ class InitializeMessageHandler
 
     return success(InitializeResult(
       capabilities: capabilities,
-      serverInfo: InitializeResultServerInfo(
+      serverInfo: ServerInfo(
         name: 'Dart SDK LSP Analysis Server',
         version: sdkVersion,
       ),

pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart

@@ -82,7 +82,8 @@ class PrepareRenameHandler extends LspMessageHandler<TextDocumentPositionParams,
             ServerErrorCodes.RenameNotValid, initStatus.problem!.message);
       }
 
-      return success(TextDocumentPrepareRenameResult.t1(PlaceholderAndRange(
+      return success(
+          TextDocumentPrepareRenameResult.t1(PrepareRenamePlaceholder(
         range: toRange(
           unit.lineInfo,
           // If the offset is set to -1 it means there is no location for the

pkg/analysis_server/lib/src/lsp/handlers/handler_semantic_tokens.dart

@@ -159,8 +159,8 @@ class SemanticTokensRegistrations extends FeatureRegistration
   ToJsonable? get options => SemanticTokensRegistrationOptions(
         documentSelector: fullySupportedTypes,
         legend: semanticTokenLegend.lspLegend,
-        full: Either2<bool, SemanticTokensOptionsFull>.t2(
-          SemanticTokensOptionsFull(delta: false),
+        full: Either2<bool, SemanticTokensFullDelta>.t2(
+          SemanticTokensFullDelta(delta: false),
         ),
         range: Either2<bool, SemanticTokensOptionsRange>.t1(true),
       );
@@ -173,7 +173,7 @@ class SemanticTokensRegistrations extends FeatureRegistration
   StaticOptions get staticOptions => Either2.t1(
         SemanticTokensOptions(
           legend: semanticTokenLegend.lspLegend,
-          full: Either2.t2(SemanticTokensOptionsFull(delta: false)),
+          full: Either2.t2(SemanticTokensFullDelta(delta: false)),
           range: Either2.t1(true),
         ),
       );

pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart

@@ -169,7 +169,7 @@ class TextDocumentRegistrations extends FeatureRegistration
   @override
   bool get supportsDynamic => clientDynamic.textSync;
 
-  List<TextDocumentFilterWithScheme> get synchronisedTypes {
+  List<TextDocumentFilterScheme> get synchronisedTypes {
     return {
       ...fullySupportedTypes,
       pubspecFile,

pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart

@@ -61,7 +61,7 @@ class LspAnalysisServer extends AnalysisServer {
 
   /// Information about the connected client. Will be null prior to
   /// initialization or if the client did not provide it.
-  InitializeParamsClientInfo? _clientInfo;
+  ClientInfo? _clientInfo;
 
   /// Initialization options provided by the LSP client. Allows opting in/out of
   /// specific server functionality. Will be null prior to initialization.
@@ -213,7 +213,7 @@ class LspAnalysisServer extends AnalysisServer {
 
   /// Information about the connected editor client. Will be `null` prior to
   /// initialization.
-  InitializeParamsClientInfo? get clientInfo => _clientInfo;
+  ClientInfo? get clientInfo => _clientInfo;
 
   /// The name of the remote when the client is running using a remote workspace.
   ///
@@ -407,7 +407,7 @@ class LspAnalysisServer extends AnalysisServer {
 
   void handleClientConnection(
     ClientCapabilities capabilities,
-    InitializeParamsClientInfo? clientInfo,
+    ClientInfo? clientInfo,
     Object? initializationOptions,
   ) {
     _clientCapabilities = LspClientCapabilities(capabilities);

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -792,7 +792,7 @@ lsp.CompletionItem snippetToCompletionItem(
   LineInfo lineInfo,
   Position position,
   Snippet snippet,
-  CompletionListItemDefaults? defaults,
+  CompletionItemDefaults? defaults,
 ) {
   assert(capabilities.completionSnippets);
 

pkg/analysis_server/lib/src/lsp/registration/feature_registration.dart

@@ -57,7 +57,7 @@ abstract class FeatureRegistration {
   ClientDynamicRegistrations get clientDynamic => _context.clientDynamic;
 
   /// A set of filters for the currently supported Dart files.
-  List<TextDocumentFilterWithScheme> get dartFiles => _context.dartFilters;
+  List<TextDocumentFilterScheme> get dartFiles => _context.dartFilters;
 
   /// Gets all dynamic registrations for this feature.
   ///
@@ -69,15 +69,15 @@ abstract class FeatureRegistration {
   /// File types like pubspec.yaml, analysis_options.yaml and fix_data files are
   /// not included here as their support is very limited and do not provide
   /// functionality in most handlers.
-  List<TextDocumentFilterWithScheme> get fullySupportedTypes {
+  List<TextDocumentFilterScheme> get fullySupportedTypes {
     return {
       ...dartFiles,
       ...pluginTypes,
     }.toList();
   }
 
   /// Types of documents that loaded plugins are interested in.
-  List<TextDocumentFilterWithScheme> get pluginTypes => _context.pluginTypes;
+  List<TextDocumentFilterScheme> get pluginTypes => _context.pluginTypes;
 
   /// Whether both the client, and this feature, support dynamic registration.
   bool get supportsDynamic;
@@ -191,7 +191,7 @@ class RegistrationContext {
   final ClientDynamicRegistrations clientDynamic;
 
   /// Types of documents that loaded plugins are interested in.
-  final List<TextDocumentFilterWithScheme> pluginTypes;
+  final List<TextDocumentFilterScheme> pluginTypes;
 
   /// The capabilities of the client.
   final LspClientCapabilities clientCapabilities;
@@ -200,7 +200,7 @@ class RegistrationContext {
   final LspClientConfiguration clientConfiguration;
 
   /// Filters for all Dart files supported by the current server.
-  final List<TextDocumentFilterWithScheme> dartFilters;
+  final List<TextDocumentFilterScheme> dartFilters;
 
   /// Custom schemes supported for Dart files by the current server.
   ///

pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart

@@ -146,7 +146,7 @@ class ServerCapabilitiesComputer {
 
   ServerCapabilitiesComputer(this._server);
 
-  List<TextDocumentFilterWithScheme> get pluginTypes => AnalysisServer
+  List<TextDocumentFilterScheme> get pluginTypes => AnalysisServer
           .supportsPlugins
       ? _server.pluginManager.plugins
           .expand(
@@ -156,9 +156,9 @@ class ServerCapabilitiesComputer {
           // interestingFiles. Prefix a `**/` so that the glob matches nested
           // folders as well.
           .map((glob) =>
-              TextDocumentFilterWithScheme(scheme: 'file', pattern: '**/$glob'))
+              TextDocumentFilterScheme(scheme: 'file', pattern: '**/$glob'))
           .toList()
-      : <TextDocumentFilterWithScheme>[];
+      : <TextDocumentFilterScheme>[];
 
   ServerCapabilities computeServerCapabilities(
     LspClientCapabilities clientCapabilities,
@@ -194,7 +194,7 @@ class ServerCapabilitiesComputer {
       typeHierarchyProvider: features.typeHierarchy.staticRegistration,
       executeCommandProvider: features.executeCommand.staticRegistration,
       workspaceSymbolProvider: features.workspaceSymbol.staticRegistration,
-      workspace: ServerCapabilitiesWorkspace(
+      workspace: WorkspaceOptions(
         workspaceFolders: WorkspaceFoldersServerCapabilities(
           supported: true,
           changeNotifications: features.changeNotifications.staticRegistration,
@@ -336,7 +336,7 @@ class ServerCapabilitiesComputer {
           'file',
           ..._server.uriConverter.supportedNonFileSchemes
         })
-          TextDocumentFilterWithScheme(language: 'dart', scheme: scheme)
+          TextDocumentFilterScheme(language: 'dart', scheme: scheme)
       ],
       pluginTypes: pluginTypes,
     );