Skip to content

Migrate dartdoc_options.dart #2749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 23, 2021
Merged

Migrate dartdoc_options.dart #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7322c2
Switch to using CompilationUnitElement.classes (#2743)
jcollins-g Aug 17, 2021
1d91811
Prepare dartdoc_options for migration (#2745)
jcollins-g Aug 17, 2021
038b59f
flatten
jcollins-g Aug 18, 2021
98b4c17
Disable the unstable template checks and prepare for 2.14 stable. (#2…
jcollins-g Aug 19, 2021
2c393eb
Add a blurb to the README about requiring analysis (#2753)
jcollins-g Aug 23, 2021
8460c9a
Allow comment references on generic typedefs (#2756)
simolus3 Aug 23, 2021
a4ca86f
Prepare for dartdoc 2.0.0 (#2754)
jcollins-g Aug 23, 2021
f6a5ec7
review comments
jcollins-g Aug 23, 2021
7d7f80c
Merge branch 'master' into nnbd-mastersync-0823
jcollins-g Aug 23, 2021
5901b50
Merge branch 'nnbd-mastersync-0823' into nnbd-ddoptions
jcollins-g Aug 23, 2021
45b6b27
Merge branch 'nnbd' into nnbd-mastersync-0823
jcollins-g Aug 23, 2021
7159562
Merge branch 'nnbd-mastersync-0823' into nnbd-ddoptions
jcollins-g Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions lib/options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import 'package:dartdoc/src/package_meta.dart';

/// Helper class that consolidates option contexts for instantiating generators.
class DartdocGeneratorOptionContext extends DartdocOptionContext {
DartdocGeneratorOptionContext(DartdocOptionSet optionSet, Folder? dir,
ResourceProvider resourceProvider)
DartdocGeneratorOptionContext(
DartdocOptionSet optionSet, Folder dir, ResourceProvider resourceProvider)
: super(optionSet, dir, resourceProvider);
DartdocGeneratorOptionContext.fromDefaultContextLocation(
DartdocOptionSet optionSet, ResourceProvider resourceProvider)
Expand Down Expand Up @@ -51,8 +51,8 @@ class DartdocGeneratorOptionContext extends DartdocOptionContext {

class DartdocProgramOptionContext extends DartdocGeneratorOptionContext
with LoggingContext {
DartdocProgramOptionContext(DartdocOptionSet optionSet, Folder? dir,
ResourceProvider resourceProvider)
DartdocProgramOptionContext(
DartdocOptionSet optionSet, Folder dir, ResourceProvider resourceProvider)
: super(optionSet, dir, resourceProvider);
DartdocProgramOptionContext.fromDefaultContextLocation(
DartdocOptionSet optionSet, ResourceProvider resourceProvider)
Expand Down Expand Up @@ -84,7 +84,7 @@ Future<DartdocProgramOptionContext?> parseOptions(
List<String> arguments, {
OptionGenerator? additionalOptions,
}) async {
var optionSet = await DartdocOptionSet.fromOptionGenerators(
var optionRoot = await DartdocOptionRoot.fromOptionGenerators(
'dartdoc',
[
createDartdocOptions,
Expand All @@ -96,35 +96,35 @@ Future<DartdocProgramOptionContext?> parseOptions(
packageMetaProvider);

try {
optionSet.parseArguments(arguments);
optionRoot.parseArguments(arguments);
} on FormatException catch (e) {
stderr.writeln(' fatal error: ${e.message}');
stderr.writeln('');
_printUsage(optionSet.argParser);
_printUsage(optionRoot.argParser);
// Do not use exit() as this bypasses --pause-isolates-on-exit
exitCode = 64;
return null;
}
if (optionSet['help'].valueAtCurrent()) {
_printHelp(optionSet.argParser);
if (optionRoot['help'].valueAtCurrent()) {
_printHelp(optionRoot.argParser);
exitCode = 0;
return null;
}
if (optionSet['version'].valueAtCurrent()) {
_printVersion(optionSet.argParser);
if (optionRoot['version'].valueAtCurrent()) {
_printVersion(optionRoot.argParser);
exitCode = 0;
return null;
}

DartdocProgramOptionContext config;
try {
config = DartdocProgramOptionContext.fromDefaultContextLocation(
optionSet, packageMetaProvider.resourceProvider);
optionRoot, packageMetaProvider.resourceProvider);
} on DartdocOptionError catch (e) {
stderr.writeln(' fatal error: ${e.message}');
stderr.writeln('');
await stderr.flush();
_printUsage(optionSet.argParser);
_printUsage(optionRoot.argParser);
exitCode = 64;
return null;
}
Expand Down
Loading