Skip to content

Commit df3872e

Browse files
committed
Cleanup some fromYamlMap usage; other simplifications
1 parent a93da35 commit df3872e

27 files changed

+255
-289
lines changed

analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ analyzer:
66
errors:
77
unused_import: warning
88
unused_shown_name: warning
9-
todo: ignore
109
exclude:
1110
- 'doc/**'
1211
- 'lib/src/third_party/pkg/**'

lib/dartdoc.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ class Dartdoc {
111111
StreamController(sync: true);
112112

113113
Dartdoc._(this.config, this.generator, this.packageBuilder) {
114-
outputDir = config.resourceProvider.getFolder(config.output)..create();
114+
outputDir = config.resourceProvider
115+
.getFolder(config.resourceProvider.pathContext.absolute(config.output))
116+
..create();
115117
}
116118

117119
/// An asynchronous factory method that builds Dartdoc's file writers
@@ -229,8 +231,9 @@ class Dartdoc {
229231
throw DartdocFailure(
230232
'dartdoc encountered $errorCount errors while processing.');
231233
}
232-
logInfo('Success! Docs generated into '
233-
'${dartdocResults.packageGraph.resourceProvider.pathContext.absolute(dartdocResults.outDir.path)}');
234+
var outDirPath = config.resourceProvider.pathContext
235+
.absolute(dartdocResults.outDir.path);
236+
logInfo('Success! Docs generated into $outDirPath');
234237
return dartdocResults;
235238
} finally {
236239
// TODO: necessary?

lib/options.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ class DartdocProgramOptionContext extends DartdocGeneratorOptionContext
1818
}
1919

2020
Future<List<DartdocOption<bool>>> createDartdocProgramOptions(
21-
ResourceProvider resourceProvider) async {
21+
PackageMetaProvider packageMetaProvider) async {
22+
var resourceProvider = packageMetaProvider.resourceProvider;
2223
return [
2324
DartdocOptionArgOnly<bool>('generateDocs', true, resourceProvider,
2425
help:
25-
'Generate docs into the output directory (or only display warnings if false).',
26+
'Generate docs into the output directory (or only display warnings '
27+
'if false).',
2628
negatable: true),
2729
DartdocOptionArgOnly<bool>('help', false, resourceProvider,
2830
abbr: 'h', help: 'Show command help.', negatable: false),
@@ -39,13 +41,13 @@ Future<DartdocProgramOptionContext> parseOptions(
3941
var optionSet = await DartdocOptionSet.fromOptionGenerators(
4042
'dartdoc',
4143
[
42-
() => createDartdocOptions(packageMetaProvider),
43-
() => createDartdocProgramOptions(packageMetaProvider.resourceProvider),
44-
() => createLoggingOptions(packageMetaProvider.resourceProvider),
45-
() => createGeneratorOptions(packageMetaProvider.resourceProvider),
44+
createDartdocOptions,
45+
createDartdocProgramOptions,
46+
createLoggingOptions,
47+
createGeneratorOptions,
4648
if (additionalOptions != null) additionalOptions,
4749
],
48-
packageMetaProvider.resourceProvider);
50+
packageMetaProvider);
4951

5052
try {
5153
optionSet.parseArguments(arguments);

0 commit comments

Comments
 (0)