Version 2.18.0-111.0.dev

Merge commit '37eff8b8bcd124cec3534157b7c397097e112a3c' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -974,7 +974,7 @@ class SuggestionBuilder {
         withNullability: _isNonNullableByDefault);
     _addSuggestion(
       suggestion,
-      textToMatchOverride: element.displayName,
+      textToMatchOverride: _textToMatchOverride(element),
     );
   }
 
@@ -1502,6 +1502,13 @@ class SuggestionBuilder {
       suggestion.docSummary = doc.summary;
     }
   }
+
+  static String _textToMatchOverride(ExecutableElement element) {
+    if (element.isOperator) {
+      return 'operator';
+    }
+    return element.displayName;
+  }
 }
 
 abstract class SuggestionListener {

pkg/analysis_server/lib/src/utilities/extensions/element.dart

@@ -38,7 +38,7 @@ extension ElementExtension on Element {
       ancestor = ancestor.enclosingElement;
     }
     return ancestor is CompilationUnitElement &&
-        ancestor.enclosingElement.hasDeprecated;
+        ancestor.enclosingElement2.hasDeprecated;
   }
 
   /// Return this element and all its enclosing elements.

pkg/analysis_server/test/protocol_server_test.dart

@@ -240,11 +240,13 @@ class EnumTest {
     EnumTester<engine.ElementKind, ElementKind>()
         .run(convertElementKind, exceptions: {
       // TODO(paulberry): do any of the exceptions below constitute bugs?
+      engine.ElementKind.AUGMENTATION_IMPORT: ElementKind.UNKNOWN,
       engine.ElementKind.DYNAMIC: ElementKind.UNKNOWN,
       engine.ElementKind.ERROR: ElementKind.UNKNOWN,
       engine.ElementKind.EXPORT: ElementKind.UNKNOWN,
       engine.ElementKind.GENERIC_FUNCTION_TYPE: ElementKind.FUNCTION_TYPE_ALIAS,
       engine.ElementKind.IMPORT: ElementKind.UNKNOWN,
+      engine.ElementKind.LIBRARY_AUGMENTATION: ElementKind.UNKNOWN,
       engine.ElementKind.NAME: ElementKind.UNKNOWN,
       engine.ElementKind.NEVER: ElementKind.UNKNOWN,
       engine.ElementKind.UNIVERSE: ElementKind.UNKNOWN