Add Cyrillic keyboard layout support for flutter_tools terminal commands#177855
Merged
auto-submit[bot] merged 4 commits intoflutter:masterfrom Dec 16, 2025
Merged
Conversation
github-actions
bot
added
the
tool
![gemini-code-assist[bot]](proxy.php?url=https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces support for Cyrillic keyboard layouts in the flutter_tools terminal, which is a valuable enhancement for developers using these layouts. The implementation correctly maps Cyrillic characters to their Latin equivalents, and the new functionality is well-tested. My feedback includes suggestions to refactor the growing switch statement into a more maintainable Map and to adopt a data-driven approach for the new tests to reduce code duplication.
777genius
force-pushed
the
feature/cyrillic-keyboard-support
branch
4 times, most recently
from
0b80293 to
5116ca1
Compare
Contributor
|
Thanks for the contribution @777genius! Do you happen to know if there's already an issue filed for this? If so, could you link it here? Otherwise, we should file an issue describing the problem so that we can continue to track work in this area. This approach does work, but I'm sure if you're encountering this issue for Cyrillic keyboard layouts, other users are encountering if with other layouts as well. This means that we should probably come up with a more generalizable solution that allows for us to add mappings for other languages as well without having to introduce case statements for each individual mapping. I think this can be done by creating a |
Contributor
|
Hi @777genius, is this something you're still interested in pursuing? |
bkonyi
added
the
waiting for customer response
Contributor
Author
|
Thank you for the feedback, @bkonyi! You're absolutely right about making this more generalizable. I found several related issues that confirm this is a broader problem affecting multiple keyboard layouts: #27021 - Flutter run not handling keypresses with non-English layouts (Cyrillic, closed in 2020 but the terminal command issue persists) I agree that using a Map<String, String> approach is much cleaner and more maintainable. I'll refactor the implementation to use your suggested approach:
/// Maps non-Latin keyboard layout characters to their Latin equivalents
/// based on physical key positions.
///
/// This allows users with non-Latin keyboard layouts to use terminal commands
/// without switching layouts. Contributors can add mappings for additional
/// layouts (Arabic, Hebrew, Greek, etc.) by adding entries to this map.
const Map<String, String> _keyboardLayoutMappings = {
// Cyrillic (Russian ЙЦУКЕН) layout -> QWERTY Latin
'к': 'r', 'К': 'R', // hot reload / hot restart
'й': 'q', 'Й': 'Q', // quit
'ц': 'w', 'Ц': 'W', // dump widget tree
'р': 'h', 'Р': 'H', // help
'ы': 's', 'Ы': 'S', // screenshot / semantics
'в': 'd', 'В': 'D', // detach
'а': 'f', 'А': 'F', // dump focus tree
'п': 'g', 'П': 'G', // run source generators
'ш': 'i', 'Ш': 'I', // widget inspector / invert images
'д': 'l', 'Д': 'L', // dump layer tree
'щ': 'o', 'Щ': 'O', // toggle platform
'з': 'p', 'З': 'P', // debug paint / performance overlay
'т': 'n', 'Т': 'N', // (reserved for future use)
'е': 't', 'Е': 'T', // dump render tree
'г': 'u', 'Г': 'U', // dump semantics (inverse hit test)
'м': 'v', 'М': 'V', // open DevTools
// TODO: Add mappings for other non-Latin layouts as needed
};
/// Maps a keyboard character to its Latin equivalent if a mapping exists.
/// Returns the original character if no mapping is found.
String _mapKeyToLatin(String key) {
return _keyboardLayoutMappings[key] ?? key;
}
Future<bool> _commonTerminalInputHandler(String character) async {
// Map non-Latin characters to Latin equivalents based on physical key position
character = _mapKeyToLatin(character);
_logger.printStatus('');
switch (character) {
case 'a':
return residentRunner.debugToggleProfileWidgetBuilds();
case 'r':
// ... existing hot reload logic
// ... rest of the switch statement remains unchanged
}
}This approach has several benefits:
How do you like the solution? |
Contributor
|
That sounds good to me! |
777genius
force-pushed
the
feature/cyrillic-keyboard-support
branch
from
5116ca1 to
af39447
Compare
…mmands Implements a keyboard layout mapping layer that allows users with non-Latin layouts to use flutter_tools terminal commands without switching layouts. The implementation uses a Map-based approach for character translation, mapping characters based on physical key positions rather than linguistic equivalents. This design makes it easy for contributors to add support for additional layouts (Arabic, Hebrew, Greek, etc.). Includes comprehensive test coverage following Flutter's testing patterns, with tests for basic functionality, error handling (fatal/non-fatal), and unsupported operations. Fixes: flutter#27021, flutter#100456, flutter#116658
777genius
force-pushed
the
feature/cyrillic-keyboard-support
branch
from
af39447 to
5eec195
Compare
Contributor
Author
|
@bkonyi Please take a look with your professional eye. Updated the implementation to use the Map-based approach as suggested. Changes include:
The implementation is now much more maintainable and makes it easy to add support for other keyboard layouts (Arabic, Hebrew, Greek, etc.) in the future. Ready for review! |
Contributor
|
Sorry for the delay @777genius. I'll review this today! |
bkonyi
reviewed
Nov 25, 2025
Contributor
bkonyi
left a comment
bkonyi
left a comment
There was a problem hiding this comment.
Just a few comments, but looks good overall!
| static const _keyboardLayoutMappings = <String, String>{ | ||
| // Cyrillic (Russian ЙЦУКЕН) layout → QWERTY Latin | ||
| // Maps based on physical key positions for terminal commands | ||
| 'к': 'r', 'К': 'R', // hot reload / hot restart |
Contributor
There was a problem hiding this comment.
Can we add a comment here warning that these keys are not QWERTY Latin, even if they look identical? That way future contributors know that р is not p 😅
| switch (character) { | ||
| case 'a': | ||
| case 'ф': // 'a' in Cyrillic (QWERTY 'a' → ЙЦУКЕН 'ф') |
Contributor
There was a problem hiding this comment.
Are these cases needed anymore since _mapKeyToLatin(...) does the conversion?
| .file(globals.artifacts!.getHostArtifact(HostArtifact.flutterWebLibrariesJson)) | ||
| .uri | ||
| .toString(), | ||
| librariesSpec: |
Contributor
There was a problem hiding this comment.
I think you may have accidentally formatted these files with an older version of the Dart formatter. Can you upgrade your Flutter installation to the latest stable and format this again?
- Add warning comment about visually similar Cyrillic/Latin characters - Remove redundant Cyrillic cases from switch (already handled by _mapKeyToLatin) - Update docstring to reference _keyboardLayoutMappings - Reformat with latest dart formatter
Contributor
Author
|
@bkonyi Thanks for the top-level review! I've addressed all your comments:
Ready for another look! |
Contributor
|
Thanks for addressing the comments @777genius! This LGTM! @chingjun would you mind giving a second review? |
bkonyi
approved these changes
Dec 11, 2025
Contributor
|
Also, can we add a test, or an assert, that we never add regular ASCII characters as keys in the |
- Format terminal_handler_test.dart - Expose keyboardLayoutMappings with @VisibleForTesting - Add test to ensure mapping keys have code points > 127 (prevents accidental addition of Latin characters as keys)
777genius
force-pushed
the
feature/cyrillic-keyboard-support
branch
from
bb6195c to
13df6fb
Compare
chingjun
approved these changes
Dec 13, 2025
Contributor
Author
|
@chingjun Thank you for the review and helpful suggestions! CI is green. |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 18, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 18, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 18, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 18, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 18, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 19, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 19, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 19, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 19, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 19, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 20, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 20, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 21, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 21, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 21, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 22, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 22, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 22, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 23, 2025
stuartmorgan-g
pushed a commit
to flutter/packages
that referenced
this pull request
Dec 23, 2025
Manual roll Flutter from d81baab to 57c3f8b (38 revisions) Manual roll requested by [email protected] flutter/flutter@d81baab...57c3f8b 2025-12-17 [email protected] Add FloatingActionButtonTheme (flutter/flutter#179736) 2025-12-17 [email protected] Roll Skia from b1569739f431 to fb576bd6827a (1 revision) (flutter/flutter#179989) 2025-12-17 [email protected] Update more comments related to theme normalization (flutter/flutter#179682) 2025-12-17 [email protected] Roll Skia from cce9b86bda7d to b1569739f431 (1 revision) (flutter/flutter#179979) 2025-12-17 [email protected] Adds property passthrough for CheckboxListTile, SwitchListTile and RadioListTile (flutter/flutter#178098) 2025-12-17 [email protected] Roll Dart SDK from ca949b915846 to 3793f3d2d0c4 (2 revisions) (flutter/flutter#179973) 2025-12-17 [email protected] Roll Skia from 318400199beb to cce9b86bda7d (1 revision) (flutter/flutter#179976) 2025-12-17 [email protected] Make sure that a CupertinoTextFormFieldRow doesn't crash in 0x0 envir… (flutter/flutter#179932) 2025-12-17 [email protected] Make sure that a CupertinoTabView doesn't crash in 0x0 environment (flutter/flutter#179845) 2025-12-17 [email protected] Make sure that a CupertinoTextField doesn't crash in 0x0 environment (flutter/flutter#179865) 2025-12-17 [email protected] Make sure that a CupertinoSwitch doesn't crash in 0x0 environment (flutter/flutter#179748) 2025-12-17 [email protected] Update `BuildContext` docs to make it easier to understand (flutter/flutter#178616) 2025-12-17 [email protected] [ios][pv] quick fix to enable and re-enable web view's gesture recognizer (flutter/flutter#179908) 2025-12-17 [email protected] Deduplicate wasm dry run entries in analytics. (flutter/flutter#179970) 2025-12-17 [email protected] Roll Skia from 99899cbb415b to 318400199beb (1 revision) (flutter/flutter#179969) 2025-12-17 [email protected] Roll Skia from 2ac4a8709bc9 to 99899cbb415b (1 revision) (flutter/flutter#179968) 2025-12-17 [email protected] Roll Dart SDK from 95a92bc705d3 to ca949b915846 (6 revisions) (flutter/flutter#179967) 2025-12-17 [email protected] Add package info to wasm dry run events. (flutter/flutter#179826) 2025-12-17 [email protected] Platform View Hide/Show Integration test (flutter/flutter#179902) 2025-12-16 [email protected] Roll Skia from 61162d72343f to 2ac4a8709bc9 (14 revisions) (flutter/flutter#179961) 2025-12-16 [email protected] Roll Fuchsia Linux SDK from 433KtmJvbMyaDMJvD... to fAoyBAT99XxwPE5hL... (flutter/flutter#179960) 2025-12-16 [email protected] [ Tool ] Fix update-packages not accounting for path dependencies (flutter/flutter#179951) 2025-12-16 [email protected] ListTile fix MinIntrinsicHeight calculation (flutter/flutter#179515) 2025-12-16 [email protected] Fix pinned header in NestedScrollView (flutter/flutter#179210) 2025-12-16 [email protected] Update some comments related to theme normalization (flutter/flutter#179624) 2025-12-16 [email protected] Add Cyrillic keyboard layout support for flutter_tools terminal commands (flutter/flutter#177855) 2025-12-16 [email protected] Minor fixes for libstdc++ 15 (flutter/flutter#178601) 2025-12-16 [email protected] Feat: Add top gap for cupertino sheet (flutter/flutter#171348) 2025-12-16 [email protected] Align `Build.API_LEVELS` usage in `FlutterImageDecoder.java` with existing usage (flutter/flutter#179868) 2025-12-16 [email protected] Revert "[ios][pv] accept/reject gesture based on hitTest (with new wi… (flutter/flutter#179895) 2025-12-16 [email protected] fix: line endings for flutter/dart/flutter-dev (flutter/flutter#179912) 2025-12-16 [email protected] Platform view blur clipping - Rounded Rect (iOS) (flutter/flutter#177551) 2025-12-16 [email protected] Roll Dart SDK from 20d114f951db to 95a92bc705d3 (1 revision) (flutter/flutter#179909) 2025-12-16 [email protected] [Reland] Unmodified android sdk bundle (flutter/flutter#179920) 2025-12-16 [email protected] Roll Skia from 6903a4e65c3f to 61162d72343f (2 revisions) (flutter/flutter#179915) 2025-12-16 [email protected] Roll Packages from 2cd921c to 57725eb (1 revision) (flutter/flutter#179942) 2025-12-16 [email protected] Filter out FrameEvents/updateAcquireFence log spam from adb logcat (flutter/flutter#179884) 2025-12-16 [email protected] `flutter update-packages --force-upgrade --update-hashes` (flutter/flutter#179950) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. ...
ivan-vanyusho
pushed a commit
to ivan-vanyusho/packages
that referenced
this pull request
Jan 26, 2026
…0671) Manual roll Flutter from d81baab to 57c3f8b (38 revisions) Manual roll requested by [email protected] flutter/flutter@d81baab...57c3f8b 2025-12-17 [email protected] Add FloatingActionButtonTheme (flutter/flutter#179736) 2025-12-17 [email protected] Roll Skia from b1569739f431 to fb576bd6827a (1 revision) (flutter/flutter#179989) 2025-12-17 [email protected] Update more comments related to theme normalization (flutter/flutter#179682) 2025-12-17 [email protected] Roll Skia from cce9b86bda7d to b1569739f431 (1 revision) (flutter/flutter#179979) 2025-12-17 [email protected] Adds property passthrough for CheckboxListTile, SwitchListTile and RadioListTile (flutter/flutter#178098) 2025-12-17 [email protected] Roll Dart SDK from ca949b915846 to 3793f3d2d0c4 (2 revisions) (flutter/flutter#179973) 2025-12-17 [email protected] Roll Skia from 318400199beb to cce9b86bda7d (1 revision) (flutter/flutter#179976) 2025-12-17 [email protected] Make sure that a CupertinoTextFormFieldRow doesn't crash in 0x0 envir… (flutter/flutter#179932) 2025-12-17 [email protected] Make sure that a CupertinoTabView doesn't crash in 0x0 environment (flutter/flutter#179845) 2025-12-17 [email protected] Make sure that a CupertinoTextField doesn't crash in 0x0 environment (flutter/flutter#179865) 2025-12-17 [email protected] Make sure that a CupertinoSwitch doesn't crash in 0x0 environment (flutter/flutter#179748) 2025-12-17 [email protected] Update `BuildContext` docs to make it easier to understand (flutter/flutter#178616) 2025-12-17 [email protected] [ios][pv] quick fix to enable and re-enable web view's gesture recognizer (flutter/flutter#179908) 2025-12-17 [email protected] Deduplicate wasm dry run entries in analytics. (flutter/flutter#179970) 2025-12-17 [email protected] Roll Skia from 99899cbb415b to 318400199beb (1 revision) (flutter/flutter#179969) 2025-12-17 [email protected] Roll Skia from 2ac4a8709bc9 to 99899cbb415b (1 revision) (flutter/flutter#179968) 2025-12-17 [email protected] Roll Dart SDK from 95a92bc705d3 to ca949b915846 (6 revisions) (flutter/flutter#179967) 2025-12-17 [email protected] Add package info to wasm dry run events. (flutter/flutter#179826) 2025-12-17 [email protected] Platform View Hide/Show Integration test (flutter/flutter#179902) 2025-12-16 [email protected] Roll Skia from 61162d72343f to 2ac4a8709bc9 (14 revisions) (flutter/flutter#179961) 2025-12-16 [email protected] Roll Fuchsia Linux SDK from 433KtmJvbMyaDMJvD... to fAoyBAT99XxwPE5hL... (flutter/flutter#179960) 2025-12-16 [email protected] [ Tool ] Fix update-packages not accounting for path dependencies (flutter/flutter#179951) 2025-12-16 [email protected] ListTile fix MinIntrinsicHeight calculation (flutter/flutter#179515) 2025-12-16 [email protected] Fix pinned header in NestedScrollView (flutter/flutter#179210) 2025-12-16 [email protected] Update some comments related to theme normalization (flutter/flutter#179624) 2025-12-16 [email protected] Add Cyrillic keyboard layout support for flutter_tools terminal commands (flutter/flutter#177855) 2025-12-16 [email protected] Minor fixes for libstdc++ 15 (flutter/flutter#178601) 2025-12-16 [email protected] Feat: Add top gap for cupertino sheet (flutter/flutter#171348) 2025-12-16 [email protected] Align `Build.API_LEVELS` usage in `FlutterImageDecoder.java` with existing usage (flutter/flutter#179868) 2025-12-16 [email protected] Revert "[ios][pv] accept/reject gesture based on hitTest (with new wi… (flutter/flutter#179895) 2025-12-16 [email protected] fix: line endings for flutter/dart/flutter-dev (flutter/flutter#179912) 2025-12-16 [email protected] Platform view blur clipping - Rounded Rect (iOS) (flutter/flutter#177551) 2025-12-16 [email protected] Roll Dart SDK from 20d114f951db to 95a92bc705d3 (1 revision) (flutter/flutter#179909) 2025-12-16 [email protected] [Reland] Unmodified android sdk bundle (flutter/flutter#179920) 2025-12-16 [email protected] Roll Skia from 6903a4e65c3f to 61162d72343f (2 revisions) (flutter/flutter#179915) 2025-12-16 [email protected] Roll Packages from 2cd921c to 57725eb (1 revision) (flutter/flutter#179942) 2025-12-16 [email protected] Filter out FrameEvents/updateAcquireFence log spam from adb logcat (flutter/flutter#179884) 2025-12-16 [email protected] `flutter update-packages --force-upgrade --update-hashes` (flutter/flutter#179950) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. ...
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Feb 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds support for Cyrillic (Russian ЙЦУКЕН) keyboard layout in the flutter_tools terminal handler, allowing users to use hot reload, hot restart, and other terminal commands without switching keyboard layouts.
Motivation
Developers working with Cyrillic keyboard layouts currently must switch to a Latin layout every time they want to use terminal commands like hot reload (r/R) or help (h). This disrupts the development workflow and reduces productivity.
Changes
The implementation maps Cyrillic characters to their corresponding Latin equivalents based on physical key positions on QWERTY/ЙЦУКЕН layouts:
Testing
Impact
This change improves the developer experience for users working with Cyrillic keyboard layouts by eliminating the need for constant layout switching during development. The implementation follows Flutter code style guidelines and does not affect existing functionality.