Issue 40689. Add isStatic to available Declaration.

I did not use it yet, but filtered out all not top-level declarations
that are not CONSTRUCTOR or ENUM_CONSTANT. But isStatic might be used
if we decide to suggest static getters.

[email protected], [email protected]

Bug: #40689
Change-Id: I1c86754d9dbbc1422defc06a8fe6a47fa0bf6f98
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136410
Reviewed-by: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/domains/completion/available_suggestions.dart

@@ -183,15 +183,18 @@ String _getRelativeFileUri(ResolvedUnitResult unit, Uri what) {
 protocol.AvailableSuggestion _protocolAvailableSuggestion(
     Declaration declaration) {
   var label = declaration.name;
-  if (declaration.kind == DeclarationKind.CONSTRUCTOR) {
-    label = declaration.parent.name;
-    if (declaration.name.isNotEmpty) {
-      label += '.${declaration.name}';
+  if (declaration.parent != null) {
+    if (declaration.kind == DeclarationKind.CONSTRUCTOR) {
+      label = declaration.parent.name;
+      if (declaration.name.isNotEmpty) {
+        label += '.${declaration.name}';
+      }
+    } else if (declaration.kind == DeclarationKind.ENUM_CONSTANT) {
+      label = '${declaration.parent.name}.${declaration.name}';
+    } else {
+      return null;
     }
   }
-  if (declaration.kind == DeclarationKind.ENUM_CONSTANT) {
-    label = '${declaration.parent.name}.${declaration.name}';
-  }
 
   String declaringLibraryUri;
   if (declaration.parent == null) {
@@ -227,7 +230,9 @@ protocol.AvailableSuggestionSet _protocolAvailableSuggestionSet(
 
   void addItem(Declaration declaration) {
     var suggestion = _protocolAvailableSuggestion(declaration);
-    items.add(suggestion);
+    if (suggestion != null) {
+      items.add(suggestion);
+    }
     declaration.children.forEach(addItem);
   }
 
@@ -260,8 +265,9 @@ int _protocolElementFlags(Declaration declaration) {
   return protocol.Element.makeFlags(
     isAbstract: declaration.isAbstract,
     isConst: declaration.isConst,
-    isFinal: declaration.isFinal,
     isDeprecated: declaration.isDeprecated,
+    isFinal: declaration.isFinal,
+    isStatic: declaration.isStatic,
   );
 }
 

pkg/analyzer/lib/src/services/available_declarations.dart

@@ -45,6 +45,7 @@ class Declaration {
   final bool isConst;
   final bool isDeprecated;
   final bool isFinal;
+  final bool isStatic;
   final DeclarationKind kind;
   final LineInfo lineInfo;
   final int locationOffset;
@@ -75,6 +76,7 @@ class Declaration {
     @required this.isConst,
     @required this.isDeprecated,
     @required this.isFinal,
+    @required this.isStatic,
     @required this.kind,
     @required this.lineInfo,
     @required this.locationOffset,
@@ -925,6 +927,7 @@ class _DeclarationStorage {
       isConst: d.isConst,
       isDeprecated: d.isDeprecated,
       isFinal: d.isFinal,
+      isStatic: d.isStatic,
       kind: kind,
       lineInfo: lineInfo,
       locationOffset: d.locationOffset,
@@ -1049,6 +1052,7 @@ class _DeclarationStorage {
       isConst: d.isConst,
       isDeprecated: d.isDeprecated,
       isFinal: d.isFinal,
+      isStatic: d.isStatic,
       kind: idlKind,
       locationOffset: d.locationOffset,
       locationStartColumn: d.locationStartColumn,
@@ -1105,7 +1109,7 @@ class _ExportCombinator {
 
 class _File {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 14;
+  static const int DATA_VERSION = 15;
 
   /// The next value for [id].
   static int _nextId = 0;
@@ -1318,6 +1322,7 @@ class _File {
       bool isConst = false,
       bool isDeprecated = false,
       bool isFinal = false,
+      bool isStatic = false,
       @required DeclarationKind kind,
       @required Identifier name,
       String parameters,
@@ -1347,6 +1352,7 @@ class _File {
         isConst: isConst,
         isDeprecated: isDeprecated,
         isFinal: isFinal,
+        isStatic: isStatic,
         kind: kind,
         lineInfo: lineInfo,
         locationOffset: locationOffset,
@@ -1413,6 +1419,7 @@ class _File {
             );
             hasConstructor = true;
           } else if (classMember is FieldDeclaration) {
+            var isStatic = classMember.isStatic;
             var isConst = classMember.fields.isConst;
             var isFinal = classMember.fields.isFinal;
             for (var field in classMember.fields.variables) {
@@ -1421,6 +1428,7 @@ class _File {
                 isConst: isConst,
                 isDeprecated: isDeprecated,
                 isFinal: isFinal,
+                isStatic: isStatic,
                 kind: DeclarationKind.FIELD,
                 name: field.name,
                 parent: parent,
@@ -1429,10 +1437,12 @@ class _File {
               );
             }
           } else if (classMember is MethodDeclaration) {
+            var isStatic = classMember.isStatic;
             var parameters = classMember.parameters;
             if (classMember.isGetter) {
               addDeclaration(
                 isDeprecated: isDeprecated,
+                isStatic: isStatic,
                 kind: DeclarationKind.GETTER,
                 name: classMember.name,
                 parent: parent,
@@ -1441,6 +1451,7 @@ class _File {
             } else if (classMember.isSetter) {
               addDeclaration(
                 isDeprecated: isDeprecated,
+                isStatic: isStatic,
                 kind: DeclarationKind.SETTER,
                 name: classMember.name,
                 parameters: parameters.toSource(),
@@ -1456,6 +1467,7 @@ class _File {
                 defaultArgumentListString: defaultArguments?.text,
                 defaultArgumentListTextRanges: defaultArguments?.ranges,
                 isDeprecated: isDeprecated,
+                isStatic: isStatic,
                 kind: DeclarationKind.METHOD,
                 name: classMember.name,
                 parameters: parameters.toSource(),
@@ -1496,6 +1508,7 @@ class _File {
             isConst: false,
             isDeprecated: false,
             isFinal: false,
+            isStatic: false,
             kind: DeclarationKind.CONSTRUCTOR,
             locationOffset: -1,
             locationPath: path,

pkg/analyzer/lib/src/summary/format.dart

@@ -2158,6 +2158,7 @@ class AvailableDeclarationBuilder extends Object
   bool _isConst;
   bool _isDeprecated;
   bool _isFinal;
+  bool _isStatic;
   idl.AvailableDeclarationKind _kind;
   int _locationOffset;
   int _locationStartColumn;
@@ -2261,6 +2262,13 @@ class AvailableDeclarationBuilder extends Object
     this._isFinal = value;
   }
 
+  @override
+  bool get isStatic => _isStatic ??= false;
+
+  set isStatic(bool value) {
+    this._isStatic = value;
+  }
+
   @override
   idl.AvailableDeclarationKind get kind =>
       _kind ??= idl.AvailableDeclarationKind.CLASS;
@@ -2370,6 +2378,7 @@ class AvailableDeclarationBuilder extends Object
       bool isConst,
       bool isDeprecated,
       bool isFinal,
+      bool isStatic,
       idl.AvailableDeclarationKind kind,
       int locationOffset,
       int locationStartColumn,
@@ -2394,6 +2403,7 @@ class AvailableDeclarationBuilder extends Object
         _isConst = isConst,
         _isDeprecated = isDeprecated,
         _isFinal = isFinal,
+        _isStatic = isStatic,
         _kind = kind,
         _locationOffset = locationOffset,
         _locationStartColumn = locationStartColumn,
@@ -2440,6 +2450,7 @@ class AvailableDeclarationBuilder extends Object
     signature.addBool(this._isConst == true);
     signature.addBool(this._isDeprecated == true);
     signature.addBool(this._isFinal == true);
+    signature.addBool(this._isStatic == true);
     signature.addInt(this._kind == null ? 0 : this._kind.index);
     signature.addInt(this._locationOffset ?? 0);
     signature.addInt(this._locationStartColumn ?? 0);
@@ -2568,41 +2579,44 @@ class AvailableDeclarationBuilder extends Object
     if (_isFinal == true) {
       fbBuilder.addBool(11, true);
     }
+    if (_isStatic == true) {
+      fbBuilder.addBool(12, true);
+    }
     if (_kind != null && _kind != idl.AvailableDeclarationKind.CLASS) {
-      fbBuilder.addUint8(12, _kind.index);
+      fbBuilder.addUint8(13, _kind.index);
     }
     if (_locationOffset != null && _locationOffset != 0) {
-      fbBuilder.addUint32(13, _locationOffset);
+      fbBuilder.addUint32(14, _locationOffset);
     }
     if (_locationStartColumn != null && _locationStartColumn != 0) {
-      fbBuilder.addUint32(14, _locationStartColumn);
+      fbBuilder.addUint32(15, _locationStartColumn);
     }
     if (_locationStartLine != null && _locationStartLine != 0) {
-      fbBuilder.addUint32(15, _locationStartLine);
+      fbBuilder.addUint32(16, _locationStartLine);
     }
     if (offset_name != null) {
-      fbBuilder.addOffset(16, offset_name);
+      fbBuilder.addOffset(17, offset_name);
     }
     if (offset_parameterNames != null) {
-      fbBuilder.addOffset(17, offset_parameterNames);
+      fbBuilder.addOffset(18, offset_parameterNames);
     }
     if (offset_parameters != null) {
-      fbBuilder.addOffset(18, offset_parameters);
+      fbBuilder.addOffset(19, offset_parameters);
     }
     if (offset_parameterTypes != null) {
-      fbBuilder.addOffset(19, offset_parameterTypes);
+      fbBuilder.addOffset(20, offset_parameterTypes);
     }
     if (offset_relevanceTags != null) {
-      fbBuilder.addOffset(20, offset_relevanceTags);
+      fbBuilder.addOffset(21, offset_relevanceTags);
     }
     if (_requiredParameterCount != null && _requiredParameterCount != 0) {
-      fbBuilder.addUint32(21, _requiredParameterCount);
+      fbBuilder.addUint32(22, _requiredParameterCount);
     }
     if (offset_returnType != null) {
-      fbBuilder.addOffset(22, offset_returnType);
+      fbBuilder.addOffset(23, offset_returnType);
     }
     if (offset_typeParameters != null) {
-      fbBuilder.addOffset(23, offset_typeParameters);
+      fbBuilder.addOffset(24, offset_typeParameters);
     }
     return fbBuilder.endTable();
   }
@@ -2637,6 +2651,7 @@ class _AvailableDeclarationImpl extends Object
   bool _isConst;
   bool _isDeprecated;
   bool _isFinal;
+  bool _isStatic;
   idl.AvailableDeclarationKind _kind;
   int _locationOffset;
   int _locationStartColumn;
@@ -2727,84 +2742,90 @@ class _AvailableDeclarationImpl extends Object
     return _isFinal;
   }
 
+  @override
+  bool get isStatic {
+    _isStatic ??= const fb.BoolReader().vTableGet(_bc, _bcOffset, 12, false);
+    return _isStatic;
+  }
+
   @override
   idl.AvailableDeclarationKind get kind {
     _kind ??= const _AvailableDeclarationKindReader()
-        .vTableGet(_bc, _bcOffset, 12, idl.AvailableDeclarationKind.CLASS);
+        .vTableGet(_bc, _bcOffset, 13, idl.AvailableDeclarationKind.CLASS);
     return _kind;
   }
 
   @override
   int get locationOffset {
     _locationOffset ??=
-        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 13, 0);
+        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 14, 0);
     return _locationOffset;
   }
 
   @override
   int get locationStartColumn {
     _locationStartColumn ??=
-        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 14, 0);
+        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 15, 0);
     return _locationStartColumn;
   }
 
   @override
   int get locationStartLine {
     _locationStartLine ??=
-        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 15, 0);
+        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 16, 0);
     return _locationStartLine;
   }
 
   @override
   String get name {
-    _name ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 16, '');
+    _name ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 17, '');
     return _name;
   }
 
   @override
   List<String> get parameterNames {
     _parameterNames ??= const fb.ListReader<String>(fb.StringReader())
-        .vTableGet(_bc, _bcOffset, 17, const <String>[]);
+        .vTableGet(_bc, _bcOffset, 18, const <String>[]);
     return _parameterNames;
   }
 
   @override
   String get parameters {
-    _parameters ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 18, '');
+    _parameters ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 19, '');
     return _parameters;
   }
 
   @override
   List<String> get parameterTypes {
     _parameterTypes ??= const fb.ListReader<String>(fb.StringReader())
-        .vTableGet(_bc, _bcOffset, 19, const <String>[]);
+        .vTableGet(_bc, _bcOffset, 20, const <String>[]);
     return _parameterTypes;
   }
 
   @override
   List<String> get relevanceTags {
     _relevanceTags ??= const fb.ListReader<String>(fb.StringReader())
-        .vTableGet(_bc, _bcOffset, 20, const <String>[]);
+        .vTableGet(_bc, _bcOffset, 21, const <String>[]);
     return _relevanceTags;
   }
 
   @override
   int get requiredParameterCount {
     _requiredParameterCount ??=
-        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 21, 0);
+        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 22, 0);
     return _requiredParameterCount;
   }
 
   @override
   String get returnType {
-    _returnType ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 22, '');
+    _returnType ??= const fb.StringReader().vTableGet(_bc, _bcOffset, 23, '');
     return _returnType;
   }
 
   @override
   String get typeParameters {
     _typeParameters ??=
-        const fb.StringReader().vTableGet(_bc, _bcOffset, 23, '');
+        const fb.StringReader().vTableGet(_bc, _bcOffset, 24, '');
     return _typeParameters;
   }
 }
@@ -2849,6 +2870,9 @@ abstract class _AvailableDeclarationMixin implements idl.AvailableDeclaration {
     if (isFinal != false) {
       _result["isFinal"] = isFinal;
     }
+    if (isStatic != false) {
+      _result["isStatic"] = isStatic;
+    }
     if (kind != idl.AvailableDeclarationKind.CLASS) {
       _result["kind"] = kind.toString().split('.')[1];
     }
@@ -2902,6 +2926,7 @@ abstract class _AvailableDeclarationMixin implements idl.AvailableDeclaration {
         "isConst": isConst,
         "isDeprecated": isDeprecated,
         "isFinal": isFinal,
+        "isStatic": isStatic,
         "kind": kind,
         "locationOffset": locationOffset,
         "locationStartColumn": locationStartColumn,