fix: polish tray issues and protected words v0.1.192

Author: radislabus-star

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lay"
-version = "0.1.191"
+version = "0.1.192"
 edition = "2021"
 description = "Alpha Double Shift RU/EN layout rescue for Linux desktops"
 license = "MIT"

Cargo.toml

@@ -483,6 +483,10 @@ systemctl --user restart lay-daemon
 
 Последние изменения публичной ветки:
 
+- `0.1.192` — `protected_words.txt` теперь защищает и ASCII-токены, включая
+  короткие слова вроде `vs`, а раздел `Коррекция` в GNOME tray снова вынесен
+  отдельным пунктом, а не спрятан внутрь `Арбитра`. `Pause` также доступен
+  как основной триггер исправления, а не только как прямой RU/EN хоткей.
 - `0.1.191` — live-автозамена получила контекстный `layout_en_to_ru` слой:
   одиночное `'nj` и смешанный текст вроде `worked 'nj` теперь исправляются в
   `это`, но технические хвосты вроде `git`, `wi-fi`, `status;` не запускают

README.md

@@ -22,9 +22,9 @@ const STATS_PATH = GLib.get_home_dir() + '/.local/share/lay/stats.json';
 const RECENT_ACTIONS_PATH = GLib.get_home_dir() + '/.local/share/lay/recent_actions.jsonl';
 const PROJECT_DIR = GLib.get_home_dir() + '/projects/lay';
 const UPDATE_LOG_PATH = GLib.get_home_dir() + '/.local/state/lay/update.log';
-const APP_VERSION = '0.1.191';
+const APP_VERSION = '0.1.192';
 const APP_DESCRIPTION = 'Alpha RU/EN layout helper: double Shift и помощь при наборе';
-const APP_RELEASE_DATE = '2026-05-22';
+const APP_RELEASE_DATE = '2026-05-23';
 const APP_LICENSE = 'MIT';
 const APP_URL = 'https://github.com/radislabus-star/lay-public';
 const APP_PLATFORM = 'Linux desktops: GNOME, KDE, Wayland, X11';
@@ -657,6 +657,7 @@ class LayIndicator extends PanelMenu.Button {
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addMenuItem(this._arbiterMenu());
+        this.menu.addMenuItem(this._correctionPipelineMenu());
         this.menu.addMenuItem(this._recentActionsMenu());
         this.menu.addMenuItem(this._ptahAlexsMenu());
         this.menu.addMenuItem(this._triggerMenu());
@@ -784,8 +785,6 @@ class LayIndicator extends PanelMenu.Button {
                 restartDaemon();
             }],
         ], this._backendButtons));
-        item.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        item.menu.addMenuItem(this._correctionPipelineMenu());
         return item;
     }
 
@@ -1265,6 +1264,7 @@ class LayIndicator extends PanelMenu.Button {
             ['single-rshift', 'RShift'],
             ['single-rctrl', 'RCtrl'],
             ['single-ralt', 'RAlt'],
+            ['single-pause', 'Pause'],
         ]) {
             const row = new PopupMenu.PopupMenuItem(label);
             row.connect('activate', () => this._setTrigger(id));

extension/lay@radislabus-star.github.io/lay-impl.js

@@ -1,8 +1,8 @@
 {
     "uuid": "lay@radislabus-star.github.io",
     "name": "Lay Layout Switcher",
-    "version": 191,
-    "version-name": "0.1.191",
+    "version": 192,
+    "version-name": "0.1.192",
     "description": "Alpha GNOME Shell extension для lay-daemon. Показывает EN/RU в трее, переключает раскладку по клику. Минимальный DBus bridge для layout activation и fallback text insert.",
     "shell-version": ["45", "46", "47", "50"],
     "url": "https://github.com/radislabus-star/lay-public"

extension/lay@radislabus-star.github.io/metadata.json

@@ -166,6 +166,15 @@ fn typing_assist_auto_switch_keeps_english_and_protected_ascii() {
     assert_eq!(apply_typing_assist("grep --color=auto ", true), None);
 }
 
+#[test]
+fn typing_assist_keeps_user_protected_ascii_words_when_configured() {
+    if std::env::var_os("LAY_TEST_USER_PROTECTED_ASCII").is_none() {
+        return;
+    }
+
+    assert_eq!(apply_typing_assist("vs ", true), None);
+}
+
 #[test]
 fn typing_assist_pipeline_can_disable_rules() {
     let no_en_to_ru = typing_pipeline_with_disabled(&["layout_en_to_ru"]);

src/bin/lay_daemon/tests/typing_assist_rules.rs

@@ -8,7 +8,10 @@ use std::collections::HashSet;
 use std::sync::OnceLock;
 
 use crate::keyboard::is_cyrillic_letter;
-use crate::lexicon::{is_common_en_technical_word, is_ru_hyphen_particle, EN_HUNSPELL, EN_WORDS};
+use crate::lexicon::{
+    extend_user_protected_ascii_words, is_common_en_technical_word, is_ru_hyphen_particle,
+    EN_HUNSPELL, EN_WORDS,
+};
 use crate::phrase_lexicon::is_common_short_russian_preposition;
 use crate::ru_typo::has_plausible_russian_typo_candidate;
 use crate::russian_chars::is_russian_vowel;
@@ -382,6 +385,7 @@ fn english_dictionary() -> &'static HashSet<String> {
         if let Ok(extra) = load_ascii_word_list_min_len(EN_WORDS, 4) {
             words.extend(extra);
         }
+        extend_user_protected_ascii_words(&mut words, 1);
         words
     })
 }

