Tighten up Windows support and add a test

Author: jcollins-g

lib/src/model/package_graph.dart

@@ -951,18 +951,19 @@ class PackageGraph {
         allLocalModelElements.where((e) => e.isCanonical).toList();
   }
 
+  /// Glob lookups can be expensive.  Cache per filename.
   final _configSetsNodocFor = HashMap<String, bool>();
 
   /// Given an element's location, look up the nodoc configuration data and
   /// determine whether to unconditionally treat the element as "nodoc".
-  /// Cached by filename to reduce repetitive lookups into the config data.
   bool configSetsNodocFor(String fullName) {
     if (!_configSetsNodocFor.containsKey(fullName)) {
       var file = resourceProvider.getFile(fullName);
       // Direct lookup instead of generating a custom context will save some
       // cycles.  We can't use the element's [DartdocOptionContext] because that
       // might not be where the element was defined, which is what's important
-      // for nodoc's semantics.
+      // for nodoc's semantics.  Looking up the defining element just to pull
+      // a context is again, slow.
       List<String> globs = config.optionSet['nodoc'].valueAt(file.parent);
       _configSetsNodocFor[fullName] = matchGlobs(globs, fullName);
     }

lib/src/model_utils.dart

@@ -10,6 +10,7 @@ import 'dart:io';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:path/path.dart' as path;
 import 'package:glob/glob.dart';
@@ -23,18 +24,27 @@ final Map<String, String> _fileContents = <String, String>{};
 /// Assumes that globs and resource provider are from the same drive, which
 /// will be the case for globs relative to dartdoc_options.yaml.
 ///
-/// On windows, globs are assumed to use Windows paths in combination with
-/// globs, e.g. `C:\foo\bar\*.txt`.
+/// On windows, globs are assumed to use absolute Windows paths with drive
+/// letters in combination with globs, e.g. `C:\foo\bar\*.txt`.  `fullName`
+/// also is assumed to have a drive letter.
 bool matchGlobs(List<String> globs, String fullName, {bool isWindows}) {
   isWindows ??= Platform.isWindows;
   var filteredGlobs = <String>[];
 
   if (isWindows) {
-    assert(_driveLetterMatcher.hasMatch(fullName),
-        'can not find drive letter in $fullName');
-    // TODO(jcollins-g): handle globs referencing different drives?
+    // TODO(jcollins-g): port this special casing to the glob package.
+    var fullNameDriveLetter = _driveLetterMatcher.stringMatch(fullName);
+    if (fullNameDriveLetter == null) {
+      throw DartdocFailure(
+          'Unable to recognize drive letter on Windows in:  $fullName');
+    }
+    // Build a matcher from the [fullName]'s drive letter to filter the globs.
+    var driveGlob = RegExp(fullNameDriveLetter.replaceFirst(r'\', r'\\'),
+        caseSensitive: false);
     fullName = fullName.replaceFirst(_driveLetterMatcher, r'\');
     for (var glob in globs) {
+      // Globs don't match if they aren't for the same drive.
+      if (!driveGlob.hasMatch(glob)) continue;
       // `C:\` => `\` for rejoining via posix.
       glob = glob.replaceFirst(_driveLetterMatcher, r'/');
       filteredGlobs.add(path.posix.joinAll(path.windows.split(glob)));

test/model_utils_test.dart

@@ -18,6 +18,10 @@ void main() {
     test('basic Windows', () {
       expect(matchGlobs([r'C:\a\b\*'], r'c:\a\b\d', isWindows: true), isTrue);
     });
+
+    test('Windows does not pass for different drive letters', () {
+      expect(matchGlobs([r'C:\a\b\*'], r'D:\a\b\d', isWindows: true), isFalse);
+    });
   });
 
   group('model_utils stripIndentFromSource', () {