Merge pull request #968 from dart-lang/command-type-arg
Make FormatCommand implement Command<int>.
diff --git a/lib/src/cli/format_command.dart b/lib/src/cli/format_command.dart
index 5cbe0d5..4432f7b 100644
--- a/lib/src/cli/format_command.dart
+++ b/lib/src/cli/format_command.dart
@@ -13,7 +13,7 @@
import 'show.dart';
import 'summary.dart';
-class FormatCommand extends Command {
+class FormatCommand extends Command<int> {
@override
String get name => 'format';
diff --git a/lib/src/cli/formatter_options.dart b/lib/src/cli/formatter_options.dart
index 8fd0d03..509eafb 100644
--- a/lib/src/cli/formatter_options.dart
+++ b/lib/src/cli/formatter_options.dart
@@ -13,7 +13,7 @@
import 'summary.dart';
// Note: The following line of code is modified by tool/grind.dart.
-const dartStyleVersion = '1.3.8';
+const dartStyleVersion = '1.3.8+1';
/// Global options that affect how the formatter produces and uses its outputs.
class FormatterOptions {
diff --git a/pubspec.lock b/pubspec.lock
index 544b9cc..e511a42 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -35,21 +35,21 @@
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.5.0-nullsafety.1"
+ version: "2.5.0-nullsafety.2"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.1"
+ version: "2.1.0-nullsafety.2"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0-nullsafety.1"
+ version: "1.2.0-nullsafety.2"
cli_util:
dependency: transitive
description:
@@ -63,7 +63,7 @@
name: collection
url: "https://pub.dartlang.org"
source: hosted
- version: "1.15.0-nullsafety.3"
+ version: "1.15.0-nullsafety.4"
convert:
dependency: transitive
description:
@@ -113,13 +113,6 @@
url: "https://pub.dartlang.org"
source: hosted
version: "0.14.0+3"
- http:
- dependency: transitive
- description:
- name: http
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.12.2"
http_multi_server:
dependency: transitive
description:
@@ -147,7 +140,7 @@
name: js
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.3-nullsafety.1"
+ version: "0.6.3-nullsafety.2"
logging:
dependency: transitive
description:
@@ -161,14 +154,14 @@
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.10-nullsafety.1"
+ version: "0.12.10-nullsafety.2"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0-nullsafety.4"
+ version: "1.3.0-nullsafety.5"
mime:
dependency: transitive
description:
@@ -210,21 +203,21 @@
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0-nullsafety.1"
+ version: "1.8.0-nullsafety.2"
pedantic:
dependency: "direct dev"
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
- version: "1.10.0-nullsafety.1"
+ version: "1.10.0-nullsafety.2"
pool:
dependency: transitive
description:
name: pool
url: "https://pub.dartlang.org"
source: hosted
- version: "1.5.0-nullsafety.1"
+ version: "1.5.0-nullsafety.2"
pub_semver:
dependency: "direct dev"
description:
@@ -266,70 +259,70 @@
name: source_map_stack_trace
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.2"
+ version: "2.1.0-nullsafety.3"
source_maps:
dependency: transitive
description:
name: source_maps
url: "https://pub.dartlang.org"
source: hosted
- version: "0.10.10-nullsafety.1"
+ version: "0.10.10-nullsafety.2"
source_span:
dependency: "direct main"
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.0-nullsafety.2"
+ version: "1.8.0-nullsafety.3"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
- version: "1.10.0-nullsafety.4"
+ version: "1.10.0-nullsafety.5"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0-nullsafety.1"
+ version: "2.1.0-nullsafety.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0-nullsafety.1"
+ version: "1.1.0-nullsafety.2"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0-nullsafety.1"
+ version: "1.2.0-nullsafety.2"
test:
dependency: "direct dev"
description:
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "1.16.0-nullsafety.5"
+ version: "1.16.0-nullsafety.7"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.19-nullsafety.2"
+ version: "0.2.19-nullsafety.4"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.12-nullsafety.5"
+ version: "0.3.12-nullsafety.7"
test_descriptor:
dependency: "direct dev"
description:
@@ -350,7 +343,7 @@
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0-nullsafety.3"
+ version: "1.3.0-nullsafety.4"
vm_service:
dependency: transitive
description:
@@ -387,4 +380,4 @@
source: hosted
version: "2.2.1"
sdks:
- dart: ">=2.10.0-78 <=2.11.0-edge.67c703063d5b68c9e132edbaf34dfe375851f5a6"
+ dart: ">=2.11.0-0.0 <=2.12.0-edge.4c4a09720c3c430915f4530ecb1d157deb0d0abe"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2f6d6cc..08c1843 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
name: dart_style
# Note: See tool/grind.dart for how to bump the version.
-version: 1.3.8
+version: 1.3.8+1
description: >-
Opinionated, automatic Dart source code formatter.
Provides an API and a CLI tool.
diff --git a/tool/command_shell.dart b/tool/command_shell.dart
index 419fcb0..92ffbf2 100644
--- a/tool/command_shell.dart
+++ b/tool/command_shell.dart
@@ -13,7 +13,7 @@
/// it prints.
void main(List<String> arguments) async {
var runner =
- CommandRunner('dartfmt', 'Idiomatically format Dart source code.');
+ CommandRunner<int>('dartfmt', 'Idiomatically format Dart source code.');
runner.argParser.addFlag('verbose',
abbr: 'v', negatable: false, help: 'Show verbose help.');
runner.addCommand(FormatCommand(
