Merge branch 'master' into dictionary-curation-2026-06-15

Author: carlosroe

harper-cli/src/main.rs

@@ -128,7 +128,10 @@ enum Args {
         brief: bool,
     },
     /// Get all the forms of a word using the affixes.
-    Forms { line: String },
+    Forms {
+        #[arg(num_args = 1..)]
+        lines: Vec<String>,
+    },
     /// Emit a decompressed, line-separated list of the words in Harper's dictionary.
     Words,
     /// Summarize a lint record
@@ -210,7 +213,7 @@ enum Args {
     /// As long as there's either an open or hyphenated spelling.
     Compounds,
     /// Emit a decompressed, line-separated list of the words in Harper's dictionary
-    /// which occur in more than one lettercase variant.    
+    /// which occur in more than one lettercase variant.
     CaseVariants,
     /// Emit a list of each noun phrase contained within the input
     NominalPhrases {
@@ -436,65 +439,72 @@ fn main() -> anyhow::Result<()> {
 
             Ok(())
         }
-        Args::Forms { line } => {
-            let (word, annot) = line_to_parts(&line);
+        Args::Forms { lines } => {
+            for (i, line) in lines.iter().enumerate() {
+                if i > 0 {
+                    println!();
+                }
 
-            let curated_word_list = include_str!("../../harper-core/dictionary.dict");
-            let dict_lines = curated_word_list.split('\n');
+                let (word, annot) = line_to_parts(line);
 
-            let mut entry_in_dict = None;
+                let curated_word_list = include_str!("../../harper-core/dictionary.dict");
+                let dict_lines = curated_word_list.split('\n');
 
-            // Check if the word is contained in the list.
-            for dict_line in dict_lines {
-                let (dict_word, dict_annot) = line_to_parts(dict_line);
+                let mut entry_in_dict = None;
 
-                if dict_word == word {
-                    entry_in_dict = Some((dict_word, dict_annot));
-                    break;
-                }
-            }
+                // Check if the word is contained in the list.
+                for dict_line in dict_lines {
+                    let (dict_word, dict_annot) = line_to_parts(dict_line);
 
-            let summary = match &entry_in_dict {
-                Some((dict_word, dict_annot)) => {
-                    let mut status_summary = if dict_annot.is_empty() {
-                        format!("'{dict_word}' is already in the dictionary but not annotated.")
-                    } else {
-                        format!(
-                            "'{dict_word}' is already in the dictionary with annotation `{dict_annot}`."
-                        )
-                    };
+                    if dict_word == word {
+                        entry_in_dict = Some((dict_word, dict_annot));
+                        break;
+                    }
+                }
 
-                    if !annot.is_empty() {
-                        if annot.as_str() != dict_annot.as_str() {
-                            status_summary
-                                .push_str("\n  Your annotations differ from the dictionary.\n");
+                let summary = match &entry_in_dict {
+                    Some((dict_word, dict_annot)) => {
+                        let mut status_summary = if dict_annot.is_empty() {
+                            format!("'{dict_word}' is already in the dictionary but not annotated.")
                         } else {
-                            status_summary
-                                .push_str("\n  Your annotations are the same as the dictionary.\n");
+                            format!(
+                                "'{dict_word}' is already in the dictionary with annotation `{dict_annot}`."
+                            )
+                        };
+
+                        if !annot.is_empty() {
+                            if annot.as_str() != dict_annot.as_str() {
+                                status_summary
+                                    .push_str("\n  Your annotations differ from the dictionary.\n");
+                            } else {
+                                status_summary.push_str(
+                                    "\n  Your annotations are the same as the dictionary.\n",
+                                );
+                            }
                         }
+
+                        status_summary
                     }
+                    None => format!("'{word}' is not in the dictionary yet."),
+                };
 
-                    status_summary
-                }
-                None => format!("'{word}' is not in the dictionary yet."),
-            };
+                println!("{summary}");
 
-            println!("{summary}");
-
-            if let Some((dict_word, dict_annot)) = &entry_in_dict {
-                println!("Old, from the dictionary:");
-                print_word_derivations(dict_word, dict_annot, &FstDictionary::curated());
-            };
+                if let Some((dict_word, dict_annot)) = &entry_in_dict {
+                    println!("Old, from the dictionary:");
+                    print_word_derivations(dict_word, dict_annot, &FstDictionary::curated());
+                };
 
-            if !annot.is_empty() {
-                let rune_words = format!("1\n{line}");
-                let dict = MutableDictionary::from_rune_files(
-                    &rune_words,
-                    include_str!("../../harper-core/annotations.json"),
-                )?;
+                if !annot.is_empty() {
+                    let rune_words = format!("1\n{line}");
+                    let dict = MutableDictionary::from_rune_files(
+                        &rune_words,
+                        include_str!("../../harper-core/annotations.json"),
+                    )?;
 
-                println!("New, from you:");
-                print_word_derivations(&word, &annot, &dict);
+                    println!("New, from you:");
+                    print_word_derivations(&word, &annot, &dict);
+                }
             }
 
             Ok(())

harper-core/default_config.json

@@ -1317,6 +1317,13 @@
 								"label": "Expand Coordinate"
 							}
 						},
+						{
+							"Bool": {
+								"name": "ExpandDirectory",
+								"state": true,
+								"label": "Expand Directory"
+							}
+						},
 						{
 							"Bool": {
 								"name": "ExpandNotification",