Merge branch 'master' into dartdoc-0.28.0

Author: jcollins-g

lib/src/model.dart

@@ -6516,7 +6516,9 @@ class PackageBuilder {
       }
     }
     var sourceKind = await driver.getSourceKind(filePath);
-    if (sourceKind == SourceKind.LIBRARY) {
+    // Allow dart source files with inappropriate suffixes (#1897).  Those
+    // do not show up as SourceKind.LIBRARY.
+    if (sourceKind != SourceKind.PART) {
       // Loading libraryElements from part files works, but is painfully slow
       // and creates many duplicates.
       return await driver.currentSession.getResolvedLibrary(source.fullName);

pubspec.yaml

@@ -32,7 +32,7 @@ dev_dependencies:
   build: ^1.0.1
   build_runner: ^1.0.0
   build_version: ^1.0.0
-  coverage: any
+  coverage: ^0.12.4
   dhttpd: ^3.0.0
   glob: ^1.1.5
   grinder: ^0.8.2

test/dartdoc_test.dart

@@ -178,17 +178,6 @@ void main() {
             throwsA(const TypeMatcher<ProcessException>()));
       });
 
-      test('errors cause non-zero exit when warnings are on', () async {
-        expect(
-            () => subprocessLauncher.runStreamed(Platform.resolvedExecutable, [
-                  dartdocPath,
-                  '--input=${testPackageToolError.path}',
-                  '--output=${pathLib.join(tempDir.absolute.path, 'test_package_tool_error')}',
-                  '--show-warnings',
-                ]),
-            throwsA(const TypeMatcher<ProcessException>()));
-      });
-
       test('help prints command line args', () async {
         List<String> outputLines = [];
         await subprocessLauncher.runStreamed(

test/model_test.dart

@@ -675,6 +675,10 @@ void main() {
       expect(anonLib.isDeprecated, isFalse);
     });
 
+    test('can be reexported even if the file suffix is not .dart', () {
+      expect(fakeLibrary.allClasses.map((c) => c.name), contains('MyClassFromADartFile'));
+    });
+
     test('that is deprecated has a deprecated css class in linkedName', () {
       expect(isDeprecated.linkedName, contains('class="deprecated"'));
     });

test/src/utils.dart

@@ -155,8 +155,9 @@ class CoverageSubprocessLauncher extends SubprocessLauncher {
     /// Wait for all coverage runs to finish.
     await Future.wait(currentCoverageResults);
 
-    return launcher.runStreamed(Platform.executable, [
-      'tool/format_coverage.dart', // TODO(jcollins-g): use pub after dart-lang/coverage#240 is landed
+    return launcher.runStreamed('pub', [
+      'run',
+      'coverage:format_coverage',
       '--lcov',
       '-v',
       '-b', '.',

testing/test_package/lib/fake.dart

@@ -58,6 +58,7 @@ import 'example.dart';
 import 'mylibpub.dart' as renamedLib;
 import 'mylibpub.dart' as renamedLib2;
 import 'two_exports.dart' show BaseClass;
+export 'src/notadotdartfile';
 
 // ignore: uri_does_not_exist
 export 'package:test_package_imported/categoryExporting.dart'

testing/test_package/lib/src/notadotdartfile

@@ -0,0 +1,4 @@
+/// Test importing with an invalid dart file extension. (#1897)
+library test_package.notadotdartfile;
+
+class MyClassFromADartFile {}