Use new Analyzer API for resolution. (#197)

Author: scheglov

json_serializable/lib/src/utils.dart

@@ -2,7 +2,6 @@
 // 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.
 
-import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 
@@ -247,8 +246,7 @@ CtorData writeConstructorInvocation(
 
   for (var arg in ctor.parameters) {
     if (!availableConstructorParameters.contains(arg.name)) {
-      // ignore: deprecated_member_use
-      if (arg.parameterKind == ParameterKind.REQUIRED) {
+      if (arg.isNotOptional) {
         var msg = 'Cannot populate the required constructor '
             'argument: ${arg.name}.';
 
@@ -265,8 +263,7 @@ CtorData writeConstructorInvocation(
     }
 
     // TODO: validate that the types match!
-    // ignore: deprecated_member_use
-    if (arg.parameterKind == ParameterKind.NAMED) {
+    if (arg.isNamed) {
       namedConstructorArguments.add(arg);
     } else {
       constructorArguments.add(arg);

json_serializable/test/analysis_utils.dart

@@ -3,63 +3,20 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:io';
 
-import 'package:analyzer/file_system/file_system.dart' hide File;
-import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer/src/source/package_map_resolver.dart';
-import 'package:analyzer/src/source/pub_package_map_provider.dart';
-import 'package:analyzer/src/dart/sdk/sdk.dart' show FolderBasedDartSdk;
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/generated/source_io.dart';
-import 'package:path/path.dart' as p;
+import 'package:analyzer/dart/analysis/context_builder.dart';
+import 'package:analyzer/dart/analysis/context_locator.dart';
+import 'package:analyzer/dart/ast/ast.dart';
 
-import 'test_utils.dart';
-
-Future<AnalysisContext> analysisContextForProject() async {
-  var sdkPath = p.dirname(p.dirname(Platform.resolvedExecutable));
-
-  var resourceProvider = PhysicalResourceProvider.INSTANCE;
-  var sdk = new FolderBasedDartSdk(
-      resourceProvider, resourceProvider.getFolder(sdkPath));
-
-  var dotPackagesPath = p.join(getPackagePath(), '.packages');
-
-  if (!FileSystemEntity.isFileSync(dotPackagesPath)) {
-    throw new StateError('A package configuration file was not found at the '
-        'expectetd location. $dotPackagesPath');
-  }
-
-  var pubPackageMapProvider =
-      new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
-  var packageMapInfo = pubPackageMapProvider.computePackageMap(
-      PhysicalResourceProvider.INSTANCE.getResource(getPackagePath())
-          as Folder);
-  var packageMap = packageMapInfo.packageMap;
-  if (packageMap == null) {
-    throw new StateError('An error occurred getting the package map.');
+Future<CompilationUnit> resolveCompilationUnit(String path) async {
+  var contextLocator = new ContextLocator();
+  var roots = contextLocator.locateRoots(includedPaths: [path]);
+  if (roots.length != 1) {
+    throw new StateError('Expected exactly one context root, got $roots');
   }
 
-  var packageResolver =
-      new PackageMapUriResolver(PhysicalResourceProvider.INSTANCE, packageMap);
-
-  var resolvers = [
-    new DartUriResolver(sdk),
-    new ResourceUriResolver(PhysicalResourceProvider.INSTANCE),
-    packageResolver
-  ];
-
-  AnalysisEngine.instance.processRequiredPlugins();
-
-  var options = new AnalysisOptionsImpl()
-    ..analyzeFunctionBodies = false
-    ..strongMode = true
-    ..previewDart2 = true;
-
-  var context = AnalysisEngine.instance.createAnalysisContext()
-    ..analysisOptions = options
-    ..sourceFactory = new SourceFactory(resolvers);
-
-  return context;
+  var analysisContext =
+      new ContextBuilder().createContext(contextRoot: roots.single);
+  var resolveResult = await analysisContext.currentSession.getResolvedAst(path);
+  return resolveResult.unit;
 }

json_serializable/test/json_serializable_test.dart

@@ -36,13 +36,9 @@ CompilationUnit _compilationUnit;
 
 void main() {
   setUpAll(() async {
-    var context = await analysisContextForProject();
-
-    var fileUri = p.toUri(p.join(
-        getPackagePath(), 'test', 'src', 'json_serializable_test_input.dart'));
-    var source = context.sourceFactory.forUri2(fileUri);
-    var libElement = context.computeLibraryElement(source);
-    _compilationUnit = context.resolveCompilationUnit(source, libElement);
+    var path = p.join(
+        getPackagePath(), 'test', 'src', 'json_serializable_test_input.dart');
+    _compilationUnit = await resolveCompilationUnit(path);
   });
 
   group('without wrappers',