Relax syntax for gen-l10n by thkim1011 · Pull Request #130736 · flutter/flutter

thkim1011 · 2023-07-17T18:13:48Z

To preserve backward compatibility with the old parser which would ignore syntax errors, this PR introduces a way to treat the special characters { and } in the following way:

If we encounter a { which searching for a string token and this { is not followed by a valid placeholder, then we treat the { as a string and continue lexing for strings.
If we encounter a } while not within some expression (i.e. placeholders, arguments, plurals, or selects), then we treat the } as a string and continue lexing for strings.

This makes it so that

"helloWorld": "{ } { placeholder }",
"@@helloWorld": {
  "placeholders": {
    "placeholder" {}
  }
}

treats the { } as a string while { placeholder } is treated as a placeholder.

Fixes #122404.

HansMuller

This looks good! Some presubmit tests are failing though.

HansMuller · 2023-07-17T18:57:44Z

packages/flutter_tools/lib/src/localizations/message_parser.dart

          tokens.add(Node.brace(startIndex, match.group(0)!));
          isString = false;
          startIndex = match.end;
+          depth++;


depth += 1 is preferred because no one remembers PDP-11s anymore :-).

HansMuller · 2023-07-17T18:58:59Z

packages/flutter_tools/lib/src/commands/generate_localizations.dart

    );
+    argParser.addFlag(
+      'relax-syntax',
+      help: 'When specified, some instances of "{" and "}" will be treated as strings '


It would be better to explain this more precisely.

…o tae/relaxed-syntax

HansMuller

LGTM

HansMuller · 2023-07-17T20:37:05Z

packages/flutter_tools/lib/src/commands/generate_localizations.dart

      help: 'When specified, all warnings will be suppressed.\n'
    );
