Version 2.10.0-115.0.dev

Merge commit '16140ad7162cd309373a7743090f185e3872e9e6' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform.dart

@@ -6,11 +6,14 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/change.d
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
 import 'package:meta/meta.dart';
 
-/// The behavior common to all of the data used to construct fixes.
+/// A description of a set of changes to a single element of the API.
 class Transform {
   /// The human-readable title describing the transform.
   final String title;
 
+  /// The date on which the API was changed.
+  final DateTime date;
+
   /// The element being transformed.
   final ElementDescriptor element;
 
@@ -20,7 +23,10 @@ class Transform {
   /// Initialize a newly created transform to describe a transformation of the
   /// [element].
   Transform(
-      {@required this.title, @required this.element, @required this.changes});
+      {@required this.title,
+      this.date,
+      @required this.element,
+      @required this.changes});
 
   /// Return `true` if this transform can be applied to fix an issue related to
   /// an element with the given [name] in a library that imports the

pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart

@@ -23,6 +23,7 @@ class TransformSetParser {
   static const String _classKey = 'class';
   static const String _constantKey = 'constant';
   static const String _constructorKey = 'constructor';
+  static const String _dateKey = 'date';
   static const String _elementKey = 'element';
   static const String _enumKey = 'enum';
   static const String _extensionKey = 'extension';
@@ -299,6 +300,33 @@ class TransformSetParser {
     }
   }
 
+  /// Translate the [node] into a date. Return the resulting date, or `null`
+  /// if the [node] does not represent a valid date. If the [node] is not
+  /// valid, use the name of the associated [key] to report the error.
+  DateTime _translateDate(YamlNode node, String key) {
+    if (node is YamlScalar) {
+      var value = node.value;
+      if (value is String) {
+        try {
+          return DateTime.parse(value);
+        } on FormatException {
+          // Fall through to report the invalid value.
+        }
+      }
+      _reportError(TransformSetErrorCode.invalidValue, node,
+          [key, 'Date', _nodeType(node)]);
+      return null;
+    } else if (node == null) {
+      // TODO(brianwilkerson) Report the missing YAML. For the best UX we
+      //  probably need to pass in the code to report.
+      return null;
+    } else {
+      _reportError(TransformSetErrorCode.invalidValue, node,
+          [key, 'Date', _nodeType(node)]);
+      return null;
+    }
+  }
+
   /// Translate the [node] into an element descriptor. Return the resulting
   /// descriptor, or `null` if the [node] does not represent a valid element
   /// descriptor. If the [node] is not valid, use the name of the associated
@@ -463,9 +491,15 @@ class TransformSetParser {
   /// is not valid, use the name of the associated [key] to report the error.
   Transform _translateTransform(YamlNode node, String key) {
     if (node is YamlMap) {
-      _reportUnsupportedKeys(node, const {_changesKey, _elementKey, _titleKey});
+      _reportUnsupportedKeys(
+          node, const {_changesKey, _dateKey, _elementKey, _titleKey});
       var title = _translateString(node.valueAt(_titleKey), _titleKey);
+      var date = _translateDate(node.valueAt(_dateKey), _dateKey);
       var element = _translateElement(node.valueAt(_elementKey), _elementKey);
+      if (element == null) {
+        // The error has already been reported.
+        return null;
+      }
       var changes = _translateList(
           node.valueAt(_changesKey), _changesKey, _translateChange);
       if (changes == null) {
@@ -476,7 +510,8 @@ class TransformSetParser {
         changes.add(ModifyParameters(modifications: _parameterModifications));
         _parameterModifications = null;
       }
-      return Transform(title: title, element: element, changes: changes);
+      return Transform(
+          title: title, date: date, element: element, changes: changes);
     } else if (node == null) {
       // TODO(brianwilkerson) Report the missing YAML.
       return null;
@@ -492,19 +527,23 @@ class TransformSetParser {
   TransformSet _translateTransformSet(YamlNode node) {
     if (node is YamlMap) {
       _reportUnsupportedKeys(node, const {_transformsKey, _versionKey});
-      var set = TransformSet();
-      // TODO(brianwilkerson) Version information is currently being ignored,
-      //  but needs to be used to select a translator.
       var version = _translateInteger(node.valueAt(_versionKey), _versionKey);
-      if (version != currentVersion) {
-        // TODO(brianwilkerson) Report the unsupported version.
+      if (version == null) {
+        // The error has already been reported.
+        return null;
+      } else if (version > currentVersion) {
+        // TODO(brianwilkerson) Report that the version is unsupported.
+        return null;
       }
+      // TODO(brianwilkerson) Version information is currently being ignored,
+      //  but needs to be used to select a translator.
       var transformations = _translateList(
           node.valueAt(_transformsKey), _transformsKey, _translateTransform);
       if (transformations == null) {
         // The error has already been reported.
         return null;
       }
+      var set = TransformSet();
       for (var transform in transformations) {
         set.addTransform(transform);
       }

pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/invalid_value_test.dart

@@ -22,12 +22,11 @@ transforms:
 - title: 'Rename A'
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - 'rename'
 ''', [
-      error(TransformSetErrorCode.invalidValue, 123, 8),
+      error(TransformSetErrorCode.invalidValue, 110, 8),
     ]);
   }
 
@@ -52,8 +51,7 @@ transforms:
 - title: 'Rename A'
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'rename'
       newName: 'B'
@@ -69,8 +67,7 @@ transforms:
 - title: 'Rename A'
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'rename'
       newName: 'B'
@@ -95,8 +92,7 @@ transforms:
 - title: 0
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'rename'
       newName: 'B'
@@ -112,8 +108,7 @@ transforms:
 - title: []
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'rename'
       newName: 'B'
@@ -147,15 +142,14 @@ transforms:
 - title: 'Rename A'
   element:
     uris: ['test.dart']
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'addTypeParameter'
       index: 1
       name: 'T'
       value: 'int'
 ''', [
-      error(TransformSetErrorCode.invalidValue, 192, 5),
+      error(TransformSetErrorCode.invalidValue, 179, 5),
     ]);
   }
 }

pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/unsupported_key_test.dart

@@ -23,14 +23,13 @@ transforms:
   element:
     uris:
       - 'test.dart'
-    components:
-      - 'A'
+    class: 'A'
   changes:
     - kind: 'rename'
       oldName: 'A'
       newName: 'B'
 ''', [
-      error(TransformSetErrorCode.unsupportedKey, 150, 7),
+      error(TransformSetErrorCode.unsupportedKey, 137, 7),
     ]);
   }
 }

pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test.dart

@@ -216,6 +216,24 @@ transforms:
     expect(parameter.index, 2);
   }
 
+  void test_date() {
+    parse('''
+version: 1
+transforms:
+- title: 'Rename g'
+  date: 2020-09-10
+  element:
+    uris: ['test.dart']
+    getter: 'g'
+  changes: []
+''');
+    var transforms = result.transformsFor('g', ['test.dart']);
+    expect(transforms, hasLength(1));
+    var transform = transforms[0];
+    expect(transform.title, 'Rename g');
+    expect(transform.changes, isEmpty);
+  }
+
   void test_element_getter_inMixin() {
     parse('''
 version: 1

pkg/analyzer/lib/src/dart/micro/library_analyzer.dart

@@ -277,7 +277,7 @@ class LibraryAnalyzer {
         typeSystem: _typeSystem,
         inheritanceManager: _inheritance,
         analysisOptions: _context.analysisOptions,
-        workspacePackage: null, // TODO(scheglov) implement it
+        workspacePackage: _library.workspacePackage,
       ),
     );
 

pkg/analyzer/lib/src/dart/micro/library_graph.dart

@@ -30,9 +30,11 @@ import 'package:analyzer/src/summary/link.dart' as graph
     show DependencyWalker, Node;
 import 'package:analyzer/src/summary2/informative_data.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/workspace/workspace.dart';
 import 'package:collection/collection.dart';
 import 'package:convert/convert.dart';
 import 'package:meta/meta.dart';
+import 'package:pub_semver/pub_semver.dart';
 
 /// Ensure that the [FileState.libraryCycle] for the [file] and anything it
 /// depends on is computed.
@@ -53,6 +55,24 @@ class FileState {
   /// The [Source] of the file with the [uri].
   final Source source;
 
+  /// The [WorkspacePackage] that contains this file.
+  ///
+  /// It might be `null` if the file is outside of the workspace.
+  final WorkspacePackage workspacePackage;
+
+  /// The [FeatureSet] for all files in the analysis context.
+  ///
+  /// Usually it is the feature set of the latest language version, plus
+  /// possibly additional enabled experiments (from the analysis options file,
+  /// or from SDK allowed experiments).
+  ///
+  /// This feature set is then restricted, with the [_packageLanguageVersion],
+  /// or with a `@dart` language override token in the file header.
+  final FeatureSet _contextFeatureSet;
+
+  /// The language version for the package that contains this file.
+  final Version _packageLanguageVersion;
+
   /// Files that reference this file.
   final List<FileState> referencingFiles = [];
 
@@ -70,7 +90,15 @@ class FileState {
   UnlinkedUnit2 unlinked2;
   LibraryCycle _libraryCycle;
 
-  FileState._(this._fsState, this.path, this.uri, this.source);
+  FileState._(
+    this._fsState,
+    this.path,
+    this.uri,
+    this.source,
+    this.workspacePackage,
+    this._contextFeatureSet,
+    this._packageLanguageVersion,
+  );
 
   List<int> get apiSignature => _apiSignature;
 
@@ -135,14 +163,14 @@ class FileState {
 
   CompilationUnit parse(AnalysisErrorListener errorListener, String content) {
     AnalysisOptionsImpl analysisOptions = _fsState._analysisOptions;
-    FeatureSet featureSet =
-        _fsState.featureSetProvider.getFeatureSet(path, uri);
 
     CharSequenceReader reader = CharSequenceReader(content);
     Scanner scanner = Scanner(source, reader, errorListener)
       ..configureFeatures(
-        featureSetForOverriding: featureSet,
-        featureSet: featureSet,
+        featureSetForOverriding: _contextFeatureSet,
+        featureSet: _contextFeatureSet.restrictToVersion(
+          _packageLanguageVersion,
+        ),
       );
     Token token = scanner.tokenize(reportScannerErrors: false);
     LineInfo lineInfo = LineInfo(scanner.lineStarts);
@@ -415,6 +443,7 @@ class FileSystemState {
   final ResourceProvider _resourceProvider;
   final CiderByteStore _byteStore;
   final SourceFactory _sourceFactory;
+  final Workspace _workspace;
   final AnalysisOptions _analysisOptions;
   final Uint32List _linkedSalt;
 
@@ -440,6 +469,7 @@ class FileSystemState {
     this._resourceProvider,
     this._byteStore,
     this._sourceFactory,
+    this._workspace,
     this._analysisOptions,
     this._linkedSalt,
     this.featureSetProvider,
@@ -470,6 +500,21 @@ class FileSystemState {
     }
   }
 
+  FeatureSet contextFeatureSet(
+    String path,
+    Uri uri,
+    WorkspacePackage workspacePackage,
+  ) {
+    var workspacePackageExperiments = workspacePackage?.enabledExperiments;
+    if (workspacePackageExperiments != null) {
+      return featureSetProvider.featureSetForExperiments(
+        workspacePackageExperiments,
+      );
+    }
+
+    return featureSetProvider.getFeatureSet(path, uri);
+  }
+
   FileState getFileForPath({
     @required String path,
     @required OperationPerformanceImpl performance,
@@ -482,7 +527,12 @@ class FileSystemState {
       );
 
       var source = _sourceFactory.forUri2(uri);
-      file = FileState._(this, path, uri, source);
+      var workspacePackage = _workspace?.findPackageFor(path);
+      var featureSet = contextFeatureSet(path, uri, workspacePackage);
+      var packageLanguageVersion =
+          featureSetProvider.getLanguageVersion(path, uri);
+      file = FileState._(this, path, uri, source, workspacePackage, featureSet,
+          packageLanguageVersion);
 
       _pathToFile[path] = file;
       _uriToFile[uri] = file;
@@ -508,7 +558,13 @@ class FileSystemState {
       }
       var path = source.fullName;
 
-      file = FileState._(this, path, uri, source);
+      var workspacePackage = _workspace?.findPackageFor(path);
+      var featureSet = contextFeatureSet(path, uri, workspacePackage);
+      var packageLanguageVersion =
+          featureSetProvider.getLanguageVersion(path, uri);
+
+      file = FileState._(this, path, uri, source, workspacePackage, featureSet,
+          packageLanguageVersion);
       _pathToFile[path] = file;
       _uriToFile[uri] = file;