{"header":{"message":"Add support for integer selectors","description":"Handles `VariantKey::NumberLiteral` when converting Fluent select statements to Rust match statements. Currently does not support decimal values, but there isn't any reason they couldn't be added.","timestamp":"2025-08-18T06:40:22.786374717Z","authors":[{}]},"hash":"XDJBTEXUZNIAC2TKC4Z3OZORWAXR4ZWYUHNM6OEGXTL6WZDXOVZQC","authors":[{"login":"finchie","key":"6WCsL9cxQoPBLLwR1PUvmFBJi6wGTGFAxcxMovPQCwTZ"}],"deps":{"hashes":[["XDJBTEXUZNIAC2TKC4Z3OZORWAXR4ZWYUHNM6OEGXTL6WZDXOVZQC","Add support for integer selectors"],["AA",null],["FF67HCOFIP6LBJCPUC7PBL74KDFZEFP6NELQPILRIFLYHV3JQWLAC","Improve Fluent syntax error spans"],["EKXWNEPK4FTYKT2RJL2L7HTM64VQGDD3DYD6NZIDGMMV6ITHUVZAC","Rename `Localize::message_for_locale` to `Localize::localize_for`"],["PGBXJWIHSVTRD7CGDSCPC4YHI65EBKMQFEX62RZWL4EZB63622XAC","Move `l10n_embed` re-exports into `macro_prelude` module"],["MVTRHSJLQ32Q62257NC3ADECW42A32ZTBDPGUZMBUQXSAM64CWHQC","Move from `fluent-syntax` PR to main branch"],["F64TRIFZZYRZJTM3OWBI7IEKY3S37GGH2KKKS65HRKIOZZOKPFJQC","Test both structs and enums in `l10n_embed_derive`"],["CESJ4CTO26X4GBZBPXRXLOJT3JQJOGFN5EJSNAAZELNQRZF7QSYAC","Move macro-specific code into `macro_impl` module"],["5TEX4MNUC4LDDRMNEOVCFNUUEZAGUXMKO3OIEQFXWRQKXSHY2NRQC","Split `fluent_embed` into `group` and `parse` modules"],["C6W7N6N57UCNHEV55HEZ3G7WN2ZOBGMFBB5M5ZPDB2HNNHHTOPBQC","Implement `Localize` for `FixedDecimal` and primitive number types"],["HHJDRLLNN36UNIA7STAXEEVBCEMPJNB7SJQOS3TJLLYN4AEZ4MHQC","Create `fluent_embed_runtime` crate"],["7X4MEZJUMLYYIBV7ANLADELOZ7I7AJ5CKFAR35CJ2SBZDDVJFZOQC","Use Fluent AST when reporting error spans"],["AAERM7PBDVDFDEEXZ7UJ5WWQF7SPEJQQYXRBZ63ETB5YAVIECHMAC","Add selector tests for the `fr` locale"],["F5LG7WENUUDRSCTDMA4M6BAC5RWTGQO45C4ZEBZDX6FHCTTHBVGQC","Emit compilation errors from Fluent source code"],["3NMKD6I57ONAGHEN4PZIAV2KPYESVR4JL3DTWSHXKCMVJBEQ4GIQC","Refactor `Localize` trait to use `std::io::Write`"],["MABGENI7CW5F5D3BFUJ7BS2H7XPYG4F3UMWGDPFFSMCCZKUUDLDQC","Refactor `fluent_embed_derive` tests"],["VNSHGQYNPGKGGPYNVP4Z2RWD7JCSDJVYAADD6UXWBYL6ZRXKLE4AC","Support using glob paths in `localize` macro"],["S2444K42FJFLTQMMU6PAVA4YRQGDNCMIFBQ5VO2LCD4GJ7LUCRYQC","Refactor selectors test to not rely on funciton calls"],["RUCC2HKZZTUHN3G6IWS4NK3VYGXAI6PORJH2YZKPRAYSDWH63ESQC","Rename from `fluent_embed` to `l10n_embed`"],["7M4UI3TWQIAA333GQ577HDWDWZPSZKWCYG556L6SBRLB6SZDQYPAC","Update dependencies to latest versions"],["6ABVDTXZOHVUDZDKDQS256F74LFIMM5DO3OZWHKRXZBUTPII4WAQC","Improve `fluent_embed_derive` test suite"],["6XEMHUGSNX5YSWZYM7PZUTTUMFODMGO74QLHGEXQ5LAC7LPS7JNQC","Use full `Locale` instead of `LanguageIdentifier` subset"],["Y6YSEDJMU4RLAQG4LJUV5MN6Q2KK2FWOBBIIQY2ZUVM2PREVSNFAC","Fix bug preventing structs from using selectors"],["XEEXWJLGVIPIGURSDU4ETZMGAIFTFDPECM4QWFOSRHU7GMGVOUVQC","Add simple end-to-end test for selectors"],["QFPQZR4K4UZ7R2GQZJG4NYBGVQJVL2ANIKGGTOHAMIRIBQHPSQGAC","Refactor `fluent_embed`"],["2SITVDYW6KANM24QXRHVSBL6S77UHKJLOSOHSUZQBJFL5NAAGQYAC","Handle common errors in Fluent code"],["EAPOUW73YRB5FPBHD6Z2DR33Y7CZGEPM2C4UVOHAOH3OVINVE4FAC","Fix compilation error with `fluent-syntax` span PR"],["7FYXVNAB6JAP3CJKE4MY57UWYSUPEXFVER6K264BSKYHVU6V4SGQC","Ignore comments in Fluent source code"],["KZLFC7OWYNK3G5YNHRANUK3VUVCM6W6J34N7UABYA24XMZWAVVHQC","Rename `fluent_embed_runtime` to `fluent_embed`"]],"deps":["FF67HCOFIP6LBJCPUC7PBL74KDFZEFP6NELQPILRIFLYHV3JQWLAC","EKXWNEPK4FTYKT2RJL2L7HTM64VQGDD3DYD6NZIDGMMV6ITHUVZAC","PGBXJWIHSVTRD7CGDSCPC4YHI65EBKMQFEX62RZWL4EZB63622XAC","MVTRHSJLQ32Q62257NC3ADECW42A32ZTBDPGUZMBUQXSAM64CWHQC","F64TRIFZZYRZJTM3OWBI7IEKY3S37GGH2KKKS65HRKIOZZOKPFJQC"],"known":["5TEX4MNUC4LDDRMNEOVCFNUUEZAGUXMKO3OIEQFXWRQKXSHY2NRQC","XEEXWJLGVIPIGURSDU4ETZMGAIFTFDPECM4QWFOSRHU7GMGVOUVQC","VNSHGQYNPGKGGPYNVP4Z2RWD7JCSDJVYAADD6UXWBYL6ZRXKLE4AC","F5LG7WENUUDRSCTDMA4M6BAC5RWTGQO45C4ZEBZDX6FHCTTHBVGQC","QFPQZR4K4UZ7R2GQZJG4NYBGVQJVL2ANIKGGTOHAMIRIBQHPSQGAC","2SITVDYW6KANM24QXRHVSBL6S77UHKJLOSOHSUZQBJFL5NAAGQYAC","HHJDRLLNN36UNIA7STAXEEVBCEMPJNB7SJQOS3TJLLYN4AEZ4MHQC","KZLFC7OWYNK3G5YNHRANUK3VUVCM6W6J34N7UABYA24XMZWAVVHQC","6ABVDTXZOHVUDZDKDQS256F74LFIMM5DO3OZWHKRXZBUTPII4WAQC","AAERM7PBDVDFDEEXZ7UJ5WWQF7SPEJQQYXRBZ63ETB5YAVIECHMAC","CESJ4CTO26X4GBZBPXRXLOJT3JQJOGFN5EJSNAAZELNQRZF7QSYAC","7FYXVNAB6JAP3CJKE4MY57UWYSUPEXFVER6K264BSKYHVU6V4SGQC","3NMKD6I57ONAGHEN4PZIAV2KPYESVR4JL3DTWSHXKCMVJBEQ4GIQC","C6W7N6N57UCNHEV55HEZ3G7WN2ZOBGMFBB5M5ZPDB2HNNHHTOPBQC","S2444K42FJFLTQMMU6PAVA4YRQGDNCMIFBQ5VO2LCD4GJ7LUCRYQC","7M4UI3TWQIAA333GQ577HDWDWZPSZKWCYG556L6SBRLB6SZDQYPAC","7X4MEZJUMLYYIBV7ANLADELOZ7I7AJ5CKFAR35CJ2SBZDDVJFZOQC","MABGENI7CW5F5D3BFUJ7BS2H7XPYG4F3UMWGDPFFSMCCZKUUDLDQC","EAPOUW73YRB5FPBHD6Z2DR33Y7CZGEPM2C4UVOHAOH3OVINVE4FAC","6XEMHUGSNX5YSWZYM7PZUTTUMFODMGO74QLHGEXQ5LAC7LPS7JNQC","RUCC2HKZZTUHN3G6IWS4NK3VYGXAI6PORJH2YZKPRAYSDWH63ESQC","Y6YSEDJMU4RLAQG4LJUV5MN6Q2KK2FWOBBIIQY2ZUVM2PREVSNFAC"]},"hunks":[{"Replacement":{"inode":{"change":7,"pos":140},"path":"l10n_embed_derive/tests/selectors.rs","line":12,"ins":{"up_context":[{"change":7,"pos":23}],"down_context":[{"change":7,"pos":24}],"flag":"BLOCK","start":0,"end":165,"inode":{"change":7,"pos":140}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":23},"to":{"change":7,"start":396,"end":431},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":114},"to":{"change":7,"start":396,"end":431},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":396},"to":{"change":7,"start":396,"end":431},"introduced_by":7}],"inode":{"change":7,"pos":140}},"ins_contents":[{"Add":" Numbers { unread_emails: u64 },"},{"Add":" Plurals { unread_emails: u64 },"},{"Add":"}"},{"Add":""},{"Add":"#[localize(\"tests/locale/**/selectors.ftl\")]"},{"Add":"pub struct Numbers {"},{"Add":" unread_emails: u64,"}],"del_contents":[{"Del":" Emails { unread_emails: u64 },\n"}]}},{"Replacement":{"inode":{"change":7,"pos":140},"path":"l10n_embed_derive/tests/selectors.rs","line":22,"ins":{"up_context":[{"change":7,"pos":72}],"down_context":[{"change":7,"pos":92}],"flag":"BLOCK","start":166,"end":187,"inode":{"change":7,"pos":140}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":72},"to":{"change":7,"start":72,"end":92},"introduced_by":7}],"inode":{"change":7,"pos":140}},"ins_contents":[{"Add":"pub struct Plurals {"}],"del_contents":[{"Del":"pub struct Emails {\n"}]}},{"Edit":{"inode":{"change":7,"pos":140},"path":"l10n_embed_derive/tests/selectors.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":65}],"down_context":[{"change":7,"pos":35}],"flag":"BLOCK","start":188,"end":1214,"inode":{"change":7,"pos":140}}},"contents":[{"Add":"#[case::zero_en(locale!(\"en-US\"), 0, \"You have no unread emails.\")]"},{"Add":"#[case::one_en(locale!(\"en-US\"), 1, \"You have an unread email.\")]"},{"Add":"#[case::two_en(locale!(\"en-US\"), 2, \"You have 2 unread emails.\")]"},{"Add":"#[case::max_en("},{"Add":" locale!(\"en-US\"),"},{"Add":" u64::MAX,"},{"Add":" \"You have 18,446,744,073,709,551,615 unread emails.\""},{"Add":")]"},{"Add":"#[case::zero_fr(locale!(\"fr\"), 0, \"Vous n'avez aucun e-mail non lu.\")]"},{"Add":"#[case::one_fr(locale!(\"fr\"), 1, \"Vous avez un e-mail non lu.\")]"},{"Add":"#[case::two_fr(locale!(\"fr\"), 2, \"Vous avez 2 e-mails non lus.\")]"},{"Add":"#[case::max_fr(locale!(\"fr\"), u64::MAX, \"Vous avez 18 446 744 073 709 551 615 e-mails non lus.\")]"},{"Add":"fn numbers(#[case] locale: Locale, #[case] unread_emails: u64, #[case] expected_message: String) {"},{"Add":" compare_message(Numbers { unread_emails }, &expected_message, locale.clone());"},{"Add":" compare_message("},{"Add":" MessageEnum::Numbers { unread_emails },"},{"Add":" expected_message,"},{"Add":" locale,"},{"Add":" );"},{"Add":"}"},{"Add":""},{"Add":"/// End-to-end test of locale-specific selectors implementation by checking final output"},{"Add":"#[rstest]"}]}},{"Replacement":{"inode":{"change":7,"pos":140},"path":"l10n_embed_derive/tests/selectors.rs","line":63,"ins":{"up_context":[{"change":7,"pos":562}],"down_context":[{"change":6,"pos":82}],"flag":"BLOCK","start":1215,"end":1397,"inode":{"change":7,"pos":140}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":562},"to":{"change":3,"start":603,"end":620},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":620},"to":{"change":7,"start":563,"end":591},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1090},"to":{"change":7,"start":563,"end":591},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":591},"to":{"change":7,"start":702,"end":772},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":702},"to":{"change":7,"start":702,"end":772},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":772},"to":{"change":7,"start":1186,"end":1190},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1186},"to":{"change":7,"start":1186,"end":1190},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1190},"to":{"change":6,"start":0,"end":82},"introduced_by":6}],"inode":{"change":7,"pos":140}},"ins_contents":[{"Add":"fn plurals(#[case] locale: Locale, #[case] unread_emails: u64, #[case] expected_message: String) {"},{"Add":" compare_message(Plurals { unread_emails }, &expected_message, locale.clone());"}],"del_contents":[{"Del":"fn localize_for(\n"},{"Del":" #[case] locale: Locale,\n"},{"Del":" #[case] unread_emails: u64,\n #[case] expected_message: String,\n"},{"Del":") {\n"},{"Del":" compare_message(Emails { unread_emails }, &expected_message, locale.clone());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":140},"path":"l10n_embed_derive/tests/selectors.rs","line":66,"ins":{"up_context":[{"change":6,"pos":103}],"down_context":[{"change":6,"pos":150}],"flag":"BLOCK","start":1398,"end":1446,"inode":{"change":7,"pos":140}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":103},"to":{"change":6,"start":103,"end":150},"introduced_by":6}],"inode":{"change":7,"pos":140}},"ins_contents":[{"Add":" MessageEnum::Plurals { unread_emails },"}],"del_contents":[{"Del":" MessageEnum::Emails { unread_emails },\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1578},"path":"l10n_embed_derive/tests/locale/fr/selectors.ftl","line":1,"ins":{"up_context":[{"change":7,"pos":1578}],"down_context":[{"change":7,"pos":1588}],"flag":"BLOCK","start":1447,"end":1812,"inode":{"change":7,"pos":1578}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1578},"to":{"change":7,"start":1579,"end":1588},"introduced_by":7}],"inode":{"change":7,"pos":1578}},"ins_contents":[{"Add":"# Selectors example from Fluent guide: https://projectfluent.org/fluent/guide/selectors.html"},{"Add":"# Poorly translated into French :)"},{"Add":""},{"Add":"numbers ="},{"Add":" { $unreadEmails ->"},{"Add":" [0] Vous n'avez aucun e-mail non lu."},{"Add":" [1] Vous avez un e-mail non lu."},{"Add":" *[other] Vous avez { $unreadEmails } e-mails non lus."},{"Add":" }"},{"Add":""},{"Add":"# French singular includes both 0 and 1"},{"Add":"plurals ="}],"del_contents":[{"Del":"emails =\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1152},"path":"l10n_embed_derive/tests/locale/en-US/selectors.ftl","line":3,"ins":{"up_context":[{"change":7,"pos":276}],"down_context":[{"change":7,"pos":1162}],"flag":"BLOCK","start":1813,"end":1998,"inode":{"change":7,"pos":1152}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":276},"to":{"change":7,"start":1153,"end":1162},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1152},"to":{"change":7,"start":1153,"end":1162},"introduced_by":7}],"inode":{"change":7,"pos":1152}},"ins_contents":[{"Add":"numbers ="},{"Add":" { $unreadEmails ->"},{"Add":" [0] You have no unread emails."},{"Add":" [1] You have an unread email."},{"Add":" *[other] You have { $unreadEmails } unread emails."},{"Add":" }"},{"Add":""},{"Add":"plurals ="}],"del_contents":[{"Del":"emails =\n"}]}},{"Edit":{"inode":{"change":7,"pos":992},"path":"l10n_embed_derive/src/fluent/mod.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1058}],"down_context":[{"change":7,"pos":1082}],"flag":"BLOCK","start":1999,"end":2028,"inode":{"change":7,"pos":992}}},"contents":[{"Add":"use std::num::ParseIntError;"}]}},{"Edit":{"inode":{"change":7,"pos":992},"path":"l10n_embed_derive/src/fluent/mod.rs","line":47,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":336}],"down_context":[{"change":5,"pos":336}],"flag":"BLOCK","start":2029,"end":2420,"inode":{"change":7,"pos":992}}},"contents":[{"Add":" // span: SourceSpan,"},{"Add":" },"},{"Add":" #[error(\"invalid number literal\")]"},{"Add":" InvalidNumberLiteral {"},{"Add":" invalid_literal: String,"},{"Add":" parse_error: ParseIntError,"},{"Add":" #[source_code]"},{"Add":" source_code: NamedSource,"},{"Add":" // TODO: blocked on https://github.com/projectfluent/fluent-rs/pull/373"},{"Add":" // #[label(\"This can't be parsed as an unsigned 128-bit integer\")]"}]}},{"Edit":{"inode":{"change":7,"pos":992},"path":"l10n_embed_derive/src/fluent/mod.rs","line":59,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1364}],"down_context":[{"change":7,"pos":1364}],"flag":"BLOCK","start":2421,"end":2860,"inode":{"change":7,"pos":992}}},"contents":[{"Add":" #[error(\"invalid identifier type\")]"},{"Add":" InvalidIdentifierType {"},{"Add":" invalid_identifier: String,"},{"Add":" expected_type: ast::VariantType,"},{"Add":" found_type: ast::VariantType,"},{"Add":" #[source_code]"},{"Add":" source_code: NamedSource,"},{"Add":" // TODO: blocked on https://github.com/projectfluent/fluent-rs/pull/373"},{"Add":" // #[label(\"This can't be parsed as an unsigned 128-bit integer\")]"},{"Add":" // span: SourceSpan,"},{"Add":" },"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":7,"ins":{"up_context":[{"change":7,"pos":807}],"down_context":[{"change":7,"pos":2329}],"flag":"BLOCK","start":2861,"end":2970,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":807},"to":{"change":7,"start":5591,"end":5675},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1537},"to":{"change":7,"start":5591,"end":5675},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2217},"to":{"change":7,"start":5591,"end":5675},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":"use fluent_syntax::ast::{"},{"Add":" Expression, InlineExpression, Pattern, PatternElement, Variant, VariantKey,"},{"Add":"};"}],"del_contents":[{"Del":"use fluent_syntax::ast::{Expression, InlineExpression, PatternElement, VariantKey};\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":11,"ins":{"up_context":[{"change":7,"pos":2386}],"down_context":[{"change":7,"pos":216}],"flag":"BLOCK","start":2971,"end":3056,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":2437},"to":{"change":7,"start":182,"end":216},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5700},"to":{"change":7,"start":182,"end":216},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":182},"to":{"change":7,"start":182,"end":216},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":"use proc_macro2::{Literal, TokenStream};"},{"Add":"use quote::{ToTokens, format_ident, quote};"}],"del_contents":[{"Del":"use quote::{format_ident, quote};\n"}]}},{"Edit":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":14,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":238}],"down_context":[{"change":7,"pos":238}],"flag":"BLOCK","start":3057,"end":3364,"inode":{"change":7,"pos":33}}},"contents":[{"Add":""},{"Add":"#[derive(PartialEq, Eq, Clone, Copy, Debug)]"},{"Add":"pub enum VariantType {"},{"Add":" Integer,"},{"Add":" Plural,"},{"Add":"}"},{"Add":""},{"Add":"struct Select<'variants> {"},{"Add":" variant_type: VariantType,"},{"Add":" default_pattern: TokenStream,"},{"Add":" default_expression: &'variants Pattern,"},{"Add":" match_arms: Vec<(TokenStream, &'variants Pattern)>,"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":40,"ins":{"up_context":[{"change":5,"pos":639}],"down_context":[{"change":7,"pos":6888}],"flag":"BLOCK","start":3365,"end":3439,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":639},"to":{"change":7,"start":1293,"end":1528},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1088},"to":{"change":7,"start":1293,"end":1528},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3286},"to":{"change":7,"start":1293,"end":1528},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" let select = select(&message_context, variants)?;"}],"del_contents":[{"Del":" let match_target = inline_expression(selector, message_context)?;\n let default_arm = OnceCell::new();\n let mut additional_arms = Vec::with_capacity(variants.len());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":42,"ins":{"up_context":[{"change":7,"pos":6889}],"down_context":[{"change":7,"pos":2520}],"flag":"BLOCK","start":3440,"end":4285,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6889},"to":{"change":7,"start":6889,"end":6939},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6939},"to":{"change":7,"start":1529,"end":1610},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1610},"to":{"change":5,"start":640,"end":709},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":78},"to":{"change":7,"start":1611,"end":1755},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":5,"pos":709},"to":{"change":7,"start":1611,"end":1755},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7086},"to":{"change":7,"start":1611,"end":1755},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1755},"to":{"change":4,"start":1064,"end":1191},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":7,"pos":371},"to":{"change":7,"start":7266,"end":7408},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1191},"to":{"change":7,"start":7266,"end":7408},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1728},"to":{"change":7,"start":7266,"end":7408},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1869},"to":{"change":7,"start":7266,"end":7408},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2276},"to":{"change":7,"start":7266,"end":7408},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7266},"to":{"change":7,"start":7266,"end":7408},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7408},"to":{"change":7,"start":1870,"end":1954},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1954},"to":{"change":7,"start":7486,"end":7691},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7486},"to":{"change":7,"start":7486,"end":7691},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7691},"to":{"change":7,"start":1955,"end":2145},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7763},"to":{"change":7,"start":2146,"end":2422},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2422},"to":{"change":7,"start":8138,"end":8175},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8138},"to":{"change":7,"start":8138,"end":8175},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8175},"to":{"change":7,"start":2423,"end":2520},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" let raw_match_target = inline_expression(selector, message_context)?;"},{"Add":" let match_target = match select.variant_type {"},{"Add":" VariantType::Integer { .. } => quote!(#raw_match_target),"},{"Add":" VariantType::Plural { .. } => {"},{"Add":" // Only dereference if enum variant"},{"Add":" let category_reference ="},{"Add":" match message_context.derive_context.reference_kind {"},{"Add":" ReferenceKind::EnumField => quote!(*#raw_match_target),"},{"Add":" ReferenceKind::StructField => quote!(#raw_match_target),"},{"Add":" };"},{"Add":" quote!(plural_rules.category_for(#category_reference))"}],"del_contents":[{"Del":" for variant in variants {\n"},{"Del":" let variant_pattern: syn::Pat = match &variant.key {\n"},{"Del":" VariantKey::Identifier { name } => {\n"},{"Del":" let ident_pascal_case =\n format_ident!(\"{}\", name.to_pascal_case());\n"},{"Del":" parse_quote!(::l10n_embed::macro_prelude::icu_plurals::PluralCategory::#ident_pascal_case)\n"},{"Del":" }\n VariantKey::NumberLiteral { .. } => todo!(),\n };\n"},{"Del":"\n // Create a new `MessageContext` for each variant body\n"},{"Del":" let variant_context = MessageContext {\n pattern: &variant.value,\n ..message_context\n };\n"},{"Del":" let variant_body = message_body(variant_context)?;\n\n // The default pattern must go last so we don't generate invalid match stataments\n"},{"Del":" if variant.default {\n default_arm\n .set(quote!(#variant_pattern | _ => #variant_body))\n .expect(\"Multiple default patterns for match statement.\");\n"},{"Del":" } else {\n"},{"Del":" additional_arms.push(quote!(#variant_pattern => #variant_body));\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":54,"ins":{"up_context":[{"change":7,"pos":2550}],"down_context":[{"change":7,"pos":3624}],"flag":"BLOCK","start":4286,"end":4313,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2550},"to":{"change":7,"start":2550,"end":2576},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" };"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":56,"ins":{"up_context":[{"change":7,"pos":3625}],"down_context":[{"change":7,"pos":8350}],"flag":"BLOCK","start":4314,"end":4614,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3625},"to":{"change":2,"start":83,"end":165},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":165},"to":{"change":7,"start":2634,"end":2704},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2634},"to":{"change":7,"start":2634,"end":2704},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" let default_match_pattern = select.default_pattern;"},{"Add":" let default_match_expression = message_body(MessageContext {"},{"Add":" pattern: select.default_expression,"},{"Add":" ..message_context"},{"Add":" })?;"}],"del_contents":[{"Del":" // The parser should guarantee a default arm is available\n"},{"Del":" let default_arm = default_arm.get().unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":62,"ins":{"up_context":[{"change":7,"pos":8351}],"down_context":[{"change":7,"pos":711}],"flag":"BLOCK","start":4615,"end":5381,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8351},"to":{"change":7,"start":360,"end":711},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" let match_patterns = select"},{"Add":" .match_arms"},{"Add":" .iter()"},{"Add":" .map(|(pattern, _expression)| pattern)"},{"Add":" .collect::>();"},{"Add":" let match_expressions = select"},{"Add":" .match_arms"},{"Add":" .iter()"},{"Add":" .map(|(_match_pattern, expression)| {"},{"Add":" message_body(MessageContext {"},{"Add":" pattern: expression,"},{"Add":" ..message_context"},{"Add":" })"},{"Add":" })"},{"Add":" .collect::, Error>>()?;"}],"del_contents":[{"Del":" // Only dereference if enum variant\n let category_reference = match message_context.derive_context.reference_kind {\n ReferenceKind::EnumField => quote!(*#match_target),\n ReferenceKind::StructField => quote!(#match_target),\n };\n"}]}},{"Replacement":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":79,"ins":{"up_context":[{"change":7,"pos":3664}],"down_context":[{"change":7,"pos":3778}],"flag":"BLOCK","start":5382,"end":5592,"inode":{"change":7,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3664},"to":{"change":7,"start":713,"end":796},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":796},"to":{"change":7,"start":2782,"end":2882},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1616},"to":{"change":7,"start":2782,"end":2882},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2782},"to":{"change":7,"start":2782,"end":2882},"introduced_by":7}],"inode":{"change":7,"pos":33}},"ins_contents":[{"Add":" match #match_target {"},{"Add":" #(#match_patterns => #match_expressions),*"},{"Add":" #default_match_pattern => #default_match_expression,"}],"del_contents":[{"Del":" match plural_rules.category_for(#category_reference) {\n"},{"Del":" #(#additional_arms,)*\n #default_arm,\n"}]}},{"Edit":{"inode":{"change":7,"pos":33},"path":"l10n_embed_derive/src/fluent/ast.rs","line":101,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1629}],"down_context":[{"change":7,"pos":4128}],"flag":"BLOCK","start":5593,"end":10290,"inode":{"change":7,"pos":33}}},"contents":[{"Add":"fn select<'variants>("},{"Add":" message_context: &MessageContext,"},{"Add":" variants: &'variants Vec>,"},{"Add":") -> Result, Error> {"},{"Add":" let expected_variant_type = OnceCell::new();"},{"Add":""},{"Add":" for variant in variants {"},{"Add":" let variant_type = match &variant.key {"},{"Add":" VariantKey::Identifier { name } => match name.as_str() {"},{"Add":" // \"other\" is ambiguous as it could be used for plurals or as the default integer case"},{"Add":" \"other\" => None,"},{"Add":" _ => Some(VariantType::Plural),"},{"Add":" },"},{"Add":" VariantKey::NumberLiteral { .. } => Some(VariantType::Integer),"},{"Add":" };"},{"Add":""},{"Add":" // Make sure all variants are of the same type"},{"Add":" if let Some(variant_kind) = variant_type {"},{"Add":" let expected_type = expected_variant_type.get_or_init(|| variant_kind);"},{"Add":" if *expected_type != variant_kind {"},{"Add":" todo!()"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" match expected_variant_type.get().unwrap() {"},{"Add":" VariantType::Integer => select_integers(message_context, variants),"},{"Add":" VariantType::Plural => select_plurals(message_context, variants),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn select_integers<'variants>("},{"Add":" message_context: &MessageContext,"},{"Add":" variants: &'variants Vec>,"},{"Add":") -> Result, Error> {"},{"Add":" let mut default_expression = OnceCell::new();"},{"Add":" let mut match_arms = Vec::new();"},{"Add":""},{"Add":" for variant in variants {"},{"Add":" match &variant.key {"},{"Add":" VariantKey::Identifier { name } => match name.to_lowercase().as_str() {"},{"Add":" \"other\" => default_expression"},{"Add":" .set(&variant.value)"},{"Add":" .expect(\"Multiple default variants\"),"},{"Add":" _ => {"},{"Add":" return Err(Error::InvalidIdentifierType {"},{"Add":" invalid_identifier: name.clone(),"},{"Add":" expected_type: VariantType::Integer,"},{"Add":" found_type: VariantType::Plural,"},{"Add":" source_code: message_context.source.named_source.clone(),"},{"Add":" });"},{"Add":" }"},{"Add":" },"},{"Add":" VariantKey::NumberLiteral { value } => {"},{"Add":" let parsed_integer: u128 = match value.parse() {"},{"Add":" Ok(integer) => integer,"},{"Add":" Err(parse_error) => {"},{"Add":" return Err(Error::InvalidNumberLiteral {"},{"Add":" invalid_literal: value.clone(),"},{"Add":" parse_error,"},{"Add":" source_code: message_context.source.named_source.clone(),"},{"Add":" });"},{"Add":" }"},{"Add":" };"},{"Add":" let integer_literal = Literal::u128_unsuffixed(parsed_integer);"},{"Add":""},{"Add":" match_arms.push((integer_literal.to_token_stream(), &variant.value));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let default_expression = default_expression.take().expect(\"No default variant\");"},{"Add":" Ok(Select {"},{"Add":" variant_type: VariantType::Integer,"},{"Add":" default_pattern: quote!(_),"},{"Add":" default_expression,"},{"Add":" match_arms,"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"fn select_plurals<'variants>("},{"Add":" message_context: &MessageContext,"},{"Add":" variants: &'variants Vec>,"},{"Add":") -> Result, Error> {"},{"Add":" let mut default_arm = OnceCell::new();"},{"Add":" let mut match_arms = Vec::new();"},{"Add":""},{"Add":" for variant in variants {"},{"Add":" match &variant.key {"},{"Add":" VariantKey::Identifier { name } => {"},{"Add":" let name_pascal_case = name.to_pascal_case();"},{"Add":" let ident = syn::Ident::new(&name_pascal_case, proc_macro2::Span::call_site());"},{"Add":" let pattern ="},{"Add":" quote!(::l10n_embed::macro_prelude::icu_plurals::PluralCategory::#ident);"},{"Add":""},{"Add":" match variant.default {"},{"Add":" // The default arm should include any enum variants not matched"},{"Add":" true => default_arm"},{"Add":" .set((quote!(#pattern | _), &variant.value))"},{"Add":" .expect(\"Multiple default variants\"),"},{"Add":" false => match_arms.push((pattern, &variant.value)),"},{"Add":" }"},{"Add":" }"},{"Add":" VariantKey::NumberLiteral { value } => {"},{"Add":" return Err(Error::InvalidIdentifierType {"},{"Add":" invalid_identifier: value.clone(),"},{"Add":" expected_type: VariantType::Plural,"},{"Add":" found_type: VariantType::Integer,"},{"Add":" source_code: message_context.source.named_source.clone(),"},{"Add":" });"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let (default_pattern, default_expression) = default_arm.take().expect(\"No default variant\");"},{"Add":" Ok(Select {"},{"Add":" variant_type: VariantType::Plural,"},{"Add":" default_pattern,"},{"Add":" default_expression,"},{"Add":" match_arms,"},{"Add":" })"},{"Add":"}"},{"Add":""}]}}],"owner":"finchie","repo":"l10n_embed","token":"xS6lgmDP38/ycvPcmpLnpIlB0zaOOcAbM9DeRRBRD1w=","login":null}

…

Dependencies

Change contents