From dabc06d13b02fec3887dbf4f7f2f4eeb44efcf89 Mon Sep 17 00:00:00 2001
From: HeySora <contact@heysora.net>
Date: Wed, 28 Sep 2022 00:55:15 +0200
Subject: [PATCH] Feature: Case-insensitive "find files in repo" (#21269)
This (short) PR builds upon #15028 and makes the file search
case-insensitive.
Previously, having a file named `TestFile.cs` would not be shown if
`test` was typed in the search box.
This now changes the matching function to be case-insensitive (without
affecting the UI).
The matching function, `strSubMatch`, is only used for this feature (it
has been introduced by #15028), meaning that this PR does not affect the
behaviour of any unrelated functionality of Gitea.
---
web_src/js/utils.js | 24 +++++++++++-------------
web_src/js/utils.test.js | 3 +++
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index 343ee4a03b..8e8dc01be1 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -64,19 +64,17 @@ export function parseIssueHref(href) {
export function strSubMatch(full, sub) {
const res = [''];
let i = 0, j = 0;
- while (i < sub.length && j < full.length) {
- while (j < full.length) {
- if (sub[i] === full[j]) {
- if (res.length % 2 !== 0) res.push('');
- res[res.length - 1] += full[j];
- j++;
- i++;
- } else {
- if (res.length % 2 === 0) res.push('');
- res[res.length - 1] += full[j];
- j++;
- break;
- }
+ const subLower = sub.toLowerCase(), fullLower = full.toLowerCase();
+ while (i < subLower.length && j < fullLower.length) {
+ if (subLower[i] === fullLower[j]) {
+ if (res.length % 2 !== 0) res.push('');
+ res[res.length - 1] += full[j];
+ j++;
+ i++;
+ } else {
+ if (res.length % 2 === 0) res.push('');
+ res[res.length - 1] += full[j];
+ j++;
}
}
if (i !== sub.length) {
diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index 90fb08e8e4..5c17c162af 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -95,6 +95,9 @@ test('strSubMatch', () => {
expect(strSubMatch('abc', 'z')).toEqual(['abc']);
expect(strSubMatch('abc', 'az')).toEqual(['abc']);
+ expect(strSubMatch('abc', 'aC')).toEqual(['', 'a', 'b', 'c']);
+ expect(strSubMatch('abC', 'ac')).toEqual(['', 'a', 'b', 'C']);
+
expect(strSubMatch('aabbcc', 'abc')).toEqual(['', 'a', 'a', 'b', 'b', 'c', 'c']);
expect(strSubMatch('the/directory', 'hedir')).toEqual(['t', 'he', '/', 'dir', 'ectory']);
});