finchie/cli_framework - Change P6FW2GGOW24UZZAWQ6IDDI66JBWTIY26TATMCIOETZ4GRRGGUI3AC

Remove unnecessary parameters in generated `localize()` function

These parameters are now generated inside the function body - not ideal, but better than before. They could be cached in some global data structure to fix this long-term.

Created by finchie on June 27, 2024

P6FW2GGOW24UZZAWQ6IDDI66JBWTIY26TATMCIOETZ4GRRGGUI3AC

Dependencies

In channels

main

Change contents

Replacement in fluent_embed/src/parse_macro.rs at line 16 [4.39]

B:BD[3.200] → [2.0:134]

    let mut extra_messages = Vec::with_capacity(variants.len());
    let mut canonical_messages = Vec::with_capacity(variants.len());

[3.200]

[4.397]

    let mut messages = Vec::with_capacity(variants.len());

Replacement in fluent_embed/src/parse_macro.rs at line 37 [4.39]

B:BD[4.1307] → [2.135:275]

        extra_messages.push(group.message(&kebab_case_ident));
        canonical_messages.push(group.canonical_message(&kebab_case_ident));

[4.1307]

[4.1348]

        messages.push(group.message(&kebab_case_ident));

Replacement in fluent_embed/src/parse_macro.rs at line 40 [4.39]

B:BD[4.1355] → [2.276:335]

    // TODO: locale matching should use a better algorithm

[4.1355]

    let extra_locales = group.extra_locales().map(|locale| locale.id.to_string());
    let canonical_locale = group.canonical_locale().id.to_string();

Replacement in fluent_embed/src/parse_macro.rs at line 45 [4.39]

B:BD[4.1390] → [2.336:712]

            fn localize(&self, locales: &[&::icu_locid::Locale], plural_rules: &::icu_plurals::PluralRules) -> String {
                // Check each locale to see if it's implemented for this message
                for locale in locales {
                    match self {
                        #(Self::#idents => #extra_messages),*
                    }
                }

[4.1390]

[2.712]

            fn localize(&self) -> String {
                // Find the appropriate locale to use
                let extra_locales = [#(::icu_locid::langid!(#extra_locales)),*];
                let canonical_locale = ::icu_locid::langid!(#canonical_locale);
                let locale = ::locale_select::match_locales(&extra_locales, &canonical_locale);
                // TODO: this shouldn't be generated on every call
                // TODO: handle different rule types according to fluent code (not just cardinal)
                let plural_rule_type = ::icu_plurals::PluralRuleType::Cardinal;
                let plural_rules = ::icu_plurals::PluralRules::try_new(&locale.clone().into(), plural_rule_type).unwrap();

Replacement in fluent_embed/src/parse_macro.rs at line 56 [4.39]

B:BD[2.713] → [2.713:760]

                // Fall back to default locale

[2.713]

[4.1476]

                // Match the information to the message

Replacement in fluent_embed/src/parse_macro.rs at line 58 [4.39]

B:BD[4.1505] → [2.761:823]

                    #(Self::#idents => #canonical_messages),*

[4.1505]

[4.1557]

                    #(Self::#idents => #messages),*

Insertion in fluent_embed/src/group.rs at line 98 [6.3543]

[5.2622]


        let canonical_message = crate::parse_fluent::message(&self.canonical_messages[message_column]);

Insertion in fluent_embed/src/group.rs at line 103 [6.3543]

[5.2757]

[5.2852]


            else {
                #canonical_message
            }

Replacement in fluent_embed/src/group.rs at line 110 [6.3543]

B:BD[2.825] → [2.825:1155]

    pub fn canonical_message(&self, id: &str) -> syn::Expr {
        let message_column = self
            .canonical_messages
            .iter()
            .position(|message| message.id.name == id)
            .expect("Message id must be valid");
        crate::parse_fluent::message(&self.canonical_messages[message_column])

[2.825]

[2.1155]

    pub fn canonical_locale(&self) -> &Locale {
        &self.canonical_locale
    }
    pub fn extra_locales(&self) -> impl Iterator<Item = &Locale> {
        self.extra_locales.iter().map(| LocaleGroup { locale, .. }| locale)

Deletion in cli_macros/tests/selectors.rs at line 4 [7.140]
B:BD[7.269] → [7.269:340]
```
use icu_locid::locale;
use icu_plurals::{PluralRuleType, PluralRules};
```
Deletion in cli_macros/tests/selectors.rs at line 12 [7.140]
B:BD[7.459] → [8.1292:1327]
∅:D[8.1327] → [7.459:482]
B:BD[7.459] → [7.459:482]
B:BD[7.482] → [8.1328:1417]
∅:D[8.1417] → [7.570:571]
B:BD[7.570] → [7.570:571]
```
    let locale = locale!("en-US");
    let plural_rules =
        PluralRules::try_new(&locale.clone().into(), PluralRuleType::Cardinal).unwrap();
```

Replacement in cli_macros/tests/selectors.rs at line 25 [7.140]

B:BD[7.956] → [2.1162:1219]

            message.localize(&[&locale], &plural_rules),

[7.956]

[7.1001]

            message.localize(),

Insertion in cli_macros/Cargo.toml at line 20 [9.711]
[9.1033]
```
locale_select = { path = "../locale_select" }
```