commit 6a9b83bbd73e50df2058b3e8e4aa301df49569c6
author Nate Bosch <nbosch@google.com> Thu Sep 15 12:21:53 2022 -0700
committer GitHub <noreply@github.com> Thu Sep 15 12:21:53 2022 -0700
tree a5c67b9cd7969c8cc66b31c79f56a6e154dc82eb
parent 7e204b8e733aae2c18c12058429ccf29b59f2f51

Make FunctionMatcher private again (#196)

Add a separate private constructor to satisfy the lint
library_private_types_in_public_api

lib/src/having_matcher.dart

diff --git a/lib/src/having_matcher.dart b/lib/src/having_matcher.dart
index e560a83..2d2dc3d 100644
--- a/lib/src/having_matcher.dart
+++ b/lib/src/having_matcher.dart
@@ -2,8 +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:meta/meta.dart';
-
 import 'custom_matcher.dart';
 import 'interfaces.dart';
 import 'type_matcher.dart';
@@ -13,21 +11,30 @@
 /// by calls to [TypeMatcher.having].
 class HavingMatcher<T> implements TypeMatcher<T> {
   final TypeMatcher<T> _parent;
-  final List<FunctionMatcher<T>> _functionMatchers;
+  final List<_FunctionMatcher<T>> _functionMatchers;
 
-  HavingMatcher(TypeMatcher<T> parent, String description,
-      Object? Function(T) feature, dynamic matcher,
-      [Iterable<FunctionMatcher<T>>? existing])
-      : _parent = parent,
-        _functionMatchers = [
+  HavingMatcher(this._parent, String description, Object? Function(T) feature,
+      dynamic matcher)
+      : _functionMatchers = [
+          _FunctionMatcher<T>(description, feature, matcher)
+        ];
+
+  HavingMatcher._fromExisting(
+      this._parent,
+      String description,
+      Object? Function(T) feature,
+      dynamic matcher,
+      Iterable<_FunctionMatcher<T>>? existing)
+      : _functionMatchers = [
           ...?existing,
-          FunctionMatcher<T>(description, feature, matcher)
+          _FunctionMatcher<T>(description, feature, matcher)
         ];
 
   @override
   TypeMatcher<T> having(
           Object? Function(T) feature, String description, dynamic matcher) =>
-      HavingMatcher(_parent, description, feature, matcher, _functionMatchers);
+      HavingMatcher._fromExisting(
+          _parent, description, feature, matcher, _functionMatchers);
 
   @override
   bool matches(dynamic item, Map matchState) {
@@ -57,11 +64,10 @@
       .addAll('', ' and ', '', _functionMatchers);
 }
 
-@visibleForTesting
-class FunctionMatcher<T> extends CustomMatcher {
+class _FunctionMatcher<T> extends CustomMatcher {
   final Object? Function(T value) _feature;
 
-  FunctionMatcher(String name, this._feature, Object? matcher)
+  _FunctionMatcher(String name, this._feature, Object? matcher)
       : super('`$name`:', '`$name`', matcher);
 
   @override