diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 48a5828e3a1..fc937031073 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -127,8 +127,8 @@ def _CheckDartFormat(input_api, output_api): def HasFormatErrors(filename: str = None, contents: str = None): # Don't look for formatting errors in multitests. Since those are very - # sensitive to whitespace, many cannot be formatted with dartfmt without - # breaking them. + # sensitive to whitespace, many cannot be reformatted without breaking + # them. if filename and filename.endswith('_test.dart'): with open(filename) as f: contents = f.read() @@ -179,7 +179,7 @@ def _CheckDartFormat(input_api, output_api): lineSep = " ^\n" return [ output_api.PresubmitError( - 'File output does not match dartfmt.\n' + 'File output does not match dart format.\n' 'Fix these issues with:\n' '%s format %s%s' % (dart, lineSep, lineSep.join(unformatted_files))) diff --git a/tests/corelib/symbol_arbitrary_string_test.dart b/tests/corelib/symbol_arbitrary_string_test.dart index c4c4d25e194..ff6cf564298 100644 --- a/tests/corelib/symbol_arbitrary_string_test.dart +++ b/tests/corelib/symbol_arbitrary_string_test.dart @@ -2,9 +2,9 @@ // 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. -// Note that this library violates the formatting provided by `dartfmt` in +// Note that this library violates the formatting provided by `dart format` in // a few locations, to verify that `"""...""""z"` can be parsed as two -// consecutive strings, `dartfmt` will insert whitespace before `"z"`. +// consecutive strings, `dart format` will insert whitespace before `"z"`. import 'package:expect/expect.dart'; diff --git a/tests/language/async_star/yield_statement_context_test.dart b/tests/language/async_star/yield_statement_context_test.dart index 7320f028a1a..2b3faa9149d 100644 --- a/tests/language/async_star/yield_statement_context_test.dart +++ b/tests/language/async_star/yield_statement_context_test.dart @@ -51,7 +51,7 @@ void main() { test('two labels on same line', () { f() async* { - // DO NOT RUN dartfmt on this file. The labels should be on the same. + // DO NOT RUN dart format on this file. The labels should be on the same. // line. Originally VM issue #2238. label1: label2: yield 0; } diff --git a/tests/language/redirecting/factory_bounds_test.dart b/tests/language/redirecting/factory_bounds_test.dart index 694062e9612..fcc2f547a67 100644 --- a/tests/language/redirecting/factory_bounds_test.dart +++ b/tests/language/redirecting/factory_bounds_test.dart @@ -11,7 +11,7 @@ class Baz {} class Foobar implements Foo {} class Bar< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. extends Foo //# 00: ok extends Baz> //# 01: compile-time error extends Foobar //# 02: compile-time error @@ -21,7 +21,7 @@ class Bar< } class Qux< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. extends Foo //# 00: continued extends Foo //# 01: continued extends Foo //# 02: continued @@ -33,7 +33,7 @@ class Qux< class A { factory A() = B< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. , int //# 03: compile-time error , String //# 04: ok >; diff --git a/tests/language_2/async_star/yield_statement_context_test.dart b/tests/language_2/async_star/yield_statement_context_test.dart index e512b3f01cc..7e64c9b05d1 100644 --- a/tests/language_2/async_star/yield_statement_context_test.dart +++ b/tests/language_2/async_star/yield_statement_context_test.dart @@ -53,7 +53,7 @@ void main() { test('two labels on same line', () { f() async* { - // DO NOT RUN dartfmt on this file. The labels should be on the same. + // DO NOT RUN dart format on this file. The labels should be on the same. // line. Originally VM issue #2238. label1: label2: yield 0; } diff --git a/tests/language_2/redirecting/factory_bounds_test.dart b/tests/language_2/redirecting/factory_bounds_test.dart index 9fec8bd6768..f8fcca9520a 100644 --- a/tests/language_2/redirecting/factory_bounds_test.dart +++ b/tests/language_2/redirecting/factory_bounds_test.dart @@ -13,7 +13,7 @@ class Baz {} class Foobar implements Foo {} class Bar< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. extends Foo //# 00: ok extends Baz> //# 01: compile-time error extends Foobar //# 02: compile-time error @@ -23,7 +23,7 @@ class Bar< } class Qux< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. extends Foo //# 00: continued extends Foo //# 01: continued extends Foo //# 02: continued @@ -35,7 +35,7 @@ class Qux< class A { factory A() = B< - T // A comment to prevent dartfmt from joining the lines. + T // A comment to prevent dart format from joining the lines. , int //# 03: compile-time error , String //# 04: ok >; diff --git a/tests/standalone/dwarf_stack_trace_invisible_functions_test.dart b/tests/standalone/dwarf_stack_trace_invisible_functions_test.dart index b7247454a89..a9fe0f3bb8c 100644 --- a/tests/standalone/dwarf_stack_trace_invisible_functions_test.dart +++ b/tests/standalone/dwarf_stack_trace_invisible_functions_test.dart @@ -20,7 +20,7 @@ const int LINE_E = 56; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt // LINE_A + throw // force linebreak with dart format // LINE_A "Hello, Dwarf!"; } diff --git a/tests/standalone/dwarf_stack_trace_obfuscate_test.dart b/tests/standalone/dwarf_stack_trace_obfuscate_test.dart index f6b33602ed7..23eb3f99a80 100644 --- a/tests/standalone/dwarf_stack_trace_obfuscate_test.dart +++ b/tests/standalone/dwarf_stack_trace_obfuscate_test.dart @@ -14,7 +14,7 @@ import 'dwarf_stack_trace_test.dart' as base; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt + throw // force linebreak with dart format "Hello, Dwarf!"; } diff --git a/tests/standalone/dwarf_stack_trace_test.dart b/tests/standalone/dwarf_stack_trace_test.dart index a583d345ad3..970be0ea315 100644 --- a/tests/standalone/dwarf_stack_trace_test.dart +++ b/tests/standalone/dwarf_stack_trace_test.dart @@ -14,7 +14,7 @@ import 'package:expect/expect.dart'; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt + throw // force linebreak with dart format "Hello, Dwarf!"; } diff --git a/tests/standalone_2/dwarf_stack_trace_invisible_functions_test.dart b/tests/standalone_2/dwarf_stack_trace_invisible_functions_test.dart index cd912fcc4b8..411ebd94364 100644 --- a/tests/standalone_2/dwarf_stack_trace_invisible_functions_test.dart +++ b/tests/standalone_2/dwarf_stack_trace_invisible_functions_test.dart @@ -22,7 +22,7 @@ const int LINE_E = 58; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt // LINE_A + throw // force linebreak with dart format // LINE_A "Hello, Dwarf!"; } diff --git a/tests/standalone_2/dwarf_stack_trace_obfuscate_test.dart b/tests/standalone_2/dwarf_stack_trace_obfuscate_test.dart index 8614b88c7d6..f21fff13b62 100644 --- a/tests/standalone_2/dwarf_stack_trace_obfuscate_test.dart +++ b/tests/standalone_2/dwarf_stack_trace_obfuscate_test.dart @@ -16,7 +16,7 @@ import 'dwarf_stack_trace_test.dart' as base; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt + throw // force linebreak with dart format "Hello, Dwarf!"; } diff --git a/tests/standalone_2/dwarf_stack_trace_test.dart b/tests/standalone_2/dwarf_stack_trace_test.dart index 75353eedba4..acc066b9c99 100644 --- a/tests/standalone_2/dwarf_stack_trace_test.dart +++ b/tests/standalone_2/dwarf_stack_trace_test.dart @@ -16,7 +16,7 @@ import 'package:expect/expect.dart'; @pragma("vm:prefer-inline") bar() { // Keep the 'throw' and its argument on separate lines. - throw // force linebreak with dartfmt + throw // force linebreak with dart format "Hello, Dwarf!"; } diff --git a/tools/sdks/README b/tools/sdks/README index b7d766a5430..0ef9f686b4e 100644 --- a/tools/sdks/README +++ b/tools/sdks/README @@ -7,6 +7,6 @@ We use the x64 build as the default on Linux, Mac and Windows. Builds for Linux on ARM and ARM64 are also provided. To upload new versions of these CIPD packages, run "./update.sh" in this -directory. Because these SDKs are used for the presubmit dartfmt check on -changed files, they may need to be updated often when dartfmt is changing +directory. Because these SDKs are used for the presubmit dart format check on +changed files, they may need to be updated often when dart format is changing rapidly. Access to the project-dart-admins Luci auth group is required to do so.