Skip to content

Commit 29f314c

Browse files
committed
Changed RegEx haystack case-sense option to take precendence over C option
1 parent 70a7732 commit 29f314c

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

Lib/XHotstring.ahk

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,14 @@ class XHotstring {
304304
if IsSet(HS) {
305305
HS.SendFunction := OptObj["S"] = "I" ? SendInput : OptObj["S"] = "E" ? SendEvent : OptObj["S"] = "P" ? SendPlay : HS.SendFunction
306306
HS.Trigger := HS.UnmodifiedTrigger
307-
RegExOptsExist := RegExMatch(HS.Trigger, "^([^(\\\s]+)\)", &RegExOpts:="")
308-
if OptObj["C"] = 1 {
309-
if RegExOptsExist && InStr(RegExOpts[], "i")
310-
HS.Trigger := StrReplace(HS.Trigger, "i", "",,, 1)
311-
} else {
312-
if !RegExOptsExist
313-
HS.Trigger := "i)" HS.Trigger
314-
else if !InStr(RegExOpts[], "i")
315-
HS.Trigger := "i" HS.Trigger
307+
RegExOptsExist := RegExMatch(HS.Trigger, "^([^(\\]+)\)", &RegExOpts:="")
308+
if OptObj["C"] != 1 && !RegExOptsExist {
309+
HS.Trigger := "i)" HS.Trigger
316310
}
317311
if SubStr(HS.Trigger, 1, 1) = ")"
318312
HS.Trigger := SubStr(HS.Trigger, 2)
319313
if !OptObj["?"]
320-
HS.Trigger := RegExReplace(HS.Trigger, "^([^(\\\s]+\))?", "$1(?<=\s|^)",, 1) "$"
314+
HS.Trigger := RegExReplace(HS.Trigger, "^([^(\\]+\))?", "$1(?<=\s|^)",, 1) "$"
321315
}
322316
}
323317
static __OptionsToString(OptObj) {

0 commit comments

Comments
 (0)