Merge pull request #111 from federico-terzi/dev

Version 0.3.3

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)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "espanso"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Federico Terzi <federicoterzi96@gmail.com>"]
 license = "GPL-3.0"
 description = "Cross-platform Text Expander written in Rust"

ci/build-macos.yml

@@ -1,7 +1,7 @@
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.7.4'
+      versionSpec: '3.7'
       addToPath: true
 
   - script: |

ci/build-win.yml

@@ -1,7 +1,7 @@
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.7.4'
+      versionSpec: '3.7'
       addToPath: true
 
   - script: |

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<char> { vec![' ', ',', '.', '\r', '\n'] }
+fn default_word_separators() -> Vec<char> { 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}

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);