Initial nnbd implementation and cleanup (#2069)

dart-lang · Nov 13, 2019 · 9263f70 · 9263f70
1 parent 4995e7e
commit 9263f70
Show file tree

Hide file tree

Showing 11 changed files with 137 additions and 74 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,9 +1,6 @@
 include: package:pedantic/analysis_options.1.8.0.yaml
 
 analyzer:
-  # enable for analysis on test package sources.
-  enable-experiment:
-    - extension-methods
   exclude:
     - 'doc/**'
     - 'lib/src/third_party/pkg/**'

diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/model.dart';
 
 class Field extends ModelElement
@@ -184,6 +185,9 @@ class Field extends ModelElement
     }
   }
 
+  @override
+  CallableElementType get modelType => super.modelType;
+
   @override
   Inheritable get overriddenElement => null;
 }
diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart
@@ -152,8 +152,7 @@ class PackageBuilder {
       AnalysisOptionsImpl options = AnalysisOptionsImpl();
 
       // TODO(jcollins-g): pass in an ExperimentStatus instead?
-      options.enabledExperiments = config.enableExperiment
-        ..add('extension-methods');
+      options.enabledExperiments = config.enableExperiment;
 
       // TODO(jcollins-g): Make use of currently not existing API for managing
       //                   many AnalysisDrivers

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -5,10 +5,10 @@ author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
 environment:
-  sdk: '>=2.2.0 <3.0.0'
+  sdk: '>=2.6.0 <3.0.0'
 
 dependencies:
-  analyzer: ^0.39.0
+  analyzer: ^0.39.1
   args: '>=1.5.0 <2.0.0'
   collection: ^1.2.0
   crypto: ^2.0.6

diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart
@@ -258,7 +258,9 @@ void main() {
         expect(p.name, 'test_package');
         expect(p.hasDocumentationFile, isTrue);
         // Total number of public libraries in test_package.
-        expect(packageGraph.defaultPackage.publicLibraries, hasLength(16));
+        // +2 since we are not manually excluding anything.
+        expect(packageGraph.defaultPackage.publicLibraries,
+            hasLength(kTestPackagePublicLibraries + 2));
         expect(packageGraph.localPackages.length, equals(1));
       });
 
