diff --git a/dev/a11y_assessments/test/expansion_tile_test.dart b/dev/a11y_assessments/test/expansion_tile_test.dart index 98202198cb..3503680206 100644 --- a/dev/a11y_assessments/test/expansion_tile_test.dart +++ b/dev/a11y_assessments/test/expansion_tile_test.dart @@ -14,7 +14,7 @@ void main() { expect(find.byType(ExpansionTile), findsExactly(3)); }); - testWidgets('exapansion tile has one h1 tag', (WidgetTester tester) async { + testWidgets('expansion tile has one h1 tag', (WidgetTester tester) async { await pumpsUseCase(tester, ExpansionTileUseCase()); final Finder findHeadingLevelOnes = find.bySemanticsLabel('ExpansionTile Demo'); await tester.pumpAndSettle(); diff --git a/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart b/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart index e1c201df18..b109e4a4f5 100644 --- a/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart +++ b/dev/benchmarks/microbenchmarks/lib/benchmark_collection.dart @@ -127,8 +127,8 @@ Future main() async { final ArgResults results = parser.parse(mainArgs); final List selectedTests = results.multiOption('tests'); - // Shuffle the tests becauase we don't want order dependent tests. - // It is the responsibily of the infra to tell us what the seed value is, + // Shuffle the tests because we don't want order dependent tests. + // It is the responsibility of the infra to tell us what the seed value is, // in case we want to have the seed stable for some time period. final List tests = benchmarks.where((Benchmark e) => selectedTests.contains(e.$1)).toList(); tests.shuffle(Random(int.parse(results.option('seed')!))); diff --git a/dev/benchmarks/microbenchmarks/lib/foundation/observer_list_bench.dart b/dev/benchmarks/microbenchmarks/lib/foundation/observer_list_bench.dart index ac492c4b7f..8250122592 100644 --- a/dev/benchmarks/microbenchmarks/lib/foundation/observer_list_bench.dart +++ b/dev/benchmarks/microbenchmarks/lib/foundation/observer_list_bench.dart @@ -25,7 +25,7 @@ Future execute() async { final BenchmarkResultPrinter printer = BenchmarkResultPrinter(); - void runNotifiyListenersLoopWithObserverList( + void runNotifyListenersLoopWithObserverList( int totalIterations, { bool failRemoval = false, bool addResult = true, @@ -79,7 +79,7 @@ Future execute() async { } } - void runNotifiyListenersLoopWithHashedObserverList( + void runNotifyListenersLoopWithHashedObserverList( int totalIterations, { bool addResult = true, }) { @@ -124,7 +124,7 @@ Future execute() async { } } - void runNotifiyListenersLoopWithAnimationController( + void runNotifyListenersLoopWithAnimationController( int totalIterations, { bool addResult = true, }) { @@ -162,11 +162,11 @@ Future execute() async { } } - runNotifiyListenersLoopWithObserverList(_kNumIterationsList); - runNotifiyListenersLoopWithObserverList(_kNumIterationsList, + runNotifyListenersLoopWithObserverList(_kNumIterationsList); + runNotifyListenersLoopWithObserverList(_kNumIterationsList, failRemoval: true); - runNotifiyListenersLoopWithHashedObserverList(_kNumIterationsHashed); - runNotifiyListenersLoopWithAnimationController(_kNumIterationsHashed); + runNotifyListenersLoopWithHashedObserverList(_kNumIterationsHashed); + runNotifyListenersLoopWithAnimationController(_kNumIterationsHashed); printer.printToStdout(); } diff --git a/dev/bots/utils.dart b/dev/bots/utils.dart index 8b089e5839..ae78a021e7 100644 --- a/dev/bots/utils.dart +++ b/dev/bots/utils.dart @@ -74,7 +74,7 @@ final List flutterTestArgs = []; /// Whether execution should be simulated for debugging purposes. /// /// When `true`, calls to [runCommand] print to [io.stdout] instead of running -/// the process. This is useful for determing what an invocation of `test.dart` +/// the process. This is useful for determining what an invocation of `test.dart` /// _might_ due if not invoked with `--dry-run`, or otherwise determine what the /// different test shards and sub-shards are configured as. bool get dryRun => _dryRun ?? false; @@ -621,7 +621,7 @@ List selectIndexOfTotalSubshard(List tests, {String subshardKey = kSubs required int subShardCount, }) { // While there exists a closed formula figuring out the range of tests the - // subshard is resposible for, modeling this as a simulation of distributing + // subshard is responsible for, modeling this as a simulation of distributing // items equally into buckets is more intuitive. // // A bucket represents how many tests a subshard should be allocated. diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index 8d7fc07ece..bd08e664b9 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -2042,7 +2042,7 @@ class MemoryTest { await receivedNextMessage; } - /// Taps the application and looks for acknowldgement. + /// Taps the application and looks for acknowledgement. /// /// This is used by several tests to ensure scrolling gestures are installed. Future tapNotification() async { diff --git a/dev/tools/native_driver/lib/src/backend/android/adb.dart b/dev/tools/native_driver/lib/src/backend/android/adb.dart index 34740481ad..5989c2bf58 100644 --- a/dev/tools/native_driver/lib/src/backend/android/adb.dart +++ b/dev/tools/native_driver/lib/src/backend/android/adb.dart @@ -11,7 +11,7 @@ import 'package:process/process.dart'; /// A minimal wrapper around the `adb` command-line tool. @internal class Adb { - const Adb._(this._prefixArgs, this._proccess); + const Adb._(this._prefixArgs, this._process); /// Creates a new `adb` command runner that uses the `adb` command-line tool. /// @@ -41,7 +41,7 @@ class Adb { } Future _runString(List args) async { - final io.ProcessResult result = await _proccess.run( + final io.ProcessResult result = await _process.run( [ ..._prefixArgs, ...args, @@ -55,7 +55,7 @@ class Adb { } Future _runBinary(List args) async { - final io.ProcessResult result = await _proccess.run( + final io.ProcessResult result = await _process.run( [ ..._prefixArgs, ...args, @@ -70,7 +70,7 @@ class Adb { } final List _prefixArgs; - final ProcessManager _proccess; + final ProcessManager _process; /// Returns whether the device is currently connected. /// @@ -161,7 +161,7 @@ class Adb { } } - /// Disable confirnations for immersive mode. + /// Disable confirmations for immersive mode. Future disableImmersiveModeConfirmations() async { final AdbStringResult result = await _runString([ 'shell', diff --git a/dev/tools/native_driver/lib/src/backend/android/driver.dart b/dev/tools/native_driver/lib/src/backend/android/driver.dart index 263959fcca..5d966008dc 100644 --- a/dev/tools/native_driver/lib/src/backend/android/driver.dart +++ b/dev/tools/native_driver/lib/src/backend/android/driver.dart @@ -86,7 +86,7 @@ final class AndroidNativeDriver implements NativeDriver { @override Future screenshot() async { - // Indentical wait to what `FlutterDriver.screenshot` does. + // Identical wait to what `FlutterDriver.screenshot` does. await _waitFor2s(); return _AdbScreencap(await _adb.screencap(), _tmpDir); } diff --git a/dev/tools/native_driver/lib/src/common.dart b/dev/tools/native_driver/lib/src/common.dart index 3f3635c951..5999462fbe 100644 --- a/dev/tools/native_driver/lib/src/common.dart +++ b/dev/tools/native_driver/lib/src/common.dart @@ -62,7 +62,7 @@ final class NativeResult extends Result { Map toJson() => const {}; } -/// An object that descrbes searching for _native_ elements. +/// An object that describes searching for _native_ elements. sealed class NativeFinder { const NativeFinder(); diff --git a/dev/tools/native_driver/lib/src/goldens.dart b/dev/tools/native_driver/lib/src/goldens.dart index bd0e180757..4b1a3c1144 100644 --- a/dev/tools/native_driver/lib/src/goldens.dart +++ b/dev/tools/native_driver/lib/src/goldens.dart @@ -136,7 +136,7 @@ final class NaiveLocalFileComparator extends GoldenFileComparator { // late NativeDriver nativeDriver; /// Asserts that a [NativeScreenshot], [Future], or -/// [List] matches the golden image file indentified by [key], with an +/// [List] matches the golden image file identified by [key], with an /// optional [version] number]. /// /// The [key] may be either a [Uri] or a [String] representation of a URL. @@ -151,7 +151,7 @@ final class NaiveLocalFileComparator extends GoldenFileComparator { /// ## Golden File Testing /// /// The term __golden file__ refers to a master image that is considered the -/// true renmdering of a given widget, state, application, or other visual +/// true rendering of a given widget, state, application, or other visual /// representation you have chosen to capture. /// /// The master golden image files are tested against can be created or updated diff --git a/docs/contributing/Style-guide-for-Flutter-repo.md b/docs/contributing/Style-guide-for-Flutter-repo.md index f1c24c6e0c..37177ceae2 100644 --- a/docs/contributing/Style-guide-for-Flutter-repo.md +++ b/docs/contributing/Style-guide-for-Flutter-repo.md @@ -1079,7 +1079,7 @@ However, where possible avoid global constants. Rather than `kDefaultButtonColor ### Avoid abbreviations -Unless the abbreviation is more recognizable than the expansion (e.g. XML, HTTP, JSON), expand abbrevations +Unless the abbreviation is more recognizable than the expansion (e.g. XML, HTTP, JSON), expand abbreviations when selecting a name for an identifier. In general, avoid one-character names unless one character is idiomatic (for example, prefer `index` over `i`, but prefer `x` over `horizontalPosition`). diff --git a/docs/ecosystem/testing/Plugin-Tests.md b/docs/ecosystem/testing/Plugin-Tests.md index ded095af1d..f20ef36f76 100644 --- a/docs/ecosystem/testing/Plugin-Tests.md +++ b/docs/ecosystem/testing/Plugin-Tests.md @@ -195,7 +195,7 @@ See below for instructions on bringing up test scaffolding in a plugin (*does no 1. Use of OCMock in new tests, especially Swift tests, is discouraged in favor of protocol-based programming and dependency injection. However, if your XCTests require OCMock, open the Package Dependencies section of the project in Xcode, and add the following dependency to - the RunnnerTests target: + the RunnerTests target: ``` https://github.com/erikdoe/ocmock diff --git a/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart b/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart index 450e062b08..3e6c3e6898 100644 --- a/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart +++ b/examples/api/lib/widgets/scroll_end_notification/scroll_end_notification.1.dart @@ -53,7 +53,7 @@ class _SliverAutoScrollExampleState extends State { // After an interactive scroll ends, if the alignedItem is partially visible // at the top or bottom of the viewport, then auto-scroll so that it's - // completely visible. To accomodate mouse-wheel scrolls and other small + // completely visible. To accommodate mouse-wheel scrolls and other small // adjustments, scrolls that change the scroll offset by less than // the alignedItem's extent don't trigger an auto-scroll. void maybeAutoScrollAlignedItem(RenderSliver alignedItem) { diff --git a/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart b/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart index 8ce8ea2bd9..22af0d363d 100644 --- a/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart +++ b/examples/api/lib/widgets/scroll_position/is_scrolling_listener.0.dart @@ -56,7 +56,7 @@ class _IsScrollingListenerExampleState extends State } // After an interactive scroll "ends", auto-scroll so that last item in the - // viewport is completely visible. To accomodate mouse-wheel scrolls, other small + // viewport is completely visible. To accommodate mouse-wheel scrolls, other small // adjustments, and scrolling to the top, scrolls that put the scroll offset at // zero or change the scroll offset by less than itemExtent don't trigger // an auto-scroll. diff --git a/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart b/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart index a340e5425e..d2037eb88e 100644 --- a/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart +++ b/examples/api/lib/widgets/sliver/pinned_header_sliver.1.dart @@ -45,7 +45,7 @@ class _SettingsAppBarExampleState extends State { // The key must be for a widget _below_ a RenderSliver so that // findAncestorRenderObjectOfType can find the RenderSliver when it searches - // the key widget's renderer ancesotrs. + // the key widget's renderer ancestors. RenderSliver? keyToSliver(GlobalKey key) => key.currentContext?.findAncestorRenderObjectOfType(); // Each time the app's list scrolls: if the Title sliver has scrolled completely behind diff --git a/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart b/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart index 8f36c8fde5..edb8c10663 100644 --- a/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart +++ b/examples/api/test/widgets/scroll_end_notification/scroll_end_notification.1_test.dart @@ -15,7 +15,7 @@ void main() { final double itemHeight = tester.getSize(find.widgetWithText(Card, 'Item 0.15')).height; // The scroll view is 600 pixels high and the big orange - // "AlignedItem" is precedeed by 15 regular items. Scroll up enough + // "AlignedItem" is preceded by 15 regular items. Scroll up enough // to make it partially visible. await tester.drag(find.byType(CustomScrollView), Offset(0, 600 - 15.5 * itemHeight)); await tester.pumpAndSettle(); diff --git a/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart b/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart index a6b2b7362f..3e280bde60 100644 --- a/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart +++ b/examples/api/test/widgets/shortcuts/shortcuts.1_test.dart @@ -55,7 +55,7 @@ void main() { }); // Regression test for https://github.com/flutter/flutter/issues/156806. - testWidgets('SingleActivator is used instead of LogiccalKeySet', (WidgetTester tester) async { + testWidgets('SingleActivator is used instead of LogicalKeySet', (WidgetTester tester) async { await tester.pumpWidget( const example.ShortcutsExampleApp(), ); diff --git a/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart b/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart index 281dd1886a..6c1eba481a 100644 --- a/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart +++ b/packages/flutter/lib/src/cupertino/sliding_segmented_control.dart @@ -1280,7 +1280,7 @@ class _RenderSegmentedControl extends RenderBox for (int index = 0; index < children.length; index += 2) { // Children contains both segment and separator and the order is segment -> - // separator -> segment. So to paint separators, indes should start from 0 and + // separator -> segment. So to paint separators, index should start from 0 and // the step should be 2. _paintChild(context, offset, children[index]); } diff --git a/packages/flutter/lib/src/material/calendar_date_picker.dart b/packages/flutter/lib/src/material/calendar_date_picker.dart index 20f82a05d3..0d471c17ff 100644 --- a/packages/flutter/lib/src/material/calendar_date_picker.dart +++ b/packages/flutter/lib/src/material/calendar_date_picker.dart @@ -44,7 +44,7 @@ const double _subHeaderHeight = 52.0; const double _monthNavButtonsWidth = 108.0; // 3.0 is the maximum scale factor on mobile phones. As of 07/30/24, iOS goes up -// to a max of 3.0 text sxale factor, and Android goes up to 2.0. This is the +// to a max of 3.0 text scale factor, and Android goes up to 2.0. This is the // default used for non-range date pickers. This default is changed to a lower // value at different parts of the date pickers depending on content, and device // orientation. diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart index 940937d966..85f93649ed 100644 --- a/packages/flutter/lib/src/material/page_transitions_theme.dart +++ b/packages/flutter/lib/src/material/page_transitions_theme.dart @@ -556,7 +556,7 @@ abstract class PageTransitionsBuilder { /// const constructors so that they can be used in const expressions. const PageTransitionsBuilder(); - /// Provideds a secondary transition to the previous route. + /// Provides a secondary transition to the previous route. /// /// {@macro flutter.widgets.delegatedTransition} DelegatedTransitionBuilder? get delegatedTransition => null; diff --git a/packages/flutter/lib/src/material/slider.dart b/packages/flutter/lib/src/material/slider.dart index a90119040c..48c9315135 100644 --- a/packages/flutter/lib/src/material/slider.dart +++ b/packages/flutter/lib/src/material/slider.dart @@ -566,7 +566,7 @@ class Slider extends StatefulWidget { /// overlay shape, whichever is larger. final EdgeInsetsGeometry? padding; - /// When true, the [Slider] will use the 2023 Material 3 esign appearance. + /// When true, the [Slider] will use the 2023 Material 3 design appearance. /// /// Defaults to true. If false, the [Slider] will use the latest Material 3 /// Design appearance, which was introduced in December 2023. diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 2df357ee82..d07219de9e 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart @@ -1698,7 +1698,7 @@ class SemanticsProperties extends DiagnosticableTree { /// * Buttons must respond to tap/click events produced via keyboard shortcuts. /// * Text fields must become focused and editable, showing an on-screen /// keyboard, if necessary. - /// * Checkboxes, switches, and radio buttons must become togglable using + /// * Checkboxes, switches, and radio buttons must become toggleable using /// keyboard shortcuts. /// /// Focus behavior is specific to the platform and to the assistive technology diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart index a7f7337ccd..a8c0bf748c 100644 --- a/packages/flutter/lib/src/services/text_input.dart +++ b/packages/flutter/lib/src/services/text_input.dart @@ -1267,11 +1267,11 @@ mixin TextInputClient { void performSelector(String selectorName) {} } -/// An interface into iOS's stylus hadnwriting text input. +/// An interface into iOS's stylus handwriting text input. /// /// See also: /// -/// * [Scribe], which provides similar functionality for Anroid. +/// * [Scribe], which provides similar functionality for Android. /// * [UIIndirectScribbleInteraction](https://developer.apple.com/documentation/uikit/uiindirectscribbleinteraction), /// which is iOS's API for Scribble. abstract class ScribbleClient { diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index fa218d6dd5..3bdc345778 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -1762,7 +1762,7 @@ class EditableText extends StatefulWidget { /// /// See also: /// - /// * [ScribbleClient], which can be mixed into an arbirtrary widget to + /// * [ScribbleClient], which can be mixed into an arbitrary widget to /// provide iOS Scribble functionality. /// * [Scribe], which can be used to interact with Android Scribe directly. final bool stylusHandwritingEnabled; diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index 8867da3503..86c51dd00d 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -2713,7 +2713,7 @@ final class BuildScope { } bool _debugAssertElementInScope(Element element, Element debugBuildRoot) { - final bool isInScope = element._debugIsDescsendantOf(debugBuildRoot) + final bool isInScope = element._debugIsDescendantOf(debugBuildRoot) || !element.debugIsActive; if (isInScope) { return true; @@ -3674,7 +3674,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext { }); } - bool _debugIsDescsendantOf(Element target) { + bool _debugIsDescendantOf(Element target) { Element? element = this; while (element != null && element.depth > target.depth) { element = element._parent; @@ -5172,7 +5172,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext { if (owner!._debugBuilding) { assert(owner!._debugCurrentBuildTarget != null); assert(owner!._debugStateLocked); - if (_debugIsDescsendantOf(owner!._debugCurrentBuildTarget!)) { + if (_debugIsDescendantOf(owner!._debugCurrentBuildTarget!)) { return true; } final List information = [ diff --git a/packages/flutter/lib/src/widgets/safe_area.dart b/packages/flutter/lib/src/widgets/safe_area.dart index e84164c0f4..dcb1b036c9 100644 --- a/packages/flutter/lib/src/widgets/safe_area.dart +++ b/packages/flutter/lib/src/widgets/safe_area.dart @@ -29,7 +29,7 @@ import 'media_query.dart'; /// {@tool snippet} /// /// This example creates a blue box containing text that is sufficiently padded -/// to avoid instrusions by the operating system. +/// to avoid intrusions by the operating system. /// /// ```dart /// SafeArea( diff --git a/packages/flutter/lib/src/widgets/text_selection.dart b/packages/flutter/lib/src/widgets/text_selection.dart index ce92fdcfc6..b39a8bf094 100644 --- a/packages/flutter/lib/src/widgets/text_selection.dart +++ b/packages/flutter/lib/src/widgets/text_selection.dart @@ -1860,7 +1860,7 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay> with S /// Returns the bounding [Rect] of the text selection handle in local /// coordinates. /// - /// When interacting with a text seletion handle through a touch event, the + /// When interacting with a text selection handle through a touch event, the /// interactive area should be at least [kMinInteractiveDimension] square, /// which this method does not consider. Rect _getHandleRect(TextSelectionHandleType type, double preferredLineHeight) { diff --git a/packages/flutter/test/cupertino/sliding_segmented_control_test.dart b/packages/flutter/test/cupertino/sliding_segmented_control_test.dart index ba558087ba..a1892b34c1 100644 --- a/packages/flutter/test/cupertino/sliding_segmented_control_test.dart +++ b/packages/flutter/test/cupertino/sliding_segmented_control_test.dart @@ -400,7 +400,7 @@ void main() { expect(getHighlightedIndex(tester), null); }); - testWidgets('Disabled segment can be selected programmtically', (WidgetTester tester) async { + testWidgets('Disabled segment can be selected programmatically', (WidgetTester tester) async { const Map children = { 0: Text('Child 1'), 1: Text('Child 2'), diff --git a/packages/flutter/test/material/dropdown_menu_test.dart b/packages/flutter/test/material/dropdown_menu_test.dart index a609fea039..03f17a9979 100644 --- a/packages/flutter/test/material/dropdown_menu_test.dart +++ b/packages/flutter/test/material/dropdown_menu_test.dart @@ -1517,7 +1517,7 @@ void main() { }); // Regression test for https://github.com/flutter/flutter/issues/152375. - testWidgets('Searching can hightlight entry after keyboard navigation while focused', (WidgetTester tester) async { + testWidgets('Searching can highlight entry after keyboard navigation while focused', (WidgetTester tester) async { final ThemeData themeData = ThemeData(); await tester.pumpWidget(MaterialApp( theme: themeData, diff --git a/packages/flutter/test/material/slider_test.dart b/packages/flutter/test/material/slider_test.dart index 09711842cb..4d3daf3f28 100644 --- a/packages/flutter/test/material/slider_test.dart +++ b/packages/flutter/test/material/slider_test.dart @@ -4744,7 +4744,7 @@ void main() { // Test default track shape. const Radius trackOuterCornerRadius = Radius.circular(8.0); - const Radius trackInnerCornderRadius = Radius.circular(2.0); + const Radius trackInnerCornerRadius = Radius.circular(2.0); expect( material, paints @@ -4753,20 +4753,20 @@ void main() { rrect: RRect.fromLTRBAndCorners( 24.0, 292.0, 356.4, 308.0, topLeft: trackOuterCornerRadius, - topRight: trackInnerCornderRadius, - bottomRight: trackInnerCornderRadius, + topRight: trackInnerCornerRadius, + bottomRight: trackInnerCornerRadius, bottomLeft: trackOuterCornerRadius, ), color: activeTrackColor, ) - // Inctive track. + // Inactive track. ..rrect( rrect: RRect.fromLTRBAndCorners( 368.4, 292.0, 776.0, 308.0, - topLeft: trackInnerCornderRadius, + topLeft: trackInnerCornerRadius, topRight: trackOuterCornerRadius, bottomRight: trackOuterCornerRadius, - bottomLeft: trackInnerCornderRadius, + bottomLeft: trackInnerCornerRadius, ), color: inactiveTrackColor, ) diff --git a/packages/flutter/test/material/slider_theme_test.dart b/packages/flutter/test/material/slider_theme_test.dart index 815c643986..aeecd5ed36 100644 --- a/packages/flutter/test/material/slider_theme_test.dart +++ b/packages/flutter/test/material/slider_theme_test.dart @@ -2671,7 +2671,7 @@ void main() { // Test default track shape. const Radius trackOuterCornerRadius = Radius.circular(8.0); - const Radius trackInnerCornderRadius = Radius.circular(2.0); + const Radius trackInnerCornerRadius = Radius.circular(2.0); expect( material, paints @@ -2680,19 +2680,19 @@ void main() { rrect: RRect.fromLTRBAndCorners( 24.0, 292.0, 400.0, 308.0, topLeft: trackOuterCornerRadius, - topRight: trackInnerCornderRadius, - bottomRight: trackInnerCornderRadius, + topRight: trackInnerCornerRadius, + bottomRight: trackInnerCornerRadius, bottomLeft: trackOuterCornerRadius, ), ) - // Inctive track. + // Inactive track. ..rrect( rrect: RRect.fromLTRBAndCorners( 400.0, 292.0, 776.0, 308.0, - topLeft: trackInnerCornderRadius, + topLeft: trackInnerCornerRadius, topRight: trackOuterCornerRadius, bottomRight: trackOuterCornerRadius, - bottomLeft: trackInnerCornderRadius, + bottomLeft: trackInnerCornerRadius, ), ) ); @@ -2707,19 +2707,19 @@ void main() { rrect: RRect.fromLTRBAndCorners( 24.0, 292.0, 390.0, 308.0, topLeft: trackOuterCornerRadius, - topRight: trackInnerCornderRadius, - bottomRight: trackInnerCornderRadius, + topRight: trackInnerCornerRadius, + bottomRight: trackInnerCornerRadius, bottomLeft: trackOuterCornerRadius, ), ) - // Inctive track. + // Inactive track. ..rrect( rrect: RRect.fromLTRBAndCorners( 410.0, 292.0, 776.0, 308.0, - topLeft: trackInnerCornderRadius, + topLeft: trackInnerCornerRadius, topRight: trackOuterCornerRadius, bottomRight: trackOuterCornerRadius, - bottomLeft: trackInnerCornderRadius, + bottomLeft: trackInnerCornerRadius, ), ) ); diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart index 2315483efc..9d56ef3786 100644 --- a/packages/flutter/test/material/tabs_test.dart +++ b/packages/flutter/test/material/tabs_test.dart @@ -2488,7 +2488,7 @@ void main() { expect(tabBarBox.size.height, 48.0); // Ease in sine (accelerating). - double accelerateIntepolation(double fraction) { + double accelerateInterpolation(double fraction) { return 1.0 - math.cos((fraction * math.pi) / 2.0); } @@ -2499,8 +2499,8 @@ void main() { }) { const double indicatorWeight = 3.0; final double tabChangeProgress = (controller.index - controller.animation!.value).abs(); - final double leftFraction = accelerateIntepolation(tabChangeProgress); - final double rightFraction = accelerateIntepolation(tabChangeProgress); + final double leftFraction = accelerateInterpolation(tabChangeProgress); + final double rightFraction = accelerateInterpolation(tabChangeProgress); final RRect rrect = RRect.fromLTRBAndCorners( lerpDouble(rect.left, targetRect.left, leftFraction)!, @@ -7313,7 +7313,7 @@ void main() { }); // This is a regression test for https://github.com/flutter/flutter/issues/150316. - testWidgets('Scrollable TabBar wuth transparent divider expands to full width', (WidgetTester tester) async { + testWidgets('Scrollable TabBar with transparent divider expands to full width', (WidgetTester tester) async { Widget buildTabBar({ Color? dividerColor, TabAlignment? tabAlignment }) { return boilerplate( child: Center( @@ -7424,7 +7424,7 @@ void main() { await tester.pumpAndSettle(); // Ease in sine (accelerating). - double accelerateIntepolation(double fraction) { + double accelerateInterpolation(double fraction) { return 1.0 - math.cos((fraction * math.pi) / 2.0); } @@ -7435,8 +7435,8 @@ void main() { }) { const double indicatorWeight = 3.0; final double tabChangeProgress = (controller.index - controller.animation!.value).abs(); - final double leftFraction = accelerateIntepolation(tabChangeProgress); - final double rightFraction = accelerateIntepolation(tabChangeProgress); + final double leftFraction = accelerateInterpolation(tabChangeProgress); + final double rightFraction = accelerateInterpolation(tabChangeProgress); final RRect rrect = RRect.fromLTRBAndCorners( lerpDouble(rect.left, targetRect.left, leftFraction)!, diff --git a/packages/flutter/test/widgets/app_test.dart b/packages/flutter/test/widgets/app_test.dart index 3265decd67..117898ba61 100644 --- a/packages/flutter/test/widgets/app_test.dart +++ b/packages/flutter/test/widgets/app_test.dart @@ -153,7 +153,7 @@ void main() { expect(checked, isTrue); }, variant: KeySimulatorTransitModeVariant.all()); - testWidgets('Title is not created if title is not passed and kIsweb', (WidgetTester tester) async { + testWidgets('Title is not created if title is not passed and kIsWeb', (WidgetTester tester) async { await tester.pumpWidget( WidgetsApp( color: const Color(0xFF123456), diff --git a/packages/flutter/test/widgets/editable_text_test.dart b/packages/flutter/test/widgets/editable_text_test.dart index 8376dd17cb..2f5f705f6f 100644 --- a/packages/flutter/test/widgets/editable_text_test.dart +++ b/packages/flutter/test/widgets/editable_text_test.dart @@ -12844,7 +12844,7 @@ void main() { selection: TextSelection.collapsed(offset: textAC.length), ); - bool isDeskop() { + bool isDesktop() { return debugDefaultTargetPlatformOverride == TargetPlatform.macOS || debugDefaultTargetPlatformOverride == TargetPlatform.windows || debugDefaultTargetPlatformOverride == TargetPlatform.linux; @@ -13032,7 +13032,7 @@ void main() { focusNode.requestFocus(); await tester.pump(); await waitForThrottling(tester); - expect(controller.value, isDeskop() ? textASelected : textACollapsedAtEnd); + expect(controller.value, isDesktop() ? textASelected : textACollapsedAtEnd); // Insert some text. await tester.enterText(find.byType(EditableText), textAB); @@ -13041,7 +13041,7 @@ void main() { // Undo the insertion without waiting for the throttling delay. await sendUndo(tester); expect(controller.value.selection.isValid, true); - expect(controller.value, isDeskop() ? textASelected : textACollapsedAtEnd); + expect(controller.value, isDesktop() ? textASelected : textACollapsedAtEnd); // On web, these keyboard shortcuts are handled by the browser. }, variant: TargetPlatformVariant.all(), skip: kIsWeb); // [intended] @@ -13056,7 +13056,7 @@ void main() { await tester.pump(); await sendUndo(tester); await waitForThrottling(tester); - expect(controller.value, isDeskop() ? textASelected : textACollapsedAtEnd); + expect(controller.value, isDesktop() ? textASelected : textACollapsedAtEnd); // Insert some text. await tester.enterText(find.byType(EditableText), textAB); @@ -13066,7 +13066,7 @@ void main() { await sendUndo(tester); // Initial text should have been recorded and restored. - expect(controller.value, isDeskop() ? textASelected : textACollapsedAtEnd); + expect(controller.value, isDesktop() ? textASelected : textACollapsedAtEnd); // On web, these keyboard shortcuts are handled by the browser. }, variant: TargetPlatformVariant.all(), skip: kIsWeb); // [intended] diff --git a/packages/flutter/test/widgets/framework_test.dart b/packages/flutter/test/widgets/framework_test.dart index b1e7086f1d..ce74e64fc5 100644 --- a/packages/flutter/test/widgets/framework_test.dart +++ b/packages/flutter/test/widgets/framework_test.dart @@ -2424,11 +2424,11 @@ class _DummyMultiChildWidget extends Widget { final List children; @override - Element createElement() => _DummyMuitiChildElement(this); + Element createElement() => _DummyMultiChildElement(this); } -class _DummyMuitiChildElement extends Element { - _DummyMuitiChildElement(super.widget); +class _DummyMultiChildElement extends Element { + _DummyMultiChildElement(super.widget); @override bool get debugDoingBuild => throw UnimplementedError(); diff --git a/packages/flutter/test/widgets/scrollbar_test.dart b/packages/flutter/test/widgets/scrollbar_test.dart index 01695da777..3895ff995f 100644 --- a/packages/flutter/test/widgets/scrollbar_test.dart +++ b/packages/flutter/test/widgets/scrollbar_test.dart @@ -3267,7 +3267,7 @@ The provided ScrollController cannot be shared by multiple ScrollView widgets.'' // that begin in the center of the scrollable are handled by the // scrollable, not the scrollbar. However: the scrollbar widget does // contain the scrollable and this test verifies that it doesn't - // inadvertantly handle thumb down/start/update/end gestures due + // inadvertently handle thumb down/start/update/end gestures due // to trackpad pan/zoom events. Those callbacks are prevented by // the overrides of isPointerPanZoomAllowed in the scrollbar // gesture recognizers. diff --git a/packages/flutter/test/widgets/selectable_region_test.dart b/packages/flutter/test/widgets/selectable_region_test.dart index ab83e3e2e1..130528e1f6 100644 --- a/packages/flutter/test/widgets/selectable_region_test.dart +++ b/packages/flutter/test/widgets/selectable_region_test.dart @@ -320,7 +320,7 @@ void main() { final Offset gPos = textOffsetToPosition(paragraph, testValue.indexOf('g')); final Offset pPos = textOffsetToPosition(paragraph, testValue.indexOf('p')); - // A double tap + drag should take precendence over parent drags. + // A double tap + drag should take precedence over parent drags. final TestGesture gesture = await tester.startGesture(gPos); addTearDown(gesture.removePointer); await tester.pump(); @@ -382,7 +382,7 @@ void main() { final Offset gPos = textOffsetToPosition(paragraph, testValue.indexOf('g')); final Offset pPos = textOffsetToPosition(paragraph, testValue.indexOf('p')); - // A double tap + drag should take precendence over parent drags. + // A double tap + drag should take precedence over parent drags. final TestGesture gesture = await tester.startGesture(gPos); addTearDown(gesture.removePointer); await tester.pump(); @@ -4634,7 +4634,7 @@ void main() { await gesture.up(); await tester.pumpAndSettle(); - // Clear selection programatically. + // Clear selection programmatically. state.clearSelection(); expect(paragraph1.selections, isEmpty); expect(paragraph2.selections, isEmpty); diff --git a/packages/flutter/test/widgets/selectable_text_test.dart b/packages/flutter/test/widgets/selectable_text_test.dart index 89830532b6..746bbf0b3b 100644 --- a/packages/flutter/test/widgets/selectable_text_test.dart +++ b/packages/flutter/test/widgets/selectable_text_test.dart @@ -3593,7 +3593,7 @@ void main() { final Offset gPos = textOffsetToPosition(tester, testValue.indexOf('g')); final Offset pPos = textOffsetToPosition(tester, testValue.indexOf('p')); - // A double tap + drag should take precendence over parent drags. + // A double tap + drag should take precedence over parent drags. final TestGesture gesture = await tester.startGesture(gPos); await tester.pump(); await gesture.up(); diff --git a/packages/flutter/test/widgets/widget_inspector_test.dart b/packages/flutter/test/widgets/widget_inspector_test.dart index 55a84ecad5..150aa895ca 100644 --- a/packages/flutter/test/widgets/widget_inspector_test.dart +++ b/packages/flutter/test/widgets/widget_inspector_test.dart @@ -996,7 +996,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService { ), ); - // Intitially the exit select button is on the left. + // Initially the exit select button is on the left. final Finder exitButton = buttonFinder('EXIT SELECT MODE'); expect(exitButton, findsOneWidget); final Finder moveRightButton = buttonFinder('MOVE RIGHT'); diff --git a/packages/flutter_driver/lib/src/common/screenshot.dart b/packages/flutter_driver/lib/src/common/screenshot.dart index 851c8514e2..0fc05328ab 100644 --- a/packages/flutter_driver/lib/src/common/screenshot.dart +++ b/packages/flutter_driver/lib/src/common/screenshot.dart @@ -58,7 +58,7 @@ class ScreenshotCommand extends Command { /// base64 encode a PNG class ScreenshotResult extends Result { - /// Consructs a screenshot result with PNG or raw RGBA byte data. + /// Constructs a screenshot result with PNG or raw RGBA byte data. ScreenshotResult(this._data); final Uint8List _data; diff --git a/packages/flutter_tools/lib/src/android/gradle_errors.dart b/packages/flutter_tools/lib/src/android/gradle_errors.dart index fa45117775..4402339975 100644 --- a/packages/flutter_tools/lib/src/android/gradle_errors.dart +++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart @@ -511,7 +511,7 @@ final RegExp _agpJavaError = RegExp(r'Android Gradle plugin requires Java (\d+\. // Android Gradle Plugin handles the error here: http://shortn/_SgUWyRdywL. // If we ever need to reference or check the thrown requirements, -// we can find the Java and Android Gradle Plugin compatability here: +// we can find the Java and Android Gradle Plugin compatibility here: // 'https://developer.android.com/build/releases/past-releases' @visibleForTesting final GradleHandledError incompatibleJavaAndAgpVersionsHandler= GradleHandledError( diff --git a/packages/flutter_tools/lib/src/compute_dev_dependencies.dart b/packages/flutter_tools/lib/src/compute_dev_dependencies.dart index a1305c53e4..a2bfcb8507 100644 --- a/packages/flutter_tools/lib/src/compute_dev_dependencies.dart +++ b/packages/flutter_tools/lib/src/compute_dev_dependencies.dart @@ -117,7 +117,7 @@ Future> computeExclusiveDevDependencies( // Remove any listed dependency from dev dependencies; it might have been // a dev dependency for the app (root) package, but it is being used as a - // real dependency for a dependend on package, so we would not want to send + // real dependency for a dependent on package, so we would not want to send // a signal that the package can be ignored/removed. devDependencies.removeAll(directDependencies); diff --git a/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart b/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart index 066cab28fd..fd96d0b82a 100644 --- a/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart +++ b/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart @@ -53,7 +53,7 @@ Future generateLocalizationsSyntheticPackage({ return; } } else if (featureFlags.isExplicitPackageDependenciesEnabled) { - // synthetic-packages: true was not set and it is no longer the defualt. + // synthetic-packages: true was not set and it is no longer the default. return; } diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart index c39de582ba..605f90e8cf 100644 --- a/packages/flutter_tools/lib/src/dart/pub.dart +++ b/packages/flutter_tools/lib/src/dart/pub.dart @@ -159,7 +159,7 @@ abstract class Pub { /// Runs, parses, and returns `pub deps --json` for [project]. /// - /// While it is guaranteed that, if succcessful, that the result are a valid + /// While it is guaranteed that, if successful, that the result are a valid /// JSON object, the exact contents returned are _not_ validated, and are left /// as a responsibility of the caller. Future> deps(FlutterProject project); diff --git a/packages/flutter_tools/lib/src/flutter_plugins.dart b/packages/flutter_tools/lib/src/flutter_plugins.dart index 478baf57cf..d95392c561 100644 --- a/packages/flutter_tools/lib/src/flutter_plugins.dart +++ b/packages/flutter_tools/lib/src/flutter_plugins.dart @@ -1372,7 +1372,7 @@ String? _validatePlugin(Plugin plugin, String platformKey, { if (_hasPluginInlineImpl(plugin, platformKey, pluginResolutionType: pluginResolutionType)) { return 'Plugin ${plugin.name}:$platformKey which provides an inline implementation ' 'cannot also reference a default implementation for $defaultImplPluginName. ' - 'Ask the maintainers of ${plugin.name} to either remove the implementation via `platforms: $platformKey:${pluginResolutionType == _PluginResolutionType.dart ? ' dartPluginClass' : '` `pluginClass` or `dartPLuginClass'}` ' + 'Ask the maintainers of ${plugin.name} to either remove the implementation via `platforms: $platformKey:${pluginResolutionType == _PluginResolutionType.dart ? ' dartPluginClass' : '` `pluginClass` or `dartPluginClass'}` ' 'or avoid referencing a default implementation via `platforms: $platformKey: default_package: $defaultImplPluginName`.\n'; } } diff --git a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart index 999e7e0dd4..57c9820479 100644 --- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart +++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart @@ -79,7 +79,7 @@ Future runFlutterSpecificDartBuild({ required Uri projectUri, required FileSystem fileSystem, }) async { - final OS targetOS = getNativeOSFromTargetPlatfrorm(targetPlatform); + final OS targetOS = getNativeOSFromTargetPlatform(targetPlatform); final Uri buildUri = nativeAssetsBuildUri(projectUri, targetOS); final Directory buildDir = fileSystem.directory(buildUri); @@ -120,7 +120,7 @@ Future installCodeAssets({ required FileSystem fileSystem, required Uri nativeAssetsFileUri, }) async { - final OS targetOS = getNativeOSFromTargetPlatfrorm(targetPlatform); + final OS targetOS = getNativeOSFromTargetPlatform(targetPlatform); final Uri buildUri = nativeAssetsBuildUri(projectUri, targetOS); final bool flutterTester = targetPlatform == build_info.TargetPlatform.tester; final build_info.BuildMode buildMode = _getBuildMode(environmentDefines, flutterTester); @@ -807,7 +807,7 @@ Never _throwNativeAssetsLinkFailed() { ); } -OS getNativeOSFromTargetPlatfrorm(build_info.TargetPlatform platform) { +OS getNativeOSFromTargetPlatform(build_info.TargetPlatform platform) { switch (platform) { case build_info.TargetPlatform.ios: return OS.iOS; diff --git a/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart b/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart index 431369ed1e..ea952d31bf 100644 --- a/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart +++ b/packages/flutter_tools/lib/src/isolated/native_assets/test/native_assets.dart @@ -54,7 +54,7 @@ Future testCompilerBuildNativeAssets(BuildInfo buildInfo) async { // Only `flutter test` uses the // `build/native_assets//native_assets.json` file which uses absolute // paths to the shared libraries. - final OS targetOS = getNativeOSFromTargetPlatfrorm(TargetPlatform.tester); + final OS targetOS = getNativeOSFromTargetPlatform(TargetPlatform.tester); final Uri buildUri = nativeAssetsBuildUri(projectUri, targetOS); final Uri nativeAssetsFileUri = buildUri.resolve('native_assets.json'); diff --git a/packages/flutter_tools/lib/src/macos/cocoapods.dart b/packages/flutter_tools/lib/src/macos/cocoapods.dart index 8bfd56bbac..fd7486fd28 100644 --- a/packages/flutter_tools/lib/src/macos/cocoapods.dart +++ b/packages/flutter_tools/lib/src/macos/cocoapods.dart @@ -503,7 +503,7 @@ class CocoaPods { } } } else if (stdout.contains('unknown ISA `PBXFileSystemSynchronizedRootGroup`')) { - // CocoaPods must be at least verison 1.16.2 to handle synchronized + // CocoaPods must be at least version 1.16.2 to handle synchronized // groups/folders https://github.com/CocoaPods/CocoaPods/issues/12456 _logger.printError( 'Error: Your Cocoapods might be out-of-date and unable to support synchronized groups/folders. ' diff --git a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart index 8e3942ea93..6da2be7d78 100644 --- a/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart +++ b/packages/flutter_tools/lib/src/migrations/swift_package_manager_integration_migration.dart @@ -51,22 +51,22 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { static const String _flutterPluginsSwiftPackageBuildFileIdentifier = '78A318202AECB46A00862997'; /// New identifier for FlutterGeneratedPluginSwiftPackage XCLocalSwiftPackageReference. - static const String _localFlutterPluginsSwiftPackageReferenceIdentifer = '781AD8BC2B33823900A9FFBB'; + static const String _localFlutterPluginsSwiftPackageReferenceIdentifier = '781AD8BC2B33823900A9FFBB'; /// New identifier for FlutterGeneratedPluginSwiftPackage XCSwiftPackageProductDependency. - static const String _flutterPluginsSwiftPackageProductDependencyIdentifer = '78A3181F2AECB46A00862997'; + static const String _flutterPluginsSwiftPackageProductDependencyIdentifier = '78A3181F2AECB46A00862997'; /// Existing iOS identifier for Runner PBXFrameworksBuildPhase. - static const String _iosRunnerFrameworksBuildPhaseIdentifer = '97C146EB1CF9000F007C117D'; + static const String _iosRunnerFrameworksBuildPhaseIdentifier = '97C146EB1CF9000F007C117D'; /// Existing macOS identifier for Runner PBXFrameworksBuildPhase. - static const String _macosRunnerFrameworksBuildPhaseIdentifer = '33CC10EA2044A3C60003C045'; + static const String _macosRunnerFrameworksBuildPhaseIdentifier = '33CC10EA2044A3C60003C045'; /// Existing iOS identifier for Runner PBXNativeTarget. - static const String _iosRunnerNativeTargetIdentifer = '97C146ED1CF9000F007C117D'; + static const String _iosRunnerNativeTargetIdentifier = '97C146ED1CF9000F007C117D'; /// Existing macOS identifier for Runner PBXNativeTarget. - static const String _macosRunnerNativeTargetIdentifer = '33CC10EC2044A3C60003C045'; + static const String _macosRunnerNativeTargetIdentifier = '33CC10EC2044A3C60003C045'; /// Existing iOS identifier for Runner PBXProject. static const String _iosProjectIdentifier = '97C146E61CF9000F007C117D'; @@ -78,16 +78,16 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { .directory(_xcodeProjectInfoFile.parent) .childFile('project.pbxproj.backup'); - String get _runnerFrameworksBuildPhaseIdentifer { + String get _runnerFrameworksBuildPhaseIdentifier { return _platform == SupportedPlatform.ios - ? _iosRunnerFrameworksBuildPhaseIdentifer - : _macosRunnerFrameworksBuildPhaseIdentifer; + ? _iosRunnerFrameworksBuildPhaseIdentifier + : _macosRunnerFrameworksBuildPhaseIdentifier; } - String get _runnerNativeTargetIdentifer { + String get _runnerNativeTargetIdentifier { return _platform == SupportedPlatform.ios - ? _iosRunnerNativeTargetIdentifer - : _macosRunnerNativeTargetIdentifer; + ? _iosRunnerNativeTargetIdentifier + : _macosRunnerNativeTargetIdentifier; } String get _projectIdentifier { @@ -255,7 +255,7 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { // final List schemeLines = LineSplitter.split(schemeContent).toList(); final int index = schemeLines.indexWhere((String line) => - line.contains('BlueprintIdentifier = "$_runnerNativeTargetIdentifer"'), + line.contains('BlueprintIdentifier = "$_runnerNativeTargetIdentifier"'), ); if (index == -1 || index + 3 >= schemeLines.length) { throw Exception( @@ -297,7 +297,7 @@ class SwiftPackageManagerIntegrationMigration extends ProjectMigrator { - phase.identifier == _runnerFrameworksBuildPhaseIdentifer && + phase.identifier == _runnerFrameworksBuildPhaseIdentifier && phase.files != null && phase.files!.contains(_flutterPluginsSwiftPackageBuildFileIdentifier)) .toList() @@ -493,7 +493,7 @@ $newContent // Find index where Frameworks Build Phase for the Runner target begins. final int runnerFrameworksPhaseStartIndex = lines.indexWhere( (String line) => line.trim().startsWith( - '$_runnerFrameworksBuildPhaseIdentifer /* Frameworks */ = {', + '$_runnerFrameworksBuildPhaseIdentifier /* Frameworks */ = {', ), startSectionIndex, ); @@ -509,7 +509,7 @@ $newContent final ParsedProjectFrameworksBuildPhase? runnerFrameworksPhase = projectInfo .frameworksBuildPhases .where((ParsedProjectFrameworksBuildPhase phase) => - phase.identifier == _runnerFrameworksBuildPhaseIdentifer) + phase.identifier == _runnerFrameworksBuildPhaseIdentifier) .toList() .firstOrNull; if (runnerFrameworksPhase == null) { @@ -550,10 +550,10 @@ $newContent }) { final bool migrated = projectInfo.nativeTargets .where((ParsedNativeTarget target) => - target.identifier == _runnerNativeTargetIdentifer && + target.identifier == _runnerNativeTargetIdentifier && target.packageProductDependencies != null && target.packageProductDependencies! - .contains(_flutterPluginsSwiftPackageProductDependencyIdentifer)) + .contains(_flutterPluginsSwiftPackageProductDependencyIdentifier)) .toList() .isNotEmpty; if (logErrorIfNotMigrated && !migrated) { @@ -576,7 +576,7 @@ $newContent // Find index where Native Target for the Runner target begins. final ParsedNativeTarget? runnerNativeTarget = projectInfo.nativeTargets .where((ParsedNativeTarget target) => - target.identifier == _runnerNativeTargetIdentifer) + target.identifier == _runnerNativeTargetIdentifier) .firstOrNull; if (runnerNativeTarget == null) { throw Exception( @@ -584,8 +584,8 @@ $newContent ); } final String subsectionLineStart = runnerNativeTarget.name != null - ? '$_runnerNativeTargetIdentifer /* ${runnerNativeTarget.name} */ = {' - : _runnerNativeTargetIdentifer; + ? '$_runnerNativeTargetIdentifier /* ${runnerNativeTarget.name} */ = {' + : _runnerNativeTargetIdentifier; final int runnerNativeTargetStartIndex = lines.indexWhere( (String line) => line.trim().startsWith(subsectionLineStart), startSectionIndex, @@ -601,7 +601,7 @@ $newContent // If packageProductDependencies is null, the packageProductDependencies field is missing and must be added. const List newContent = [ ' packageProductDependencies = (', - ' $_flutterPluginsSwiftPackageProductDependencyIdentifer /* FlutterGeneratedPluginSwiftPackage */,', + ' $_flutterPluginsSwiftPackageProductDependencyIdentifier /* FlutterGeneratedPluginSwiftPackage */,', ' );', ]; lines.insertAll(runnerNativeTargetStartIndex + 1, newContent); @@ -617,7 +617,7 @@ $newContent ); } const String newContent = - ' $_flutterPluginsSwiftPackageProductDependencyIdentifer /* FlutterGeneratedPluginSwiftPackage */,'; + ' $_flutterPluginsSwiftPackageProductDependencyIdentifier /* FlutterGeneratedPluginSwiftPackage */,'; lines.insert(packageProductDependenciesIndex + 1, newContent); } return lines; @@ -632,7 +632,7 @@ $newContent target.identifier == _projectIdentifier && target.packageReferences != null && target.packageReferences! - .contains(_localFlutterPluginsSwiftPackageReferenceIdentifer)) + .contains(_localFlutterPluginsSwiftPackageReferenceIdentifier)) .toList() .isNotEmpty; if (logErrorIfNotMigrated && !migrated) { @@ -681,7 +681,7 @@ $newContent // If packageReferences is null, the packageReferences field is missing and must be added. const List newContent = [ ' packageReferences = (', - ' $_localFlutterPluginsSwiftPackageReferenceIdentifer /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,', + ' $_localFlutterPluginsSwiftPackageReferenceIdentifier /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,', ' );', ]; lines.insertAll(projectStartIndex + 1, newContent); @@ -697,7 +697,7 @@ $newContent ); } const String newContent = - ' $_localFlutterPluginsSwiftPackageReferenceIdentifer /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,'; + ' $_localFlutterPluginsSwiftPackageReferenceIdentifier /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,'; lines.insert(packageReferencesIndex + 1, newContent); } return lines; @@ -708,7 +708,7 @@ $newContent bool logErrorIfNotMigrated = false, }) { final bool migrated = projectInfo.localSwiftPackageProductDependencies - .contains(_localFlutterPluginsSwiftPackageReferenceIdentifer); + .contains(_localFlutterPluginsSwiftPackageReferenceIdentifier); if (logErrorIfNotMigrated && !migrated) { logger.printError('XCLocalSwiftPackageReference was not migrated or was migrated incorrectly.'); } @@ -734,7 +734,7 @@ $newContent // There isn't a XCLocalSwiftPackageReference section yet, so add it final List newContent = [ '/* Begin XCLocalSwiftPackageReference section */', - ' $_localFlutterPluginsSwiftPackageReferenceIdentifer /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {', + ' $_localFlutterPluginsSwiftPackageReferenceIdentifier /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {', ' isa = XCLocalSwiftPackageReference;', ' relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;', ' };', @@ -752,7 +752,7 @@ $newContent } final List newContent = [ - ' $_localFlutterPluginsSwiftPackageReferenceIdentifer /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {', + ' $_localFlutterPluginsSwiftPackageReferenceIdentifier /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {', ' isa = XCLocalSwiftPackageReference;', ' relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;', ' };', @@ -768,7 +768,7 @@ $newContent bool logErrorIfNotMigrated = false, }) { final bool migrated = projectInfo.swiftPackageProductDependencies - .contains(_flutterPluginsSwiftPackageProductDependencyIdentifer); + .contains(_flutterPluginsSwiftPackageProductDependencyIdentifier); if (logErrorIfNotMigrated && !migrated) { logger.printError('XCSwiftPackageProductDependency was not migrated or was migrated incorrectly.'); } @@ -794,7 +794,7 @@ $newContent // There isn't a XCSwiftPackageProductDependency section yet, so add it final List newContent = [ '/* Begin XCSwiftPackageProductDependency section */', - ' $_flutterPluginsSwiftPackageProductDependencyIdentifer /* FlutterGeneratedPluginSwiftPackage */ = {', + ' $_flutterPluginsSwiftPackageProductDependencyIdentifier /* FlutterGeneratedPluginSwiftPackage */ = {', ' isa = XCSwiftPackageProductDependency;', ' productName = FlutterGeneratedPluginSwiftPackage;', ' };', @@ -812,7 +812,7 @@ $newContent } final List newContent = [ - ' $_flutterPluginsSwiftPackageProductDependencyIdentifer /* FlutterGeneratedPluginSwiftPackage */ = {', + ' $_flutterPluginsSwiftPackageProductDependencyIdentifier /* FlutterGeneratedPluginSwiftPackage */ = {', ' isa = XCSwiftPackageProductDependency;', ' productName = FlutterGeneratedPluginSwiftPackage;', ' };', diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 1b392042a9..c28cfe5be6 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart @@ -875,7 +875,7 @@ $javaGradleCompatUrl } for (final XmlElement metaData in document.findAllElements('meta-data')) { final String? name = metaData.getAttribute('android:name'); - // External code checks for this string to indentify flutter android apps. + // External code checks for this string to identify flutter android apps. // See cl/667760684 as an example. if (name == 'flutterEmbedding') { final String? embeddingVersionString = metaData.getAttribute('android:value'); diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart index 8074c58d82..9536def2cd 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart @@ -113,7 +113,7 @@ void main() { String configuration, { bool verbose = false, void Function(List command)? onRun, - List? additionalCommandArguements, + List? additionalCommandArguments, }) { final FlutterProject flutterProject = FlutterProject.fromDirectory(fileSystem.currentDirectory); final Directory flutterBuildDir = fileSystem.directory(getMacOSBuildDirectory()); @@ -134,8 +134,8 @@ void main() { else '-quiet', 'COMPILER_INDEX_STORE_ENABLE=NO', - if (additionalCommandArguements != null) - ...additionalCommandArguements, + if (additionalCommandArguments != null) + ...additionalCommandArguments, ], stdout: ''' STDOUT STUFF @@ -769,7 +769,7 @@ STDERR STUFF ProcessManager: () => FakeProcessManager.list([ setUpFakeXcodeBuildHandler( 'Debug', - additionalCommandArguements: [ + additionalCommandArguments: [ 'CODE_SIGN_ENTITLEMENTS=/.tmp_rand0/flutter_disable_sandbox_entitlement.rand0/DebugProfileWithDisabledSandboxing.entitlements', ], ), @@ -838,7 +838,7 @@ STDERR STUFF ProcessManager: () => FakeProcessManager.list([ setUpFakeXcodeBuildHandler( 'Release', - additionalCommandArguements: [ + additionalCommandArguments: [ 'CODE_SIGN_ENTITLEMENTS=/.tmp_rand0/flutter_disable_sandbox_entitlement.rand0/ReleaseWithDisabledSandboxing.entitlements', ], ), diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart index 468f3d5d0b..7291d6ae07 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart @@ -300,7 +300,7 @@ void main() { group('Impeller AndroidManifest.xml setting', () { // Adds a key-value `` pair to the `` tag in the - // cooresponding `AndroidManifest.xml` file, right before the closing + // corresponding `AndroidManifest.xml` file, right before the closing // `` tag. void writeManifestMetadata({ required String projectPath, diff --git a/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart b/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart index f9dec39e0b..59da47d779 100644 --- a/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart +++ b/packages/flutter_tools/test/general.shard/compute_dev_dependencies_test.dart @@ -25,7 +25,7 @@ const String _dartBin = 'bin/cache/dart-sdk/bin/dart'; // pubspec.yaml // /package_a // pubspec.yaml -// /pacakge_b +// /package_b // pubspec.yaml // /package_c // pubspec.yaml diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart index bdf4503305..a11fd8e230 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart @@ -683,7 +683,7 @@ exit code: 66 logger.warningText, contains('git remote set-url upstream'), reason: - 'When update-packages fails, it is often because of missing an upsteam remote.', + 'When update-packages fails, it is often because of missing an upstream remote.', ); expect(processManager, hasNoRemainingExpectations); }); diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart index 7c5d1d0c34..be1cdd3937 100644 --- a/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/ios_device_start_nonprebuilt_test.dart @@ -403,7 +403,7 @@ void main() { expect(processManager, hasNoRemainingExpectations); }))); - // Wait until all asyncronous time has been elapsed. + // Wait until all asynchronous time has been elapsed. do { fakeAsync.elapse(const Duration(seconds: 2)); } while (fakeAsync.pendingTimers.isNotEmpty); diff --git a/packages/flutter_tools/test/general.shard/isolated/build_system/targets/native_assets_test.dart b/packages/flutter_tools/test/general.shard/isolated/build_system/targets/native_assets_test.dart index c4312cc8c0..f368726fbb 100644 --- a/packages/flutter_tools/test/general.shard/isolated/build_system/targets/native_assets_test.dart +++ b/packages/flutter_tools/test/general.shard/isolated/build_system/targets/native_assets_test.dart @@ -157,7 +157,7 @@ void main() { '@rpath/libfoo.dylib', ].join('\n'), ), - // Change the instal name of the binary itself and of its dependencies. + // Change the install name of the binary itself and of its dependencies. // We pass the old to new install name mappings of all native assets dylibs, // even for the dylib that is being updated, since the `-change` option // is ignored if the dylib does not depend on the target dylib. diff --git a/packages/flutter_tools/test/general.shard/migrations/swift_package_manager_integration_migration_test.dart b/packages/flutter_tools/test/general.shard/migrations/swift_package_manager_integration_migration_test.dart index ed602c4451..096e7619e5 100644 --- a/packages/flutter_tools/test/general.shard/migrations/swift_package_manager_integration_migration_test.dart +++ b/packages/flutter_tools/test/general.shard/migrations/swift_package_manager_integration_migration_test.dart @@ -353,7 +353,7 @@ void main() { project.xcodeProjectSchemeFile().writeAsStringSync(''' @@ -389,7 +389,7 @@ void main() { project.xcodeProjectSchemeFile().writeAsStringSync(''' @@ -425,7 +425,7 @@ void main() { project.xcodeProjectSchemeFile().writeAsStringSync(''' @@ -1051,7 +1051,7 @@ void main() { /* Begin PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */ /* Begin NonExistant section */ - ${_runnerFrameworksBuildPhaseIdentifer(platform)} /* Frameworks */ = { + ${_runnerFrameworksBuildPhaseIdentifier(platform)} /* Frameworks */ = { }; /* End NonExistant section */ '''; @@ -1436,7 +1436,7 @@ void main() { /* Begin PBXNativeTarget section */ /* End PBXNativeTarget section */ /* Begin NonExistant section */ - ${_runnerNativeTargetIdentifer(platform)} /* Runner */ = { + ${_runnerNativeTargetIdentifier(platform)} /* Runner */ = { }; /* End NonExistant section */ '''; @@ -2565,7 +2565,7 @@ String _validBuildActions( @@ -2601,7 +2601,7 @@ String _validBuildableReference(SupportedPlatform platform) { return ''' @@ -2677,13 +2677,13 @@ ${objects.join('\n')} '''; } -String _runnerFrameworksBuildPhaseIdentifer(SupportedPlatform platform) { +String _runnerFrameworksBuildPhaseIdentifier(SupportedPlatform platform) { return platform == SupportedPlatform.ios ? '97C146EB1CF9000F007C117D' : '33CC10EA2044A3C60003C045'; } -String _runnerNativeTargetIdentifer(SupportedPlatform platform) { +String _runnerNativeTargetIdentifier(SupportedPlatform platform) { return platform == SupportedPlatform.ios ? '97C146ED1CF9000F007C117D' : '33CC10EC2044A3C60003C045'; @@ -2740,7 +2740,7 @@ String unmigratedFrameworksBuildPhaseSection( }) { return [ '/* Begin PBXFrameworksBuildPhase section */', - ' ${_runnerFrameworksBuildPhaseIdentifer(platform)} /* Frameworks */ = {', + ' ${_runnerFrameworksBuildPhaseIdentifier(platform)} /* Frameworks */ = {', ' isa = PBXFrameworksBuildPhase;', ' buildActionMask = 2147483647;', if (!missingFiles) ...[ @@ -2769,7 +2769,7 @@ String migratedFrameworksBuildPhaseSection( ]; return [ '/* Begin PBXFrameworksBuildPhase section */', - ' ${_runnerFrameworksBuildPhaseIdentifer(platform)} /* Frameworks */ = {', + ' ${_runnerFrameworksBuildPhaseIdentifier(platform)} /* Frameworks */ = {', if (missingFiles) ...filesField, ' isa = PBXFrameworksBuildPhase;', ' buildActionMask = 2147483647;', @@ -2786,7 +2786,7 @@ String unmigratedFrameworksBuildPhaseSectionAsJson( bool missingFiles = false, }) { return [ - ' "${_runnerFrameworksBuildPhaseIdentifer(platform)}" : {', + ' "${_runnerFrameworksBuildPhaseIdentifier(platform)}" : {', ' "buildActionMask" : "2147483647",', if (!missingFiles) ...[ ' "files" : [', @@ -2801,7 +2801,7 @@ String unmigratedFrameworksBuildPhaseSectionAsJson( String migratedFrameworksBuildPhaseSectionAsJson(SupportedPlatform platform) { return ''' - "${_runnerFrameworksBuildPhaseIdentifer(platform)}" : { + "${_runnerFrameworksBuildPhaseIdentifier(platform)}" : { "buildActionMask" : "2147483647", "files" : [ "78A318202AECB46A00862997" @@ -2819,13 +2819,13 @@ String unmigratedNativeTargetSection( }) { return [ '/* Begin PBXNativeTarget section */', - ' ${_runnerNativeTargetIdentifer(platform)} /* Runner */ = {', + ' ${_runnerNativeTargetIdentifier(platform)} /* Runner */ = {', ' isa = PBXNativeTarget;', ' buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;', ' buildPhases = (', ' 9740EEB61CF901F6004384FC /* Run Script */,', ' 97C146EA1CF9000F007C117D /* Sources */,', - ' ${_runnerFrameworksBuildPhaseIdentifer(platform)} /* Frameworks */,', + ' ${_runnerFrameworksBuildPhaseIdentifier(platform)} /* Frameworks */,', ' 97C146EC1CF9000F007C117D /* Resources */,', ' 9705A1C41CF9048500538489 /* Embed Frameworks */,', ' 3B06AD1E1E4923F5004D2608 /* Thin Binary */,', @@ -2863,14 +2863,14 @@ String migratedNativeTargetSection( ]; return [ '/* Begin PBXNativeTarget section */', - ' ${_runnerNativeTargetIdentifer(platform)} /* Runner */ = {', + ' ${_runnerNativeTargetIdentifier(platform)} /* Runner */ = {', if (missingPackageProductDependencies) ...packageDependencies, ' isa = PBXNativeTarget;', ' buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;', ' buildPhases = (', ' 9740EEB61CF901F6004384FC /* Run Script */,', ' 97C146EA1CF9000F007C117D /* Sources */,', - ' ${_runnerFrameworksBuildPhaseIdentifer(platform)} /* Frameworks */,', + ' ${_runnerFrameworksBuildPhaseIdentifier(platform)} /* Frameworks */,', ' 97C146EC1CF9000F007C117D /* Resources */,', ' 9705A1C41CF9048500538489 /* Embed Frameworks */,', ' 3B06AD1E1E4923F5004D2608 /* Thin Binary */,', @@ -2894,12 +2894,12 @@ String unmigratedNativeTargetSectionAsJson( bool missingPackageProductDependencies = false, }) { return [ - ' "${_runnerNativeTargetIdentifer(platform)}" : {', + ' "${_runnerNativeTargetIdentifier(platform)}" : {', ' "buildConfigurationList" : "97C147051CF9000F007C117D",', ' "buildPhases" : [', ' "9740EEB61CF901F6004384FC",', ' "97C146EA1CF9000F007C117D",', - ' "${_runnerFrameworksBuildPhaseIdentifer(platform)}",', + ' "${_runnerFrameworksBuildPhaseIdentifier(platform)}",', ' "97C146EC1CF9000F007C117D",', ' "9705A1C41CF9048500538489",', ' "3B06AD1E1E4923F5004D2608"', @@ -2923,12 +2923,12 @@ String unmigratedNativeTargetSectionAsJson( String migratedNativeTargetSectionAsJson(SupportedPlatform platform) { return ''' - "${_runnerNativeTargetIdentifer(platform)}" : { + "${_runnerNativeTargetIdentifier(platform)}" : { "buildConfigurationList" : "97C147051CF9000F007C117D", "buildPhases" : [ "9740EEB61CF901F6004384FC", "97C146EA1CF9000F007C117D", - "${_runnerFrameworksBuildPhaseIdentifer(platform)}", + "${_runnerFrameworksBuildPhaseIdentifier(platform)}", "97C146EC1CF9000F007C117D", "9705A1C41CF9048500538489", "3B06AD1E1E4923F5004D2608" @@ -2967,9 +2967,9 @@ String unmigratedProjectSection( ' TargetAttributes = {', ' 331C8080294A63A400263BE5 = {', ' CreatedOnToolsVersion = 14.0;', - ' TestTargetID = ${_runnerNativeTargetIdentifer(platform)};', + ' TestTargetID = ${_runnerNativeTargetIdentifier(platform)};', ' };', - ' ${_runnerNativeTargetIdentifer(platform)} = {', + ' ${_runnerNativeTargetIdentifier(platform)} = {', ' CreatedOnToolsVersion = 7.3.1;', ' LastSwiftMigration = 1100;', ' };', @@ -2994,7 +2994,7 @@ String unmigratedProjectSection( ' projectDirPath = "";', ' projectRoot = "";', ' targets = (', - ' ${_runnerNativeTargetIdentifer(platform)} /* Runner */,', + ' ${_runnerNativeTargetIdentifier(platform)} /* Runner */,', ' 331C8080294A63A400263BE5 /* RunnerTests */,', ' );', ' };', @@ -3026,9 +3026,9 @@ String migratedProjectSection( ' TargetAttributes = {', ' 331C8080294A63A400263BE5 = {', ' CreatedOnToolsVersion = 14.0;', - ' TestTargetID = ${_runnerNativeTargetIdentifer(platform)};', + ' TestTargetID = ${_runnerNativeTargetIdentifier(platform)};', ' };', - ' ${_runnerNativeTargetIdentifer(platform)} = {', + ' ${_runnerNativeTargetIdentifier(platform)} = {', ' CreatedOnToolsVersion = 7.3.1;', ' LastSwiftMigration = 1100;', ' };', @@ -3048,7 +3048,7 @@ String migratedProjectSection( ' projectDirPath = "";', ' projectRoot = "";', ' targets = (', - ' ${_runnerNativeTargetIdentifer(platform)} /* Runner */,', + ' ${_runnerNativeTargetIdentifier(platform)} /* Runner */,', ' 331C8080294A63A400263BE5 /* RunnerTests */,', ' );', ' };', @@ -3067,13 +3067,13 @@ String unmigratedProjectSectionAsJson( ' "LastUpgradeCheck" : "1510",', ' "ORGANIZATIONNAME" : "",', ' "TargetAttributes" : {', - ' "${_runnerNativeTargetIdentifer(platform)}" : {', + ' "${_runnerNativeTargetIdentifier(platform)}" : {', ' "CreatedOnToolsVersion" : "7.3.1",', ' "LastSwiftMigration" : "1100"', ' },', ' "331C8080294A63A400263BE5" : {', ' "CreatedOnToolsVersion" : "14.0",', - ' "TestTargetID" : "${_runnerNativeTargetIdentifer(platform)}"', + ' "TestTargetID" : "${_runnerNativeTargetIdentifier(platform)}"', ' }', ' }', ' },', @@ -3095,7 +3095,7 @@ String unmigratedProjectSectionAsJson( ' "projectDirPath" : "",', ' "projectRoot" : "",', ' "targets" : [', - ' "${_runnerNativeTargetIdentifer(platform)}",', + ' "${_runnerNativeTargetIdentifier(platform)}",', ' "331C8080294A63A400263BE5"', ' ]', ' }', @@ -3110,13 +3110,13 @@ String migratedProjectSectionAsJson(SupportedPlatform platform) { "LastUpgradeCheck" : "1510", "ORGANIZATIONNAME" : "", "TargetAttributes" : { - "${_runnerNativeTargetIdentifer(platform)}" : { + "${_runnerNativeTargetIdentifier(platform)}" : { "CreatedOnToolsVersion" : "7.3.1", "LastSwiftMigration" : "1100" }, "331C8080294A63A400263BE5" : { "CreatedOnToolsVersion" : "14.0", - "TestTargetID" : "${_runnerNativeTargetIdentifer(platform)}" + "TestTargetID" : "${_runnerNativeTargetIdentifier(platform)}" } } }, @@ -3137,7 +3137,7 @@ String migratedProjectSectionAsJson(SupportedPlatform platform) { "projectDirPath" : "", "projectRoot" : "", "targets" : [ - "${_runnerNativeTargetIdentifer(platform)}", + "${_runnerNativeTargetIdentifier(platform)}", "331C8080294A63A400263BE5" ] }'''; diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart index 89e768bb57..9a70b0a866 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart @@ -206,7 +206,7 @@ dependencies: /// Project that load's a plugin from the specified path. class PluginWithPathAndroidProjectWithoutDeferred extends PluginProject { // Intentionally omit; this test case has nothing to do with deferred - // components and a DefererdComponentsConfig will cause duplicates of files + // components and a DeferredComponentsConfig will cause duplicates of files // such as build.gradle{.kts}, settings.gradle{kts} and related to be // generated, which in turn adds ambiguity to how the tests are built and // executed. diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart index 09edb56372..a2697101fc 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart @@ -467,7 +467,7 @@ void expectCCompilerIsConfigured(Directory appDirectory) { for (final Directory subDir in nativeAssetsBuilderDir.listSync().whereType()) { // We only want to look at build/link hook invocation directories. The // `/shared/*` directory allows the individual hooks to store data that is - // reusable across different build/link confiurations. + // reusable across different build/link configurations. if (subDir.path.endsWith('shared')) { continue; } diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart index 6f4eb12700..e4c9871813 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart @@ -25,7 +25,7 @@ import 'native_assets_test_utils.dart'; /// combinations that could trigger this error. /// /// The version of `native_assets_cli` is derived from the template used by -/// `flutter create --type=pacakges_ffi`. See +/// `flutter create --type=packages_ffi`. See /// [_getPackageFfiTemplatePubspecVersion]. void main() { if (!platform.isMacOS && !platform.isLinux && !platform.isWindows) {