@@ -9,8 +9,6 @@ import 'package:analysis_server/src/computer/computer_documentation.dart';
99import 'package:analysis_server/src/lsp/client_capabilities.dart' ;
1010import 'package:analysis_server/src/lsp/dartdoc.dart' ;
1111import 'package:analysis_server/src/lsp/mapping.dart' ;
12- import 'package:analysis_server/src/protocol_server.dart'
13- show getReturnTypeString;
1412import 'package:analysis_server/src/protocol_server.dart' as server;
1513import 'package:analysis_server/src/services/completion/dart/candidate_suggestion.dart' ;
1614import 'package:analysis_server/src/services/completion/dart/completion_manager.dart' ;
@@ -19,8 +17,10 @@ import 'package:analysis_server/src/utilities/extensions/ast.dart';
1917import 'package:analysis_server/src/utilities/extensions/element.dart' ;
2018import 'package:analysis_server/src/utilities/extensions/string.dart' ;
2119import 'package:analyzer/dart/element/element.dart' ;
20+ import 'package:analyzer/dart/element/element2.dart' ;
2221import 'package:analyzer/source/line_info.dart' as server;
2322import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart' ;
23+ import 'package:analyzer/src/utilities/extensions/element.dart' ;
2424import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart' ;
2525import 'package:analyzer_plugin/src/utilities/documentation.dart' ;
2626import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart' ;
@@ -40,7 +40,7 @@ Future<OverrideData?> createOverrideSuggestionData(
4040 builder,
4141 ) {
4242 builder.addReplacement (suggestion.replacementRange, (builder) {
43- builder.writeOverride (
43+ builder.writeOverride2 (
4444 suggestion.element,
4545 displayTextBuffer: displayTextBuffer,
4646 invokeSuper: suggestion.shouldInvokeSuper,
@@ -127,7 +127,7 @@ Future<lsp.CompletionItem?> toLspCompletionItem(
127127 // functions but they should not be included in the completions.
128128 var element =
129129 suggestion is ElementBasedSuggestion
130- ? (suggestion as ElementBasedSuggestion ).element
130+ ? (suggestion as ElementBasedSuggestion ).element.asElement
131131 : null ;
132132 var isCallable =
133133 element != null &&
@@ -226,21 +226,21 @@ Future<lsp.CompletionItem?> toLspCompletionItem(
226226 if (suggestion is ElementBasedSuggestion ) {
227227 var element = (suggestion as ElementBasedSuggestion ).element;
228228
229- if (element is ExecutableElement && element is ! PropertyAccessorElement ) {
229+ if (element is ExecutableElement2 && element is ! PropertyAccessorElement2 ) {
230230 parameterNames =
231- element.parameters .map ((parameter) {
232- return parameter.name ;
231+ element.formalParameters .map ((parameter) {
232+ return parameter.displayName ;
233233 }).toList ();
234234
235- var requiredParameters = element.parameters .where (
236- (ParameterElement param) => param.isRequiredPositional,
235+ var requiredParameters = element.formalParameters .where (
236+ (FormalParameterElement param) => param.isRequiredPositional,
237237 );
238238
239- var namedParameters = element.parameters .where (
240- (ParameterElement param) => param.isNamed,
239+ var namedParameters = element.formalParameters .where (
240+ (FormalParameterElement param) => param.isNamed,
241241 );
242242
243- defaultArgumentList = computeCompletionDefaultArgumentList (
243+ defaultArgumentList = computeCompletionDefaultArgumentList2 (
244244 element,
245245 requiredParameters,
246246 namedParameters,
@@ -382,7 +382,7 @@ lsp.CompletionItemKind? _candidateToCompletionItemKind(
382382
383383 if (suggestion is ElementBasedSuggestion ) {
384384 return _elementToCompletionItemKind (
385- (suggestion as ElementBasedSuggestion ).element,
385+ (suggestion as ElementBasedSuggestion ).element.asElement ! ,
386386 supportedCompletionKinds,
387387 ).firstWhereOrNull (isSupported);
388388 }
@@ -533,15 +533,15 @@ CompletionDetail _getCompletionDetail(
533533 }
534534 String ? parameters;
535535 if (element != null ) {
536- parameters = getParametersString (element);
536+ parameters = getParametersString2 (element);
537537 // Prefer the element return type (because it may be more specific
538538 // for overrides) and fall back to the parameter type or return type from the
539539 // suggestion (handles records).
540540 String ? parameterType;
541- if (element is ParameterElement ) {
541+ if (element is FormalParameterElement ) {
542542 parameterType = element.type.getDisplayString ();
543543 }
544- returnType = getReturnTypeString (element) ?? parameterType;
544+ returnType = server. getReturnTypeString2 (element) ?? parameterType;
545545
546546 // Extract the type from setters to be shown in the place a return type
547547 // would usually be shown.
@@ -575,7 +575,10 @@ CompletionDetail _getCompletionDetail(
575575
576576 // Use the full signature in the details popup.
577577 var detail = fullSignature;
578- if (element != null && element.hasDeprecated && ! supportsDeprecated) {
578+ if (element != null &&
579+ (element is Annotatable &&
580+ (element as Annotatable ).metadata2.hasDeprecated) &&
581+ ! supportsDeprecated) {
579582 // If the item is deprecated and we don't support the native deprecated flag
580583 // then include it in the details.
581584 detail = '$detail \n\n (Deprecated)' .trim ();
@@ -638,11 +641,11 @@ _ElementDocumentation? _getDocsFromComputer(
638641
639642/// If the [element] has a documentation comment, return it.
640643String ? _getDocumentation (
641- Element element,
644+ Element2 element,
642645 DartCompletionRequest request,
643646 DocumentationPreference includeDocumentation,
644647) {
645- var docs = _getDocsFromComputer (element, request);
648+ var docs = _getDocsFromComputer (element.asElement ! , request);
646649
647650 var doc = removeDartDocDelimiters (docs? .full);
648651 var rawDoc =
0 commit comments