@@ -313,8 +315,8 @@ void main() {
       PackageGraph p = results.packageGraph;
       expect(p.defaultPackage.name, 'test_package');
       expect(p.defaultPackage.hasDocumentationFile, isTrue);
-      expect(p.libraries, hasLength(1));
-      expect(p.libraries.map((lib) => lib.name), contains('fake'));
+      expect(p.localPublicLibraries, hasLength(1));
+      expect(p.localPublicLibraries.map((lib) => lib.name), contains('fake'));
     });
 
     test('generate docs excluding a single library', () async {
@@ -327,7 +329,10 @@ void main() {
       PackageGraph p = results.packageGraph;
       expect(p.defaultPackage.name, 'test_package');
       expect(p.defaultPackage.hasDocumentationFile, isTrue);
-      expect(p.localPublicLibraries, hasLength(15));
+      // Plus 1 here because we're excluding only two libraries (the specified
+      // one and the <nodoc> 'excluded' library) instead of three.
+      expect(
+          p.localPublicLibraries, hasLength(kTestPackagePublicLibraries + 1));
       expect(p.localPublicLibraries.map((lib) => lib.name).contains('fake'),
           isFalse);
     });

diff --git a/test/model_special_cases_test.dart b/test/model_special_cases_test.dart
@@ -29,49 +29,26 @@ void main() {
   // Experimental features not yet enabled by default.  Move tests out of this block
   // when the feature is enabled by default.
   group('Experiments', () {
-    Library main;
-    TopLevelVariable aComplexSet,
-        inferredTypeSet,
-        specifiedSet,
-        untypedMap,
-        typedSet;
-
+    Library lateFinalWithoutInitializer;
     setUpAll(() async {
-      main = (await utils.testPackageGraphExperiments)
+      lateFinalWithoutInitializer = (await utils.testPackageGraphExperiments)
           .libraries
-          .firstWhere((lib) => lib.name == 'main');
-      aComplexSet = main.constants.firstWhere((v) => v.name == 'aComplexSet');
-      inferredTypeSet =
-          main.constants.firstWhere((v) => v.name == 'inferredTypeSet');
-      specifiedSet = main.constants.firstWhere((v) => v.name == 'specifiedSet');
-      untypedMap = main.constants.firstWhere((v) => v.name == 'untypedMap');
-      typedSet = main.constants.firstWhere((v) => v.name == 'typedSet');
-    });
-
-    test('Set literals test', () {
-      expect(aComplexSet.modelType.name, equals('Set'));
-      expect(aComplexSet.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['AClassContainingLiterals']));
-      expect(aComplexSet.constantValue,
-          equals('const {const AClassContainingLiterals(3, 5)}'));
-      expect(inferredTypeSet.modelType.name, equals('Set'));
-      expect(
-          inferredTypeSet.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['num']));
-      expect(inferredTypeSet.constantValue, equals('const {1, 2.5, 3}'));
-      expect(specifiedSet.modelType.name, equals('Set'));
-      expect(specifiedSet.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['int']));
-      expect(specifiedSet.constantValue, equals('const {}'));
-      expect(untypedMap.modelType.name, equals('Map'));
-      expect(untypedMap.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['dynamic', 'dynamic']));
-      expect(untypedMap.constantValue, equals('const {}'));
-      expect(typedSet.modelType.name, equals('Set'));
-      expect(typedSet.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['String']));
-      expect(typedSet.constantValue,
-          matches(RegExp(r'const &lt;String&gt;\s?{}')));
+          .firstWhere((lib) => lib.name == 'late_final_without_initializer');
+    });
+
+    test('Late finals test', () {
+      Class c = lateFinalWithoutInitializer.allClasses
+          .firstWhere((c) => c.name == 'C');
+      Field a = c.allFields.firstWhere((f) => f.name == 'a');
+      Field b = c.allFields.firstWhere((f) => f.name == 'b');
+      Field cField = c.allFields.firstWhere((f) => f.name == 'cField');
+      Field dField = c.allFields.firstWhere((f) => f.name == 'dField');
+      // If nnbd isn't enabled, fields named 'late' come back from the analyzer.
+      expect(c.allFields.any((f) => f.name == 'late'), isFalse);
+      expect(a.modelType.returnType.name, equals('dynamic'));
+      expect(b.modelType.returnType.name, equals('int'));
+      expect(cField.modelType.returnType.name, equals('dynamic'));
+      expect(dField.modelType.returnType.name, equals('double'));
     });
   });
 

diff --git a/test/model_test.dart b/test/model_test.dart
@@ -76,6 +76,55 @@ void main() {
         packageGraph.libraries.firstWhere((lib) => lib.name == 'base_class');
   });
 
