fix: repair ascii-prefixed layout tails

Author: radislabus-star

Cargo.lock

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

Cargo.toml

@@ -13,7 +13,7 @@ number from `git rev-list`.
 
 Current publication branch version:
 
-- `0.1.202`
+- `0.1.207`
 
 Do not rely on commit counts. Before publishing or pushing, run the bump script
 or verify the version fields manually.

VERSIONING.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.206';
+const APP_VERSION = '0.1.207';
 const APP_DESCRIPTION = 'Alpha RU/EN layout helper: double Shift и помощь при наборе';
-const APP_RELEASE_DATE = '2026-06-01';
+const APP_RELEASE_DATE = '2026-06-03';
 const APP_LICENSE = 'MIT';
 const APP_URL = 'https://github.com/radislabus-star/lay-public';
 const APP_PLATFORM = 'Linux desktops: GNOME, KDE, Wayland, X11';

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

@@ -1,8 +1,8 @@
 {
     "uuid": "lay@radislabus-star.github.io",
     "name": "Lay Layout Switcher",
-    "version": 206,
-    "version-name": "0.1.206",
+    "version": 207,
+    "version-name": "0.1.207",
     "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

@@ -1,7 +1,10 @@
 //! Technical-token layout corrections.
 
 use crate::keyboard::is_cyrillic_letter;
-use crate::word_recognizer::is_ascii_technical_token;
+use crate::token_language::is_known_ru_token;
+use crate::word_recognizer::{
+    is_ascii_technical_or_brand_token, is_ascii_technical_token, is_upper_ascii_acronym,
+};
 
 use super::hyphen::{
     has_known_cyrillic_hyphen_fragment, is_cyrillic_hyphenated_word_for_layout,
@@ -36,6 +39,10 @@ pub fn correct_duplicate_layout_prefix_on_ascii_token(token: &str) -> Option<Str
 }
 
 pub fn correct_wrong_layout_ascii_technical_token(token: &str) -> Option<String> {
+    if let Some(repaired) = correct_ascii_prefix_with_ru_layout_tail(token) {
+        return Some(repaired);
+    }
+
     if !token.contains('-') || !is_plain_cyrillic_technical_source(token) {
         return None;
     }
@@ -63,6 +70,33 @@ pub fn correct_wrong_layout_ascii_technical_token(token: &str) -> Option<String>
     }
 }
 
+fn correct_ascii_prefix_with_ru_layout_tail(token: &str) -> Option<String> {
+    let (prefix, tail) = token.split_once('-')?;
+    if prefix.is_empty()
+        || tail.is_empty()
+        || tail.contains('-')
+        || !tail.chars().all(|ch| ch.is_ascii_alphabetic())
+    {
+        return None;
+    }
+    if !is_ascii_layout_anchor(prefix) {
+        return None;
+    }
+
+    let converted_tail = crate::dict::convert(tail, crate::dict::Direction::Us2Ru);
+    if converted_tail == tail || !is_known_ru_token(&converted_tail) {
+        return None;
+    }
+
+    Some(format!("{prefix}-{converted_tail}"))
+}
+
+fn is_ascii_layout_anchor(prefix: &str) -> bool {
+    prefix.is_ascii()
+        && prefix.chars().any(|ch| ch.is_ascii_alphabetic())
+        && (is_upper_ascii_acronym(prefix) || is_ascii_technical_or_brand_token(prefix))
+}
+
 pub fn should_keep_plain_cyrillic_before_ascii_technical(original: &str, converted: &str) -> bool {
     original.chars().count() >= 4
         && original.chars().all(is_cyrillic_letter)

src/layout_autoswitch/technical.rs

@@ -112,9 +112,12 @@ fn language_delta(text: &CandidateTextPair<'_>) -> f64 {
     if !text.has_cyrillic() {
         return 0.0;
     }
-    crate::ngram::ru_candidate_margin(text.replacement, text.original)
-        .clamp(LANGUAGE_MARGIN_MIN, LANGUAGE_MARGIN_MAX)
-        * LANGUAGE_MARGIN_WEIGHT
+    let margin = crate::ngram::ru_candidate_margin(text.replacement, text.original);
+    if !margin.is_finite() {
+        return 0.0;
+    }
+
+    margin.clamp(LANGUAGE_MARGIN_MIN, LANGUAGE_MARGIN_MAX) * LANGUAGE_MARGIN_WEIGHT
 }
 
 fn structure_bonus(text: &CandidateTextPair<'_>) -> f64 {

src/typing_candidate/scoring.rs

@@ -86,6 +86,7 @@ fn score_components_are_finite_for_edge_inputs() {
         ("word", "", -1),
         ("словослитно ", "слово слитно ", 100),
         ("ошисбя", "ошибся", 130),
+        ("QR-rjlf", "QR-кода", 80),
     ] {
         let score = score_typing_candidate(original, replacement, "missing_letter", priority);
         assert!(score.total.is_finite(), "total must be finite: {score:?}");

src/typing_candidate_tests.rs

@@ -2,3 +2,5 @@
 из-за	None
 цш-аш	wi-fi
 15р-16р	None
+QR-rjlf	QR-кода
+QR-rjls	QR-коды