From 8bb3a10e4012bf6d65a82a02a67f2025e7cf278e Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Fri, 10 Jun 2022 15:48:54 +0000 Subject: [PATCH] Fix typos Fixes #49228 TEST=ci Change-Id: Idcc625554bcf07807bae9791ea37b73ae9394b87 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/247960 Commit-Queue: Brian Wilkerson Reviewed-by: Ben Konyi Reviewed-by: Lasse Nielsen Reviewed-by: Johnni Winther Reviewed-by: Brian Wilkerson --- pkg/analysis_server/tool/lsp_spec/codegen_dart.dart | 4 ++-- pkg/front_end/test/flutter_gallery_leak_tester.dart | 8 ++++---- pkg/front_end/test/spell_checking_list_tests.txt | 1 - pkg/frontend_server/lib/frontend_server.dart | 2 +- pkg/frontend_server/test/frontend_server_test.dart | 8 ++++---- runtime/vm/compiler/backend/flow_graph_checker.cc | 2 +- runtime/vm/debugger_api_impl_test.cc | 2 +- ...static_extension_internal_resolution_4_error_test.dart | 4 ++-- .../static_extension_internal_resolution_4_test.dart | 8 ++++---- ...static_extension_internal_resolution_4_error_test.dart | 4 ++-- .../static_extension_internal_resolution_4_test.dart | 8 ++++---- 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart index 0b899cb7d15..67d63866224 100644 --- a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart +++ b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart @@ -151,10 +151,10 @@ List _getSortedUnique(List items) { final nameTypeKey = '${item.name}|${item.runtimeType}'; if (uniqueByName.containsKey(nameTypeKey)) { // At the time of writing, there were two duplicated types: - // - TextDocumentSyncKind (same defintion in both places) + // - TextDocumentSyncKind (same definition in both places) // - TextDocumentSyncOptions (first definition is just a subset) // If this list grows, consider handling this better - or try to have the - // spec updated to be unambigious. + // spec updated to be unambiguous. print('WARN: More than one definition for $nameTypeKey.'); } diff --git a/pkg/front_end/test/flutter_gallery_leak_tester.dart b/pkg/front_end/test/flutter_gallery_leak_tester.dart index d7e9630c865..ff245b5befd 100644 --- a/pkg/front_end/test/flutter_gallery_leak_tester.dart +++ b/pkg/front_end/test/flutter_gallery_leak_tester.dart @@ -334,7 +334,7 @@ Future sendAndWaitDebugDidSendFirstFrameEvent(Process _server) async { /* expression */ 'WidgetsBinding.instance.debugDidSendFirstFrameEvent', /* no definitions */ /* */ inputKey, - /* no type-defintions */ + /* no type-definitions */ /* */ inputKey, /* libraryUri */ 'package:flutter/src/widgets/binding.dart', /* class */ '', @@ -350,7 +350,7 @@ Future sendAndWaitSetSelection(Process _server) async { 'arg1, "dummy_68")', /* definition #1 */ 'arg1', /* */ inputKey, - /* no type-defintions */ + /* no type-definitions */ /* */ inputKey, /* libraryUri */ 'package:flutter/src/widgets/widget_inspector.dart', /* class */ '', @@ -366,7 +366,7 @@ Future sendAndWaitToObject(Process _server) async { '"inspector-836", "tree_112")', /* no definitions */ /* */ inputKey, - /* no type-defintions */ + /* no type-definitions */ /* */ inputKey, /* libraryUri */ 'package:flutter/src/widgets/widget_inspector.dart', /* class */ '', @@ -382,7 +382,7 @@ Future sendAndWaitToObjectForSourceLocation(Process _server) async { 'toObjectForSourceLocation("inspector-607", "tree_112")', /* no definitions */ /* */ inputKey, - /* no type-defintions */ + /* no type-definitions */ /* */ inputKey, /* libraryUri */ 'package:flutter/src/widgets/widget_inspector.dart', /* class */ '', diff --git a/pkg/front_end/test/spell_checking_list_tests.txt b/pkg/front_end/test/spell_checking_list_tests.txt index 0b2a65cb540..11859bf02ef 100644 --- a/pkg/front_end/test/spell_checking_list_tests.txt +++ b/pkg/front_end/test/spell_checking_list_tests.txt @@ -182,7 +182,6 @@ declarative decrease decrements dectcem -defintions deleting denylist depended diff --git a/pkg/frontend_server/lib/frontend_server.dart b/pkg/frontend_server/lib/frontend_server.dart index 8bd5bbbaf75..331ec7a1c60 100644 --- a/pkg/frontend_server/lib/frontend_server.dart +++ b/pkg/frontend_server/lib/frontend_server.dart @@ -1242,7 +1242,7 @@ StreamSubscription listenAndCompile(CompilerInterface compiler, // definitions (one per line) // ... // - // type-defintions (one per line) + // type-definitions (one per line) // ... // // diff --git a/pkg/frontend_server/test/frontend_server_test.dart b/pkg/frontend_server/test/frontend_server_test.dart index 4c7fca164e3..12004ad7095 100644 --- a/pkg/frontend_server/test/frontend_server_test.dart +++ b/pkg/frontend_server/test/frontend_server_test.dart @@ -554,7 +554,7 @@ void main() async { // definitions (one per line) // ... // - // type-defintions (one per line) + // type-definitions (one per line) // ... // // @@ -644,7 +644,7 @@ void main() async { // definitions (one per line) // ... // - // type-defintions (one per line) + // type-definitions (one per line) // ... // // @@ -871,7 +871,7 @@ void main() async { // definitions (one per line) // ... // - // type-defintions (one per line) + // type-definitions (one per line) // ... // // @@ -2799,7 +2799,7 @@ void main(List arguments, SendPort sendPort) { // definitions (one per line) // ... // - // type-defintions (one per line) + // type-definitions (one per line) // ... // // diff --git a/runtime/vm/compiler/backend/flow_graph_checker.cc b/runtime/vm/compiler/backend/flow_graph_checker.cc index 4fa26ee5ce7..a106088c638 100644 --- a/runtime/vm/compiler/backend/flow_graph_checker.cc +++ b/runtime/vm/compiler/backend/flow_graph_checker.cc @@ -147,7 +147,7 @@ static void AssertArgumentsInEnv(FlowGraph* flow_graph, Definition* call) { ->definition(), call); } else { - // Redefintion instructions and boxing/unboxing are inserted + // Redefinition instructions and boxing/unboxing are inserted // without updating environment uses (FlowGraph::RenameDominatedUses, // FlowGraph::InsertConversionsFor). // Also, constants may belong to different blocks (e.g. function entry diff --git a/runtime/vm/debugger_api_impl_test.cc b/runtime/vm/debugger_api_impl_test.cc index 3f04831901b..edb14406620 100644 --- a/runtime/vm/debugger_api_impl_test.cc +++ b/runtime/vm/debugger_api_impl_test.cc @@ -182,7 +182,7 @@ DART_EXPORT Dart_Handle Dart_EvaluateStaticExpr(Dart_Handle lib_handle, expr.ToCString(), /* definitions= */ Array::empty_array(), /* definition_types= */ Array::empty_array(), - /* type_defintions= */ Array::empty_array(), + /* type_definitions= */ Array::empty_array(), /* type_bounds= */ Array::empty_array(), /* type_defaults= */ Array::empty_array(), String::Handle(lib.url()).ToCString(), diff --git a/tests/language/extension_methods/static_extension_internal_resolution_4_error_test.dart b/tests/language/extension_methods/static_extension_internal_resolution_4_error_test.dart index 6f6944c8c40..dd09d1517dd 100644 --- a/tests/language/extension_methods/static_extension_internal_resolution_4_error_test.dart +++ b/tests/language/extension_methods/static_extension_internal_resolution_4_error_test.dart @@ -118,7 +118,7 @@ extension MyExt on A { // No errors: see static_extension_internal_resolution_4_test.dart } - // Extension members are ambigious. + // Extension members are ambiguous. { bool t0 = this.fieldInExtensionScope; // ^^^^^^^^^^^^^^^^^^^^^ @@ -180,7 +180,7 @@ extension MyExt on A { // No errors: see static_extension_internal_resolution_4_test.dart } - // Extension members are ambigious. + // Extension members are ambiguous. { bool t0 = self.fieldInExtensionScope; // ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/language/extension_methods/static_extension_internal_resolution_4_test.dart b/tests/language/extension_methods/static_extension_internal_resolution_4_test.dart index 590a3597f91..ad56f709f10 100644 --- a/tests/language/extension_methods/static_extension_internal_resolution_4_test.dart +++ b/tests/language/extension_methods/static_extension_internal_resolution_4_test.dart @@ -130,7 +130,7 @@ extension MyExt on A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -168,7 +168,7 @@ extension MyExt on A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -219,7 +219,7 @@ class B extends A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -263,7 +263,7 @@ void main() { checkInstanceValue(t2); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } diff --git a/tests/language_2/extension_methods/static_extension_internal_resolution_4_error_test.dart b/tests/language_2/extension_methods/static_extension_internal_resolution_4_error_test.dart index f880dedeafd..5acc4855f0b 100644 --- a/tests/language_2/extension_methods/static_extension_internal_resolution_4_error_test.dart +++ b/tests/language_2/extension_methods/static_extension_internal_resolution_4_error_test.dart @@ -120,7 +120,7 @@ extension MyExt on A { // No errors: see static_extension_internal_resolution_4_test.dart } - // Extension members are ambigious. + // Extension members are ambiguous. { bool t0 = this.fieldInExtensionScope; // ^^^^^^^^^^^^^^^^^^^^^ @@ -182,7 +182,7 @@ extension MyExt on A { // No errors: see static_extension_internal_resolution_4_test.dart } - // Extension members are ambigious. + // Extension members are ambiguous. { bool t0 = self.fieldInExtensionScope; // ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/language_2/extension_methods/static_extension_internal_resolution_4_test.dart b/tests/language_2/extension_methods/static_extension_internal_resolution_4_test.dart index 70e17ea07ce..430b6f53474 100644 --- a/tests/language_2/extension_methods/static_extension_internal_resolution_4_test.dart +++ b/tests/language_2/extension_methods/static_extension_internal_resolution_4_test.dart @@ -132,7 +132,7 @@ extension MyExt on A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -170,7 +170,7 @@ extension MyExt on A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -221,7 +221,7 @@ class B extends A { checkInstanceValue(t0); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart } @@ -265,7 +265,7 @@ void main() { checkInstanceValue(t2); } - // Extension members are ambigious. + // Extension members are ambiguous. { // Error cases tested in static_extension_internal_resolution_4_error_test.dart }