+  group('Set Literals', () {
+    Library set_literals;
+    TopLevelVariable aComplexSet,
+        inferredTypeSet,
+        specifiedSet,
+        untypedMap,
+        typedSet;
+
+    setUpAll(() async {
+      set_literals = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'set_literals');
+      aComplexSet =
+          set_literals.constants.firstWhere((v) => v.name == 'aComplexSet');
+      inferredTypeSet =
+          set_literals.constants.firstWhere((v) => v.name == 'inferredTypeSet');
+      specifiedSet =
+          set_literals.constants.firstWhere((v) => v.name == 'specifiedSet');
+      untypedMap =
+          set_literals.constants.firstWhere((v) => v.name == 'untypedMap');
+      typedSet = set_literals.constants.firstWhere((v) => v.name == 'typedSet');
+    });
+
+    test('Set literals test', () {
+      expect(aComplexSet.modelType.name, equals('Set'));
+      expect(aComplexSet.modelType.typeArguments.map((a) => a.name).toList(),
+          equals(['AClassContainingLiterals']));
+      expect(aComplexSet.constantValue,
+          equals('const {const AClassContainingLiterals(3, 5)}'));
+      expect(inferredTypeSet.modelType.name, equals('Set'));
+      expect(
+          inferredTypeSet.modelType.typeArguments.map((a) => a.name).toList(),
+          equals(['num']));
+      expect(inferredTypeSet.constantValue, equals('const {1, 2.5, 3}'));
+      expect(specifiedSet.modelType.name, equals('Set'));
+      expect(specifiedSet.modelType.typeArguments.map((a) => a.name).toList(),
+          equals(['int']));
+      expect(specifiedSet.constantValue, equals('const {}'));
+      expect(untypedMap.modelType.name, equals('Map'));
+      expect(untypedMap.modelType.typeArguments.map((a) => a.name).toList(),
+          equals(['dynamic', 'dynamic']));
+      expect(untypedMap.constantValue, equals('const {}'));
+      expect(typedSet.modelType.name, equals('Set'));
+      expect(typedSet.modelType.typeArguments.map((a) => a.name).toList(),
+          equals(['String']));
+      expect(typedSet.constantValue,
+          matches(RegExp(r'const &lt;String&gt;\s?{}')));
+    });
+  });
+
   group('Tools', () {
     Class toolUser;
     Class _NonCanonicalToolUser, CanonicalToolUser, PrivateLibraryToolUser;
@@ -291,10 +340,6 @@ void main() {
           ]));
       expect(packageCategories.map((c) => c.libraries.length).toList(),
           orderedEquals([0, 2, 3, 1, 0, 0]));
-      expect(
-          packageGraph
-              .localPackages.first.defaultCategory.publicLibraries.length,
-          equals(9));
     });
 
     test('Verify libraries with multiple categories show up in multiple places',
@@ -313,7 +358,8 @@ void main() {
       expect(
           packageGraph
               .localPackages.first.defaultCategory.publicLibraries.length,
-          equals(9));
+          // Only 5 libraries have categories, the rest belong in default.
+          equals(utils.kTestPackagePublicLibraries - 5));
     });
   });
 
@@ -383,7 +429,8 @@ void main() {
       });
 
       test('libraries', () {
-        expect(packageGraph.localPublicLibraries, hasLength(14));
+        expect(packageGraph.localPublicLibraries,
+            hasLength(utils.kTestPackagePublicLibraries));
         expect(interceptorsLib.isPublic, isFalse);
       });
 