+    argParser.addFlag(
+      'relax-syntax',


HansMuller · 2023-07-17T20:37:57Z

packages/flutter_tools/lib/src/localizations/localizations_utils.dart

  /// Whether or not to suppress warnings.
  final bool suppressWarnings;
+
+  /// The `relax-syntax` argument.


You should incorporate the text from the help message here.

It would also be worth explaining here and in the help message that relax-syntax was added for backwards compatibility with an a earlier version of the parser and that we don't advising using it because it can mask errors.

auto-submit · 2023-07-17T21:06:17Z

auto label is removed for flutter/flutter, pr: 130736, due to - The status or check suite Linux analyze has failed. Please fix the issues identified (or deflake) before re-applying this label.

Roll Flutter from 6f09064 to d07e8ae (60 revisions) flutter/flutter@6f09064...d07e8ae 2023-07-19 [email protected] Roll Flutter Engine from 09389b16d684 to eb2285205f25 (3 revisions) (flutter/flutter#130879) 2023-07-19 [email protected] Roll Flutter Engine from 0293a7cb7887 to 09389b16d684 (5 revisions) (flutter/flutter#130867) 2023-07-19 [email protected] Move TapAndDragGestureRecognizer code under gestures (flutter/flutter#119508) 2023-07-19 [email protected] Roll Flutter Engine from 29de67c7d009 to 0293a7cb7887 (1 revision) (flutter/flutter#130858) 2023-07-19 [email protected] Roll Flutter Engine from 39d60be72ffb to 29de67c7d009 (4 revisions) (flutter/flutter#130855) 2023-07-19 [email protected] Roll Flutter Engine from b3bfc744bb61 to 39d60be72ffb (1 revision) (flutter/flutter#130847) 2023-07-19 [email protected] Roll Flutter Engine from adf6142f6738 to b3bfc744bb61 (7 revisions) (flutter/flutter#130843) 2023-07-18 [email protected] Update app_builder_test.dart for M3 (flutter/flutter#130794) 2023-07-18 [email protected] Catch errors in loadStructuredData (flutter/flutter#130748) 2023-07-18 [email protected] Fix super tiny space formatting (hope we have auto formatter in the future) (flutter/flutter#127479) 2023-07-18 [email protected] Roll Flutter Engine from 71bbecee3010 to adf6142f6738 (2 revisions) (flutter/flutter#130831) 2023-07-18 [email protected] Update SnackBar tests for M2/M3 (flutter/flutter#130717) 2023-07-18 [email protected] Roll pub packages (flutter/flutter#130821) 2023-07-18 [email protected] Relax syntax for gen-l10n (flutter/flutter#130736) 2023-07-18 [email protected] Roll Flutter Engine from 45851af55bd6 to 71bbecee3010 (7 revisions) (flutter/flutter#130820) 2023-07-18 [email protected] Roll pub packages (flutter/flutter#130608) 2023-07-18 [email protected] Roll Flutter Engine from 831da7e9dc3b to 45851af55bd6 (2 revisions) (flutter/flutter#130814) 2023-07-18 [email protected] [Android] Deletes deprecated splash screen meta-data element (flutter/flutter#130744) 2023-07-18 [email protected] Updated `ThemeData.useMaterial3` API doc, default is `true` (flutter/flutter#130764) 2023-07-18 [email protected] [labeler] Mark sync-labels as empty (flutter/flutter#130642) 2023-07-18 [email protected] Roll Flutter Engine from c27658cc5ade to 831da7e9dc3b (2 revisions) (flutter/flutter#130810) 2023-07-18 [email protected] Roll Packages from 6889cca to 3e8b813 (9 revisions) (flutter/flutter#130802) 2023-07-18 [email protected] Update `AppBar` and `AppBarTheme` tests for M2/M3 (flutter/flutter#130790) 2023-07-18 [email protected] Update app tests for M3 (flutter/flutter#130792) 2023-07-18 [email protected] Add lint check to make sure samples are linked and have tests (flutter/flutter#130523) 2023-07-18 [email protected] Roll Flutter Engine from aaec42812a1f to c27658cc5ade (2 revisions) (flutter/flutter#130799) 2023-07-18 [email protected] Extract common functionality of iOS platformviews into superclasses (flutter/flutter#128716) 2023-07-18 [email protected] Roll Flutter Engine from 88be39be7b07 to aaec42812a1f (1 revision) (flutter/flutter#130787) 2023-07-18 [email protected] Roll Flutter Engine from b46a8baf8ed9 to 88be39be7b07 (1 revision) (flutter/flutter#130784) 2023-07-18 [email protected] Roll Flutter Engine from 777fe158f4e7 to b46a8baf8ed9 (1 revision) (flutter/flutter#130782) 2023-07-18 [email protected] Fix `iconTheme` in `AppBar` doesn't apply custom `Colors.white` in the dark mode for M3 (flutter/flutter#130574) 2023-07-18 [email protected] Roll Flutter Engine from c6e23288db8d to 777fe158f4e7 (2 revisions) (flutter/flutter#130779) 2023-07-18 [email protected] Roll Flutter Engine from 116eedf769be to c6e23288db8d (3 revisions) (flutter/flutter#130778) 2023-07-18 [email protected] Roll Flutter Engine from 9d018f00d687 to 116eedf769be (2 revisions) (flutter/flutter#130774) 2023-07-18 [email protected] Roll Flutter Engine from 77ec92371846 to 9d018f00d687 (1 revision) (flutter/flutter#130772) 2023-07-18 [email protected] Document stack's clipping behaviour better (flutter/flutter#130749) 2023-07-18 [email protected] Roll Flutter Engine from f2958f9229a4 to 77ec92371846 (1 revision) (flutter/flutter#130769) 2023-07-18 [email protected] Roll Flutter Engine from 3cceb705007e to f2958f9229a4 (1 revision) (flutter/flutter#130767) 2023-07-18 [email protected] Roll Flutter Engine from 09689d37e1d6 to 3cceb705007e (2 revisions) (flutter/flutter#130763) 2023-07-18 [email protected] Stabilize hybrid_android_views_integration_test rendering tree (flutter/flutter#130751) 2023-07-17 [email protected] update link to good first issues (flutter/flutter#130759) 2023-07-17 [email protected] Prevent `InputDecorator` from supplying its descendants with non-normalized constraints (flutter/flutter#130460) 2023-07-17 [email protected] Roll Flutter Engine from 15c15fd75743 to 09689d37e1d6 (3 revisions) (flutter/flutter#130758) 2023-07-17 [email protected] [tools/ios_build_ipa] fallback to CFBundleName if CFBundleDisplayName is absent (flutter/flutter#130752) 2023-07-17 [email protected] Resolve TODOs in channels integration test (flutter/flutter#130745) 2023-07-17 [email protected] Roll Flutter Engine from ddbe23b374d8 to 15c15fd75743 (2 revisions) (flutter/flutter#130746) ...

@helloworld

To preserve backward compatibility with the old parser which would ignore syntax errors, this PR introduces a way to treat the special characters `{` and `}` in the following way: 1. If we encounter a `{` which searching for a string token and this `{` is not followed by a valid placeholder, then we treat the `{` as a string and continue lexing for strings. 2. If we encounter a `}` while not within some expression (i.e. placeholders, arguments, plurals, or selects), then we treat the `}` as a string and continue lexing for strings. This makes it so that ``` "helloWorld": "{ } { placeholder }", "@@helloworld": { "placeholders": { "placeholder" {} } } ``` treats the `{ }` as a string while `{ placeholder } ` is treated as a placeholder. Fixes flutter#122404.

devxpy · 2024-05-21T13:31:47Z

backwards compatibility for non major version changes should be the default behaviour

thkim1011 added 2 commits July 17, 2023 10:58

init

c2e1b02

add tests

d016d1c

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jul 17, 2023

thkim1011 requested a review from HansMuller July 17, 2023 18:15

HansMuller reviewed Jul 17, 2023

View reviewed changes

thkim1011 and others added 4 commits July 17, 2023 12:55

address pr comments

bc7a4a3

Merge branch 'master' into tae/relaxed-syntax

aecd9a3

period

8125bee

Merge branch 'tae/relaxed-syntax' of github.com:thkim1011/flutter int…

d4c29bf

…o tae/relaxed-syntax

HansMuller approved these changes Jul 17, 2023

View reviewed changes

address pr comments

cc687e2

thkim1011 added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 17, 2023

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 17, 2023

thkim1011 and others added 2 commits July 17, 2023 14:14

analyzer

3e74ba6

Merge branch 'master' into tae/relaxed-syntax

1461313

thkim1011 merged commit c6b93b2 into flutter:master Jul 18, 2023

engine-flutter-autoroll mentioned this pull request Jul 19, 2023

Roll Flutter from 6f09064e785b to d07e8aece184 (60 revisions) flutter/packages#4522

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 19, 2023

c6b93b2 Relax syntax for gen-l10n (flutter/flutter#130736)

64dc0a2

HansMuller mentioned this pull request Jul 21, 2023

Flutter Framework Team: Notable Commits #121415

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Relax syntax for gen-l10n#130736

Relax syntax for gen-l10n#130736
thkim1011 merged 9 commits intoflutter:masterfrom
thkim1011:tae/relaxed-syntax

thkim1011 commented Jul 17, 2023 •

edited

Loading

Uh oh!

HansMuller left a comment

Uh oh!

HansMuller Jul 17, 2023

Uh oh!

HansMuller Jul 17, 2023

Uh oh!

HansMuller left a comment

Uh oh!

HansMuller Jul 17, 2023

Uh oh!

HansMuller Jul 17, 2023

Uh oh!

thkim1011 Jul 17, 2023

Uh oh!

auto-submit bot commented Jul 17, 2023

Uh oh!

devxpy commented May 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

thkim1011 commented Jul 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HansMuller left a comment

Choose a reason for hiding this comment

Uh oh!

HansMuller Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

HansMuller Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

HansMuller left a comment

Choose a reason for hiding this comment

Uh oh!

HansMuller Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

HansMuller Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

thkim1011 Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Jul 17, 2023

Uh oh!

devxpy commented May 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

thkim1011 commented Jul 17, 2023 •

edited

Loading