From ba4b05d429baab1883ab5068fb3bfdff8309ef44 Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Sat, 26 Oct 2019 22:35:16 +0200 Subject: [PATCH 1/4] Version bump 0.3.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad44ddf..6dc1397 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -370,7 +370,7 @@ dependencies = [ [[package]] name = "espanso" -version = "0.3.2" +version = "0.3.3" dependencies = [ "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 0419878..ea6d5d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espanso" -version = "0.3.2" +version = "0.3.3" authors = ["Federico Terzi "] license = "GPL-3.0" description = "Cross-platform Text Expander written in Rust" From 0237c9e0615e0b2e2d3215bd948ffe2a6862b4e8 Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Sat, 26 Oct 2019 22:37:38 +0200 Subject: [PATCH 2/4] Add the 22th Ascii character, produced by the CTRL+V combination on Linux, as word separator to workaround a bug that prevented multiple word matches from being expanded on Linux. --- src/config/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index 009526b..b5d264b 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -50,7 +50,7 @@ fn default_log_level() -> i32 { 0 } fn default_ipc_server_port() -> i32 { 34982 } fn default_use_system_agent() -> bool { true } fn default_config_caching_interval() -> i32 { 800 } -fn default_word_separators() -> Vec { vec![' ', ',', '.', '\r', '\n'] } +fn default_word_separators() -> Vec { vec![' ', ',', '.', '\r', '\n', 22u8 as char] } fn default_toggle_interval() -> u32 { 230 } fn default_backspace_limit() -> i32 { 3 } fn default_exclude_default_matches() -> bool {false} From bee17c262a3dd63ecb74952dabf82658c93e78d6 Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Fri, 1 Nov 2019 21:35:57 +0100 Subject: [PATCH 3/4] Fix #109 --- src/matcher/scrolling.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/matcher/scrolling.rs b/src/matcher/scrolling.rs index 330a01a..83db187 100644 --- a/src/matcher/scrolling.rs +++ b/src/matcher/scrolling.rs @@ -168,7 +168,10 @@ impl <'a, R: MatchReceiver, M: ConfigManager<'a>> super::Matcher for ScrollingMa last.clear(); } - let trailing_separator = if !is_current_word_separator { + let trailing_separator = if !mtc.word { + // If it's not a word match, it cannot have a trailing separator + None + } else if !is_current_word_separator { None }else{ let as_char = c.chars().nth(0); From f8ac042b8f01d4548d6b86a4bea3e0dc7336ca51 Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Sat, 2 Nov 2019 21:25:12 +0100 Subject: [PATCH 4/4] Change python version in CI pipeline to fix a VM image version bump that broke the process. --- ci/build-macos.yml | 2 +- ci/build-win.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build-macos.yml b/ci/build-macos.yml index d4fd4d9..4135ab4 100644 --- a/ci/build-macos.yml +++ b/ci/build-macos.yml @@ -1,7 +1,7 @@ steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.7.4' + versionSpec: '3.7' addToPath: true - script: | diff --git a/ci/build-win.yml b/ci/build-win.yml index cc2fc33..93aa37e 100644 --- a/ci/build-win.yml +++ b/ci/build-win.yml @@ -1,7 +1,7 @@ steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.7.4' + versionSpec: '3.7' addToPath: true - script: |