@@ -398,7 +445,8 @@ void main() {
 
         Package package = packageGraph.localPackages.first;
         expect(package.name, 'test_package');
-        expect(package.publicLibraries, hasLength(14));
+        expect(package.publicLibraries,
+            hasLength(utils.kTestPackagePublicLibraries));
       });
 
       test('is documented in library', () {
@@ -710,11 +758,12 @@ void main() {
     EnumField enumValue2;
 
     setUpAll(() {
-      enumWithAnimation = exLibrary.enums.firstWhere((c) => c.name == 'EnumWithAnimation');
-      enumValue1 = enumWithAnimation.constants
-          .firstWhere((m) => m.name == 'value1');
-      enumValue2 = enumWithAnimation.constants
-          .firstWhere((m) => m.name == 'value2');
+      enumWithAnimation =
+          exLibrary.enums.firstWhere((c) => c.name == 'EnumWithAnimation');
+      enumValue1 =
+          enumWithAnimation.constants.firstWhere((m) => m.name == 'value1');
+      enumValue2 =
+          enumWithAnimation.constants.firstWhere((m) => m.name == 'value2');
       dog = exLibrary.classes.firstWhere((c) => c.name == 'Dog');
       withAnimation =
           dog.allInstanceMethods.firstWhere((m) => m.name == 'withAnimation');
@@ -775,12 +824,18 @@ void main() {
           contains('<video id="outOfOrder"'));
     });
     test("Enum field animation identifiers are unique.", () {
-      expect(enumValue1.documentationAsHtml, contains('<video id="animation_1"'));
-      expect(enumValue1.documentationAsHtml, contains('<video id="animation_2"'));
-      expect(enumValue2.documentationAsHtml, isNot(contains('<video id="animation_1"')));
-      expect(enumValue2.documentationAsHtml, isNot(contains('<video id="animation_2"')));
-      expect(enumValue2.documentationAsHtml, contains('<video id="animation_3"'));
-      expect(enumValue2.documentationAsHtml, contains('<video id="animation_4"'));
+      expect(
+          enumValue1.documentationAsHtml, contains('<video id="animation_1"'));
+      expect(
+          enumValue1.documentationAsHtml, contains('<video id="animation_2"'));
+      expect(enumValue2.documentationAsHtml,
+          isNot(contains('<video id="animation_1"')));
+      expect(enumValue2.documentationAsHtml,
+          isNot(contains('<video id="animation_2"')));
+      expect(
+          enumValue2.documentationAsHtml, contains('<video id="animation_3"'));
+      expect(
+          enumValue2.documentationAsHtml, contains('<video id="animation_4"'));
     });
   });
 

diff --git a/test/src/utils.dart b/test/src/utils.dart
@@ -15,6 +15,11 @@ import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:path/path.dart' as path;
 
+/// The number of public libraries in testing/test_package, minus 2 for
+/// the excluded libraries listed in the initializers for _testPackageGraphMemo
+/// and minus 1 for the <nodoc> tag in the 'excluded' library.
+const int kTestPackagePublicLibraries = 15;
+
 final RegExp quotables = RegExp(r'[ "\r\n\$]');
 final RegExp observatoryPortRegexp =
     RegExp(r'^Observatory listening on http://.*:(\d+)');
@@ -23,15 +28,14 @@ Directory sdkDir = defaultSdkDir;
 PackageMeta sdkPackageMeta = PackageMeta.fromDir(sdkDir);
 
 final _testPackageGraphMemo = AsyncMemoizer<PackageGraph>();
-Future<PackageGraph> get testPackageGraph =>
-    _testPackageGraphMemo.runOnce(() => bootBasicPackage(
-        'testing/test_package', ['css', 'code_in_comments', 'excluded']));
+Future<PackageGraph> get testPackageGraph => _testPackageGraphMemo.runOnce(() =>
+    bootBasicPackage('testing/test_package', ['css', 'code_in_comments']));
 
 final _testPackageGraphExperimentsMemo = AsyncMemoizer<PackageGraph>();
 Future<PackageGraph> get testPackageGraphExperiments =>
     _testPackageGraphExperimentsMemo.runOnce(() => bootBasicPackage(
         'testing/test_package_experiments', [],
-        additionalArguments: ['--enable-experiment', 'set-literals']));
+        additionalArguments: ['--enable-experiment', 'non-nullable']));
 
 final _testPackageGraphGinormousMemo = AsyncMemoizer<PackageGraph>();
 Future<PackageGraph> get testPackageGraphGinormous =>

diff --git a/...ng/test_package_experiments/lib/main.dart → testing/test_package/lib/set_literals.dart b/...ng/test_package_experiments/lib/main.dart → testing/test_package/lib/set_literals.dart
diff --git a/testing/test_package_experiments/analysis_options.yaml b/testing/test_package_experiments/analysis_options.yaml
@@ -0,0 +1,4 @@
+analyzer:
+  # enable for analysis on test package sources.
+  enable-experiment:
+    - non-nullable
diff --git a/testing/test_package_experiments/lib/late_final_without_initializer.dart b/testing/test_package_experiments/lib/late_final_without_initializer.dart
@@ -0,0 +1,18 @@
+// 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.
+
+import 'dart:math';
+
+class C {
+  late final a;
+  late final b = 0;
+  late final cField;
+  late final double dField;
+
+  C(double param) {
+    cField = param * 3.14;
+    dField = param * 8.854 * pow(10, -12);
+  }
+}
+