Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rename _*Marker classes to be _*Scope, for consistency #118070

Merged
merged 3 commits into from Jan 17, 2023

Conversation

gspencergoog
Copy link
Contributor

Description

In #118004 (comment), @goderbauer pointed out that there are more instances of calling these private inherited widgets with the suffix "Scope" than with "Marker". This PR renames the "Marker" ones to be called "Scope"s.

The only controversial name is the one that used to be called _FocusMarker, since that would then be _FocusScope, which is pretty confusing (and the reason I used Marker in the first place), so I renamed that one to be _FocusInheritedScope to make it clear that it's not closely related to FocusScope or FocusScopeNode.

Tests

  • Just a refactor with no semantic change.

@flutter-dashboard flutter-dashboard bot added f: focus Focus traversal, gaining or losing focus f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. labels Jan 6, 2023
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Copy link
Member

@goderbauer goderbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gspencergoog gspencergoog added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 17, 2023
@auto-submit auto-submit bot merged commit ae7b99e into flutter:master Jan 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 17, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jan 18, 2023
auto-submit bot pushed a commit to flutter/plugins that referenced this pull request Jan 18, 2023
* a3629a2 Roll Plugins from 92a5367 to 4e5cf2d (8 revisions) (flutter/flutter#118624)

* ae7b99e Rename `_*Marker` classes to be `_*Scope`, for consistency (flutter/flutter#118070)

* 6fafbc3 Updated tokens to v0.152 (flutter/flutter#118594)

* 4b3cf9b Add reference to HardwareKeyboard in RawKeyboard documentation (flutter/flutter#118607)

* 0449030 Disable Xcode cache cleanup (flutter/flutter#118641)

* f989d55 Devicelab android emulator (flutter/flutter#113472)

* 0eaa83a Fix some Focus related documentation typos (flutter/flutter#118576)

* 780563c Add const constructor to TextInputFormatter (flutter/flutter#116654)

* 973cff4 [Re-land] Button padding m3 (flutter/flutter#118640)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 18, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 19, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 19, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 19, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 19, 2023
gspencergoog added a commit to gspencergoog/flutter that referenced this pull request Jan 19, 2023
…18070)

* Rename _*Marker classes to be _*Scope, for consistency

* [EMPTY] Commit to refresh the tree that is currently red (flutter#118062)

* Fix remaining tests

Co-authored-by: Drew Roen <102626803+drewroengoogle@users.noreply.github.com>
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 20, 2023
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 20, 2023
* da5f8cf90 Roll Flutter Engine from a512cebdcd30 to 7dc5e7efa66a (2 revisions) (flutter/flutter#118505)

* baefeccbe 35479aa1c Roll Fuchsia Mac SDK from 21nYb648VWbpxc36t... to w0hr1ZMvYGJnWInwK... (flutter/engine#38880) (flutter/flutter#118509)

* ca300ce57 25cb82272 Add include to make g3 happy (flutter/engine#38850) (flutter/flutter#118510)

* 1220245b3 f79030440 Roll Skia from c72c7bf7e45b to c64a10d525d1 (7 revisions) (flutter/engine#38858) (flutter/flutter#118511)

* 7188c3e62 Update documentation about accent color (flutter/flutter#116778)

* 8c2fdb803 M3 Button padding adjustments (flutter/flutter#118449)

* f22280a0c Revert "M3 Button padding adjustments (#118449)" (flutter/flutter#118598)

* cc7845e71 Post a ToolEvent when selecting widget for inspection (flutter/flutter#118098)

* a3629a223 Roll Plugins from 92a5367 to 4e5cf2d (8 revisions) (flutter/flutter#118624)

* ae7b99efb Rename `_*Marker` classes to be `_*Scope`, for consistency (flutter/flutter#118070)

* 6fafbc33f Updated tokens to v0.152 (flutter/flutter#118594)

* 4b3cf9bbd Add reference to HardwareKeyboard in RawKeyboard documentation (flutter/flutter#118607)

* 0449030a9 Disable Xcode cache cleanup (flutter/flutter#118641)

* f989d551c Devicelab android emulator (flutter/flutter#113472)

* 0eaa83ad6 Fix some Focus related documentation typos (flutter/flutter#118576)

* 780563ce0 Add const constructor to TextInputFormatter (flutter/flutter#116654)

* 973cff40b [Re-land] Button padding m3 (flutter/flutter#118640)

* 334898754 Add new macos target configured for flavors (flutter/flutter#117352)

* 627752064 Roll Plugins from 4e5cf2d to 11361d0 (4 revisions) (flutter/flutter#118682)

* 997d43618 Fix applyBoxFit's handling of fitWidth and fitHeight. (flutter/flutter#117185)

* 8a58ec5c3 Roll Flutter Engine from f79030440948 to c52b290813bd (29 revisions) (flutter/flutter#118720)

* 374f09e1a [flutter_tools] No more implicit --no-sound-null-safety (flutter/flutter#118491)

* ae1cc18c4 remove single-view assumption from `paintImage` (flutter/flutter#118721)

* bb8b96a5d Fix path for require.js (flutter/flutter#118722)

* c83a69855 update uikit view documentation (flutter/flutter#118715)

* 2b3ca0dc4 Bump github/codeql-action from 2.1.38 to 2.1.39 (flutter/flutter#118735)

* 666dccc85 [macOS] bringup new e2e_summary devicelab test (flutter/flutter#118717)

* d07b88e4c Docs fix an=>a (flutter/flutter#118652)

* 11d21e066 Add @pragma('vm:entry-point') to RestorableRouteBuilder arguments (flutter/flutter#118738)

* 7d9eaab01 Appbar iconTheme override fix (flutter/flutter#118681)

* 6f708305d Roll Flutter Engine from c52b290813bd to 290636c1cb6b (2 revisions) (flutter/flutter#118743)

* b3059d2c0 Bump activesupport from 6.1.5 to 6.1.7.1 in /dev/ci/mac (flutter/flutter#118745)

* ffcf63ae8 Add verbose flag to plugin_dependencies_test to debug flake (flutter/flutter#118755)

* 2609212ca 2a11023c7 [ios_platform_view] more precision when determine if a clip rrect is necessary (flutter/engine#38965) (flutter/flutter#118751)

* 21fb443a3 8ed6790b5 Bump chrome_and_driver version to 110. (flutter/engine#38986) (flutter/flutter#118758)

* e5c9d065f Forgot to remove emulator flag. (flutter/flutter#118762)

* 6a9b2db4a 95b0c151f Roll Dart SDK from 645fd748e79e to ddf70a598f27 (14 revisions) (flutter/engine#38990) (flutter/flutter#118763)

* 0bbb5ec0c 40f7f0f09 Roll Fuchsia Mac SDK from P5QcCJU8I71xVXuMT... to tlYMsnCv86Fjt5LfF... (flutter/engine#38994) (flutter/flutter#118771)

* d53cc4a10 [macOS] New e2e_summary benchmark fails without Cocoapods. (flutter/flutter#118754)

* 3e71e0caf Updated `ListTile` documentation, add Material 3 example and other `ListTile` examples fixes. (flutter/flutter#118705)

* 213b3cb3d Check whether slider is mounted before interaction, no-op if unmounted (flutter/flutter#113556)

* 06909ccfa Update packages + fix tests for javascript mime change (flutter/flutter#118617)

* 46c7fd14d 88e61d8bd Remove references to Observatory (flutter/engine#38919) (flutter/flutter#118793)

* b9ab64049 Remove incorrect statement in documentation (flutter/flutter#118636)

* ea36b3a5a Add focus detector to CupertinoSwitch (flutter/flutter#118345)

* 9b5ea30a9 Switching over from iOS-15 to iOS-16 in .ci.yaml. (flutter/flutter#118807)

* 67ffaef25 29a0582a1 Roll Fuchsia Mac SDK from tlYMsnCv86Fjt5LfF... to 6oiZwMyNsjucSxTHJ... (flutter/engine#39004) (flutter/flutter#118817)

* 5cd2d4c61 Support iOS wireless debugging (flutter/flutter#118104)

* cbf2e1689 Revert "Support iOS wireless debugging (#118104)" (flutter/flutter#118826)

* 2258590a8 Do not run Mac_arm64_ios run_debug_test_macos in presubmit during iPhone 11 migration (flutter/flutter#118828)

* 1dd7f45bf Add `build macos --config-only` option. (flutter/flutter#118649)

* 22520f54d [macOS] Add timeline summary benchmarks (flutter/flutter#118748)

* 99e4ca50c Roll Flutter Engine from 29a0582a1d5f to 78bbea005d27 (2 revisions) (flutter/flutter#118829)

* c5ceff11d [flutter_tools] Ensure service worker starts caching assets since first load  (flutter/flutter#116833)

* 818bb4e65 Roll Flutter Engine from 78bbea005d27 to 26b6609c603b (3 revisions) (flutter/flutter#118839)

* 09bd0f661 Support logging 'flutter run' communication to DAP clients (flutter/flutter#118674)

* 73096fd96 [macos] add flavor options to commands in the `flutter_tool` (flutter/flutter#118421)
mauricioluz pushed a commit to mauricioluz/plugins that referenced this pull request Jan 26, 2023
* a3629a2 Roll Plugins from 92a5367 to 4e5cf2d (8 revisions) (flutter/flutter#118624)

* ae7b99e Rename `_*Marker` classes to be `_*Scope`, for consistency (flutter/flutter#118070)

* 6fafbc3 Updated tokens to v0.152 (flutter/flutter#118594)

* 4b3cf9b Add reference to HardwareKeyboard in RawKeyboard documentation (flutter/flutter#118607)

* 0449030 Disable Xcode cache cleanup (flutter/flutter#118641)

* f989d55 Devicelab android emulator (flutter/flutter#113472)

* 0eaa83a Fix some Focus related documentation typos (flutter/flutter#118576)

* 780563c Add const constructor to TextInputFormatter (flutter/flutter#116654)

* 973cff4 [Re-land] Button padding m3 (flutter/flutter#118640)
Maatteogekko pushed a commit to Maatteogekko/packages that referenced this pull request Feb 4, 2023
…r#3073)

* da5f8cf90 Roll Flutter Engine from a512cebdcd30 to 7dc5e7efa66a (2 revisions) (flutter/flutter#118505)

* baefeccbe 35479aa1c Roll Fuchsia Mac SDK from 21nYb648VWbpxc36t... to w0hr1ZMvYGJnWInwK... (flutter/engine#38880) (flutter/flutter#118509)

* ca300ce57 25cb82272 Add include to make g3 happy (flutter/engine#38850) (flutter/flutter#118510)

* 1220245b3 f79030440 Roll Skia from c72c7bf7e45b to c64a10d525d1 (7 revisions) (flutter/engine#38858) (flutter/flutter#118511)

* 7188c3e62 Update documentation about accent color (flutter/flutter#116778)

* 8c2fdb803 M3 Button padding adjustments (flutter/flutter#118449)

* f22280a0c Revert "M3 Button padding adjustments (#118449)" (flutter/flutter#118598)

* cc7845e71 Post a ToolEvent when selecting widget for inspection (flutter/flutter#118098)

* a3629a223 Roll Plugins from 92a5367 to 4e5cf2d (8 revisions) (flutter/flutter#118624)

* ae7b99efb Rename `_*Marker` classes to be `_*Scope`, for consistency (flutter/flutter#118070)

* 6fafbc33f Updated tokens to v0.152 (flutter/flutter#118594)

* 4b3cf9bbd Add reference to HardwareKeyboard in RawKeyboard documentation (flutter/flutter#118607)

* 0449030a9 Disable Xcode cache cleanup (flutter/flutter#118641)

* f989d551c Devicelab android emulator (flutter/flutter#113472)

* 0eaa83ad6 Fix some Focus related documentation typos (flutter/flutter#118576)

* 780563ce0 Add const constructor to TextInputFormatter (flutter/flutter#116654)

* 973cff40b [Re-land] Button padding m3 (flutter/flutter#118640)

* 334898754 Add new macos target configured for flavors (flutter/flutter#117352)

* 627752064 Roll Plugins from 4e5cf2d to 11361d0 (4 revisions) (flutter/flutter#118682)

* 997d43618 Fix applyBoxFit's handling of fitWidth and fitHeight. (flutter/flutter#117185)

* 8a58ec5c3 Roll Flutter Engine from f79030440948 to c52b290813bd (29 revisions) (flutter/flutter#118720)

* 374f09e1a [flutter_tools] No more implicit --no-sound-null-safety (flutter/flutter#118491)

* ae1cc18c4 remove single-view assumption from `paintImage` (flutter/flutter#118721)

* bb8b96a5d Fix path for require.js (flutter/flutter#118722)

* c83a69855 update uikit view documentation (flutter/flutter#118715)

* 2b3ca0dc4 Bump github/codeql-action from 2.1.38 to 2.1.39 (flutter/flutter#118735)

* 666dccc85 [macOS] bringup new e2e_summary devicelab test (flutter/flutter#118717)

* d07b88e4c Docs fix an=>a (flutter/flutter#118652)

* 11d21e066 Add @pragma('vm:entry-point') to RestorableRouteBuilder arguments (flutter/flutter#118738)

* 7d9eaab01 Appbar iconTheme override fix (flutter/flutter#118681)

* 6f708305d Roll Flutter Engine from c52b290813bd to 290636c1cb6b (2 revisions) (flutter/flutter#118743)

* b3059d2c0 Bump activesupport from 6.1.5 to 6.1.7.1 in /dev/ci/mac (flutter/flutter#118745)

* ffcf63ae8 Add verbose flag to plugin_dependencies_test to debug flake (flutter/flutter#118755)

* 2609212ca 2a11023c7 [ios_platform_view] more precision when determine if a clip rrect is necessary (flutter/engine#38965) (flutter/flutter#118751)

* 21fb443a3 8ed6790b5 Bump chrome_and_driver version to 110. (flutter/engine#38986) (flutter/flutter#118758)

* e5c9d065f Forgot to remove emulator flag. (flutter/flutter#118762)

* 6a9b2db4a 95b0c151f Roll Dart SDK from 645fd748e79e to ddf70a598f27 (14 revisions) (flutter/engine#38990) (flutter/flutter#118763)

* 0bbb5ec0c 40f7f0f09 Roll Fuchsia Mac SDK from P5QcCJU8I71xVXuMT... to tlYMsnCv86Fjt5LfF... (flutter/engine#38994) (flutter/flutter#118771)

* d53cc4a10 [macOS] New e2e_summary benchmark fails without Cocoapods. (flutter/flutter#118754)

* 3e71e0caf Updated `ListTile` documentation, add Material 3 example and other `ListTile` examples fixes. (flutter/flutter#118705)

* 213b3cb3d Check whether slider is mounted before interaction, no-op if unmounted (flutter/flutter#113556)

* 06909ccfa Update packages + fix tests for javascript mime change (flutter/flutter#118617)

* 46c7fd14d 88e61d8bd Remove references to Observatory (flutter/engine#38919) (flutter/flutter#118793)

* b9ab64049 Remove incorrect statement in documentation (flutter/flutter#118636)

* ea36b3a5a Add focus detector to CupertinoSwitch (flutter/flutter#118345)

* 9b5ea30a9 Switching over from iOS-15 to iOS-16 in .ci.yaml. (flutter/flutter#118807)

* 67ffaef25 29a0582a1 Roll Fuchsia Mac SDK from tlYMsnCv86Fjt5LfF... to 6oiZwMyNsjucSxTHJ... (flutter/engine#39004) (flutter/flutter#118817)

* 5cd2d4c61 Support iOS wireless debugging (flutter/flutter#118104)

* cbf2e1689 Revert "Support iOS wireless debugging (#118104)" (flutter/flutter#118826)

* 2258590a8 Do not run Mac_arm64_ios run_debug_test_macos in presubmit during iPhone 11 migration (flutter/flutter#118828)

* 1dd7f45bf Add `build macos --config-only` option. (flutter/flutter#118649)

* 22520f54d [macOS] Add timeline summary benchmarks (flutter/flutter#118748)

* 99e4ca50c Roll Flutter Engine from 29a0582a1d5f to 78bbea005d27 (2 revisions) (flutter/flutter#118829)

* c5ceff11d [flutter_tools] Ensure service worker starts caching assets since first load  (flutter/flutter#116833)

* 818bb4e65 Roll Flutter Engine from 78bbea005d27 to 26b6609c603b (3 revisions) (flutter/flutter#118839)

* 09bd0f661 Support logging 'flutter run' communication to DAP clients (flutter/flutter#118674)

* 73096fd96 [macos] add flavor options to commands in the `flutter_tool` (flutter/flutter#118421)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App f: focus Focus traversal, gaining or losing focus f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants