Basic support for Container.alignment property.

[email protected]

Change-Id: I509df0b9c5d97e00a2f6ec50f31db1d07396f4ea
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109660
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart

@@ -11,6 +11,7 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/util/comment.dart';
 
@@ -122,6 +123,9 @@ class _WidgetDescriptionComputer {
   /// The instance of [Flutter] support.
   final Flutter flutter;
 
+  ClassElement _classAlignment;
+  ClassElement _classAlignmentDirectional;
+
   _WidgetDescriptionComputer(
     this.classRegistry,
     this.resolvedUnit,
@@ -140,6 +144,8 @@ class _WidgetDescriptionComputer {
       return null;
     }
 
+    await _fetchClassElements();
+
     var properties = <PropertyDescription>[];
     _addProperties(
       properties: properties,
@@ -343,6 +349,18 @@ class _WidgetDescriptionComputer {
         .toList();
   }
 
+  Future<void> _fetchClassElements() async {
+    var sessionHelper = AnalysisSessionHelper(resolvedUnit.session);
+    _classAlignment = await sessionHelper.getClass(
+      flutter.widgetsUri,
+      'Alignment',
+    );
+    _classAlignmentDirectional = await sessionHelper.getClass(
+      flutter.widgetsUri,
+      'AlignmentDirectional',
+    );
+  }
+
   protocol.FlutterWidgetPropertyEditor _getEditor(DartType type) {
     if (type.isDartCoreBool) {
       return protocol.FlutterWidgetPropertyEditor(
@@ -372,6 +390,19 @@ class _WidgetDescriptionComputer {
           enumItems: _enumItemsForEnum(classElement),
         );
       }
+      if (flutter.isExactAlignmentGeometry(classElement)) {
+        var items = <protocol.FlutterWidgetPropertyValueEnumItem>[];
+        items.addAll(
+          _enumItemsForStaticFields(_classAlignment),
+        );
+        items.addAll(
+          _enumItemsForStaticFields(_classAlignmentDirectional),
+        );
+        return protocol.FlutterWidgetPropertyEditor(
+          protocol.FlutterWidgetPropertyEditorKind.ENUM,
+          enumItems: items,
+        );
+      }
     }
     return null;
   }
@@ -406,7 +437,9 @@ class _WidgetDescriptionComputer {
         var field = element.variable;
         if (field is FieldElement && field.isStatic) {
           var enclosingClass = field.enclosingElement as ClassElement;
-          if (field.isEnumConstant) {
+          if (field.isEnumConstant ||
+              flutter.isExactAlignment(enclosingClass) ||
+              flutter.isExactAlignmentDirectional(enclosingClass)) {
             return protocol.FlutterWidgetPropertyValue(
               enumValue: _toEnumItem(field),
             );

pkg/analysis_server/lib/src/utilities/flutter.dart

@@ -33,6 +33,7 @@ class Flutter {
   final String packageName;
   final String widgetsUri;
 
+  final Uri _uriAlignment;
   final Uri _uriAsync;
   final Uri _uriBasic;
   final Uri _uriContainer;
@@ -65,6 +66,7 @@ class Flutter {
 
   Flutter._(this.packageName, String uriPrefix)
       : widgetsUri = '$uriPrefix/widgets.dart',
+        _uriAlignment = Uri.parse('$uriPrefix/src/painting/alignment.dart'),
         _uriAsync = Uri.parse('$uriPrefix/src/widgets/async.dart'),
         _uriBasic = Uri.parse('$uriPrefix/src/widgets/basic.dart'),
         _uriContainer = Uri.parse('$uriPrefix/src/widgets/container.dart'),
@@ -321,6 +323,21 @@ class Flutter {
   bool isChildrenArgument(Expression argument) =>
       argument is NamedExpression && argument.name.label.name == 'children';
 
+  /// Return `true` if the [element] is the Flutter class `Alignment`.
+  bool isExactAlignment(ClassElement element) {
+    return _isExactWidget(element, 'Alignment', _uriAlignment);
+  }
+
+  /// Return `true` if the [element] is the Flutter class `AlignmentDirectional`.
+  bool isExactAlignmentDirectional(ClassElement element) {
+    return _isExactWidget(element, 'AlignmentDirectional', _uriAlignment);
+  }
+
+  /// Return `true` if the [element] is the Flutter class `AlignmentGeometry`.
+  bool isExactAlignmentGeometry(ClassElement element) {
+    return _isExactWidget(element, 'AlignmentGeometry', _uriAlignment);
+  }
+
   /**
    * Return `true` if the [node] is creation of `Container`.
    */

pkg/analysis_server/test/src/services/flutter/constants.dart

@@ -0,0 +1,103 @@
+// Copyright (c) 2019, 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.
+
+var alignmentEditor = '''
+"editor": {
+    "kind": "ENUM",
+    "enumItems": $alignmentEnumItems
+  }''';
+
+var alignmentEnumItems = '''
+[
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "topLeft"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "topCenter"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "topRight"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "centerLeft"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "center"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "centerRight"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "bottomLeft"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "bottomCenter"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "Alignment",
+        "name": "bottomRight"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "topStart"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "topCenter"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "topEnd"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "centerStart"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "center"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "centerEnd"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "bottomStart"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "bottomCenter"
+      },
+      {
+        "libraryUri": "package:flutter/src/painting/alignment.dart",
+        "className": "AlignmentDirectional",
+        "name": "bottomEnd"
+      }
+    ]''';