Skip to content

feat: optimisation of EqualMatch method #3342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sanix-Darker wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: optimisation of EqualMatch method #3342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc317f8
feat: optimisation of EqualMatch method
Sanix-Darker Jun 23, 2023
444d738
feat: format
Sanix-Darker Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions src/algo/algo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,45 +902,40 @@ func EqualMatch(caseSensitive bool, normalize bool, forward bool, text *util.Cha
return Result{-1, -1, 0}, nil
}

// Strip leading whitespaces
trimmedLen := 0
// Strip leading and trailing whitespaces
trimmedLen, trimmedEndLen := 0, 0
if !unicode.IsSpace(pattern[0]) {
trimmedLen = text.LeadingWhitespaces()
}

// Strip trailing whitespaces
trimmedEndLen := 0
if !unicode.IsSpace(pattern[lenPattern-1]) {
trimmedEndLen = text.TrailingWhitespaces()
}

if text.Length()-trimmedLen-trimmedEndLen != lenPattern {
return Result{-1, -1, 0}, nil
}
match := true

textRunes := text.ToRunes()
if normalize {
runes := text.ToRunes()
for idx, pchar := range pattern {
char := runes[trimmedLen+idx]
char := textRunes[trimmedLen+idx]
if !caseSensitive {
char = unicode.To(unicode.LowerCase, char)
}
if normalizeRune(pchar) != normalizeRune(char) {
match = false
break
return Result{-1, -1, 0}, nil
}
}
} else {
runes := text.ToRunes()
runesStr := string(runes[trimmedLen : len(runes)-trimmedEndLen])
runesStr := string(textRunes[trimmedLen : len(textRunes)-trimmedEndLen])
if !caseSensitive {
runesStr = strings.ToLower(runesStr)
}
match = runesStr == string(pattern)
}
if match {
return Result{trimmedLen, trimmedLen + lenPattern, (scoreMatch+int(bonusBoundaryWhite))*lenPattern +
(bonusFirstCharMultiplier-1)*int(bonusBoundaryWhite)}, nil
if runesStr != string(pattern) {
return Result{-1, -1, 0}, nil
}
}
return Result{-1, -1, 0}, nil

score := (scoreMatch+int(bonusBoundaryWhite))*lenPattern + (bonusFirstCharMultiplier-1)*int(bonusBoundaryWhite)
return Result{trimmedLen, trimmedLen + lenPattern, score}, nil
}