Skip to content

Commit 69ca0c9

Browse files
committed
getAs -> getValueAs
1 parent 74bda63 commit 69ca0c9

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

lib/src/dartdoc_options.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,11 @@ abstract class DartdocOption<T extends Object?> {
491491
/// type. If [mustExist] is true, will throw [DartdocFileMissing] for command
492492
/// line parameters and file paths in config files that don't point to
493493
/// corresponding files or directories.
494+
// TODO(jcollins-g): use of dynamic. https://github.com/dart-lang/dartdoc/issues/2814
494495
dynamic valueAt(Folder dir);
495496

496497
/// Calls [valueAt] with the working directory at the start of the program.
498+
// TODO(jcollins-g): use of dynamic. https://github.com/dart-lang/dartdoc/issues/2814
497499
dynamic valueAtCurrent() => valueAt(_directoryCurrent);
498500

499501
late final Folder _directoryCurrent =
@@ -525,7 +527,8 @@ abstract class DartdocOption<T extends Object?> {
525527
}
526528

527529
/// Get the immediate child of this node named [name] as a [DartdocOption<dynamic>].
528-
DartdocOption<U> getAs<U extends Object?>(String name) => _children[name] as DartdocOption<U>;
530+
U getValueAs<U extends Object?>(String name, Folder dir) =>
531+
_children[name]?.valueAt(dir) as U;
529532

530533
/// Apply the function [visit] to [this] and all children.
531534
void traverse(void Function(DartdocOption option) visit) {

lib/src/generator/templates.runtime_renderers.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// ignore_for_file: camel_case_types, deprecated_member_use_from_same_package
77
// ignore_for_file: unused_import
8+
// @dart=2.9
89
import 'package:dartdoc/src/element_type.dart';
910
import 'package:dartdoc/src/generator/template_data.dart';
1011
import 'package:dartdoc/src/model/annotation.dart';

lib/src/warnings.dart

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -380,23 +380,23 @@ class PackageWarningOptions {
380380
// Interpret errors/warnings/ignore options. In the event of conflict,
381381
// warning overrides error and ignore overrides warning.
382382
var errorsForDir =
383-
option.parent.getAs<List<String>?>('errors').valueAt(dir) ?? [];
383+
option.parent.getValueAs<List<String>?>('errors', dir) ?? [];
384384
for (var warningName in errorsForDir) {
385385
var packageWarnings = packageWarningsByName[warningName];
386386
if (packageWarnings != null) {
387387
newOptions.error(packageWarnings.kind);
388388
}
389389
}
390390
var warningsForDir =
391-
option.parent.getAs<List<String>?>('warnings').valueAt(dir) ?? [];
391+
option.parent.getValueAs<List<String>?>('warnings', dir) ?? [];
392392
for (var warningName in warningsForDir) {
393393
var packageWarnings = packageWarningsByName[warningName];
394394
if (packageWarnings != null) {
395395
newOptions.warn(packageWarnings.kind);
396396
}
397397
}
398398
var ignoredForDir =
399-
option.parent.getAs<List<String>?>('ignore').valueAt(dir) ?? [];
399+
option.parent.getValueAs<List<String>?>('ignore', dir) ?? [];
400400
for (var warningName in ignoredForDir) {
401401
var packageWarnings = packageWarningsByName[warningName];
402402
if (packageWarnings != null) {
@@ -405,18 +405,14 @@ class PackageWarningOptions {
405405
}
406406

407407
// Check whether warnings are allowed at all in this package.
408-
var allowWarningsInPackages = option.parent
409-
.getAs<List<String>?>('allowWarningsInPackages')
410-
.valueAt(dir);
411-
var allowErrorsInPackages = option.parent
412-
.getAs<List<String>?>('allowErrorsInPackages')
413-
.valueAt(dir);
408+
var allowWarningsInPackages =
409+
option.parent.getValueAs<List<String>?>('allowWarningsInPackages', dir);
410+
var allowErrorsInPackages =
411+
option.parent.getValueAs<List<String>?>('allowErrorsInPackages', dir);
414412
var ignoreWarningsInPackages = option.parent
415-
.getAs<List<String>?>('ignoreWarningsInPackages')
416-
.valueAt(dir);
417-
var ignoreErrorsInPackages = option.parent
418-
.getAs<List<String>?>('ignoreErrorsInPackages')
419-
.valueAt(dir);
413+
.getValueAs<List<String>?>('ignoreWarningsInPackages', dir);
414+
var ignoreErrorsInPackages =
415+
option.parent.getValueAs<List<String>?>('ignoreErrorsInPackages', dir);
420416
if (allowWarningsInPackages != null &&
421417
!allowWarningsInPackages.contains(packageMeta.name)) {
422418
PackageWarning.values

test/mustachio/foo.runtime_renderers.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
// ignore_for_file: camel_case_types, deprecated_member_use_from_same_package
77
// ignore_for_file: unused_import
8+
// @dart=2.9
89
import 'package:dartdoc/src/element_type.dart';
910
import 'package:dartdoc/src/generator/template_data.dart';
1011
import 'package:dartdoc/src/model/annotation.dart';

tool/mustachio/codegen_runtime_renderer.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ class RuntimeRenderersBuilder {
8080
8181
// ignore_for_file: camel_case_types, deprecated_member_use_from_same_package
8282
// ignore_for_file: unused_import
83+
// @dart=2.9
8384
import 'package:dartdoc/src/element_type.dart';
8485
import 'package:dartdoc/src/generator/template_data.dart';
8586
import 'package:dartdoc/src/model/annotation.dart';

0 commit comments

Comments
 (0)