src/layout_autoswitch.rs

@@ -5,6 +5,7 @@
 //! sets so runtime checks stay cheap and platform-neutral.
 
 use std::collections::HashSet;
+use std::path::Path;
 use std::sync::OnceLock;
 
 pub const RU_HUNSPELL: &str = "/usr/share/hunspell/ru_RU.dic";
@@ -37,6 +38,7 @@ pub fn warm_up() {
     let _ = ru_hyphen_particles().len();
     let _ = visual_b_default_replacement();
     let _ = visual_b_after_ascii_replacement();
+    let _ = user_protected_ascii_words().len();
 }
 
 pub fn is_common_ru_word(word: &str) -> bool {
@@ -79,10 +81,39 @@ pub fn visual_b_after_ascii_replacement() -> &'static str {
     first_data_word(VISUAL_B_AFTER_ASCII_DATA)
 }
 
+pub fn is_user_protected_ascii_word(word: &str) -> bool {
+    if !word.is_ascii() {
+        return false;
+    }
+    user_protected_ascii_words().contains(&word.to_ascii_lowercase())
+}
+
+pub fn extend_user_protected_ascii_words(words: &mut HashSet<String>, min_chars: usize) {
+    words.extend(
+        user_protected_ascii_words()
+            .iter()
+            .filter(|word| word.chars().count() >= min_chars)
+            .cloned(),
+    );
+}
+
 pub fn extend_common_ru_words(words: &mut HashSet<String>) {
     words.extend(common_ru_words().iter().cloned());
 }
 
+fn user_protected_ascii_words() -> &'static HashSet<String> {
+    static WORDS: OnceLock<HashSet<String>> = OnceLock::new();
+    WORDS.get_or_init(|| {
+        let Some(home) = std::env::var_os("HOME") else {
+            return HashSet::new();
+        };
+        let path = std::path::PathBuf::from(home).join(PROTECTED_WORDS_PATH);
+        load_plain_words(&path)
+            .map(|words| ascii_words_from_iter(words, 1))
+            .unwrap_or_default()
+    })
+}
+
 fn common_ru_words() -> &'static HashSet<String> {
     static WORDS: OnceLock<HashSet<String>> = OnceLock::new();
     WORDS.get_or_init(|| parse_word_data(COMMON_RU_DATA))
@@ -131,6 +162,39 @@ fn parse_word_data(data: &str) -> HashSet<String> {
         .collect()
 }
 
+#[cfg(test)]
+pub(crate) fn parse_ascii_word_data(data: &str, min_chars: usize) -> HashSet<String> {
+    ascii_words_from_iter(
+        data.lines()
+            .map(str::trim)
+            .filter(|line| !line.is_empty() && !line.starts_with('#'))
+            .map(str::to_string),
+        min_chars,
+    )
+}
+
+fn ascii_words_from_iter<I>(words: I, min_chars: usize) -> HashSet<String>
+where
+    I: IntoIterator<Item = String>,
+{
+    words
+        .into_iter()
+        .map(|word| word.trim().to_ascii_lowercase())
+        .filter(|word| word.chars().count() >= min_chars)
+        .filter(|word| {
+            word.is_ascii()
+                && word
+                    .chars()
+                    .all(|ch| ch.is_ascii_alphabetic() || ch == '-' || ch == '_')
+        })
+        .collect()
+}
+
+fn load_plain_words(path: &Path) -> std::io::Result<HashSet<String>> {
+    let text = std::fs::read_to_string(path)?;
+    Ok(parse_word_data(&text))
+}
+
 fn first_data_word(data: &'static str) -> &'static str {
     data.lines()
         .map(str::trim)

src/lexicon.rs

@@ -15,3 +15,24 @@ fn lexical_data_loads_without_code_word_lists() {
     assert_eq!(visual_b_after_ascii_replacement(), "и");
     assert!(!is_common_en_technical_word("hello"));
 }
+
+#[test]
+fn protected_ascii_words_parser_keeps_short_user_tokens() {
+    let words = parse_ascii_word_data(
+        r#"
+        # comments are ignored
+        vs
+        WPS
+        AmoCRM
+        привет
+        wi-fi
+        "#,
+        1,
+    );
+
+    assert!(words.contains("vs"));
+    assert!(words.contains("wps"));
+    assert!(words.contains("amocrm"));
+    assert!(words.contains("wi-fi"));
+    assert!(!words.contains("привет"));
+}

src/lexicon_tests.rs

@@ -8,7 +8,8 @@ use std::sync::OnceLock;
 
 use crate::keyboard::is_cyrillic_letter;
 use crate::lexicon::{
-    is_common_en_technical_word, is_common_ru_word, EN_HUNSPELL, EN_WORDS, RU_HUNSPELL,
+    extend_user_protected_ascii_words, is_common_en_technical_word, is_common_ru_word,
+    is_user_protected_ascii_word, EN_HUNSPELL, EN_WORDS, RU_HUNSPELL,
 };
 use crate::word_reader::split_word_punctuation;
 
@@ -239,7 +240,8 @@ pub fn is_protected_ascii_token(core: &str) -> bool {
         return false;
     }
     core.is_ascii()
-        && (has_domain_like_dot(core)
+        && (is_user_protected_ascii_word(core)
+            || has_domain_like_dot(core)
             || core.contains('@')
             || core.contains("://")
             || core.contains('/')
@@ -355,6 +357,7 @@ fn english_words() -> &'static HashSet<String> {
                     .map(|word| word.to_ascii_lowercase()),
             );
         }
+        extend_user_protected_ascii_words(&mut words, 1);
         words
     })
 }