Rollup merge of #147396 - GuillaumeGomez:fluent-tidy-improvements, r=kobzol

Fluent tidy improvements
Follow-up of #147345 and of #147191.
It uses `fluent_syntax` to parse `fluent` files (but not for blessing, not even sure how the current one works).
I also added an `assert` to ensure we never go to previous situation where the `fluent` files were actually not checked at all.
cc ``@Kivooeo``
r? kobzol

Author: matthiaskrgr

src/tools/tidy/src/fluent_alphabetical.rs

@@ -5,6 +5,8 @@ use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
 
+use fluent_syntax::ast::Entry;
+use fluent_syntax::parser;
 use regex::Regex;
 
 usecrate::diagnostics::{CheckId,DiagCtx,RunningCheck};
@@ -24,30 +26,31 @@ fn check_alphabetic(
 check:&mutRunningCheck,
 all_defined_msgs:&mutHashMap<String,String>,
 ){
-letmut matches = message().captures_iter(fluent).peekable();
-whileletSome(m) = matches.next(){
-let name = m.get(1).unwrap();
-ifletSome(defined_filename) = all_defined_msgs.get(name.as_str()){
- check.error(format!(
-"{filename}: message `{}` is already defined in {defined_filename}",
- name.as_str(),
-));
-}
+letOk(resource) = parser::parse(fluent)else{
+panic!("Errors encountered while parsing fluent file `{filename}`");
+};
 
- all_defined_msgs.insert(name.as_str().to_owned(), filename.to_owned());
+letmut prev:Option<&str> = None;
 
-ifletSome(next) = matches.peek(){
-let next = next.get(1).unwrap();
-if name.as_str() > next.as_str(){
+for entry in&resource.body{
+ifletEntry::Message(msg) = entry {
+let name:&str = msg.id.name;
+ifletSome(defined_filename) = all_defined_msgs.get(name){
  check.error(format!(
-"{filename}: message `{}` appears before `{}`, but is alphabetically later than it
-run `./x.py test tidy --bless` to sort the file correctly",
- name.as_str(),
- next.as_str()
+"{filename}: message `{name}` is already defined in {defined_filename}",
 ));
+}else{
+ all_defined_msgs.insert(name.to_string(), filename.to_owned());
 }
-}else{
-break;
+ifletSome(prev) = prev
+ && prev > name
+{
+ check.error(format!(
+"{filename}: message `{prev}` appears before `{name}`, but is alphabetically \
+later than it. Run `./x.py test tidy --bless` to sort the file correctly",
+));
+}
+ prev = Some(name);
 }
 }
 }
@@ -115,5 +118,7 @@ pub fn check(path: &Path, bless: bool, diag_ctx: DiagCtx) {
 },
 );
 
+assert!(!all_defined_msgs.is_empty());
+
 crate::fluent_used::check(path, all_defined_msgs, diag_ctx);
 }