MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-14 08:45:30 +03:00
Code Issues Projects Releases Wiki Activity

Do not greedy match quotes

Browse Source
This commit is contained in:
Sascha 2021-05-05 12:49:11 +02:00
parent 77d36247b3
commit 7446a20db8
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
webui/src/__tests__/query.ts
View File

@ -17,11 +17,11 @@ it('parses a query with multiple filters', () => {
freetext: [''],
});
expect(parse(`label:abc with "quotes" in freetext`)).toEqual({
expect(parse(`label:abc with "quotes" 'in' freetext`)).toEqual({
label: [`abc`],
with: [''],
quotes: [''],
in: [''],
'"quotes"': [''],
"'in'": [''],
freetext: [''],
});
});
@ -54,11 +54,44 @@ it('parses a quoted query', () => {
expect(parse(`label:"with:quoated:colon"`)).toEqual({
label: [`"with:quoated:colon"`],
});
expect(parse(`label:'name ends after this ->' quote'`)).toEqual({
label: [`'name ends after this ->'`],
"quote'": [``],
});
expect(parse(`label:"name ends after this ->" quote"`)).toEqual({
label: [`"name ends after this ->"`],
'quote"': [``],
});
expect(parse(`label:'this ->"<- quote belongs to label name'`)).toEqual({
label: [`'this ->"<- quote belongs to label name'`],
});
expect(parse(`label:"this ->'<- quote belongs to label name"`)).toEqual({
label: [`"this ->'<- quote belongs to label name"`],
});
expect(parse(`label:'names end with'whitespace not with quotes`)).toEqual({
label: [`'names end with'whitespace`],
not: [``],
with: [``],
quotes: [``],
});
expect(parse(`label:"names end with"whitespace not with quotes`)).toEqual({
label: [`"names end with"whitespace`],
not: [``],
with: [``],
quotes: [``],
});
});
it('should not escape nested quotes', () => {
expect(parse(`foo:'do not escape this ->'<- quote'`)).toEqual({
foo: [`'do not escape this ->'<- quote'`],
foo: [`'do not escape this ->'<-`],
"quote'": [``],
});
expect(parse(`foo:'do not escape this ->"<- quote'`)).toEqual({
@ -66,7 +99,8 @@ it('should not escape nested quotes', () => {
});
expect(parse(`foo:"do not escape this ->"<- quote"`)).toEqual({
foo: [`"do not escape this ->"<- quote"`],
foo: [`"do not escape this ->"<-`],
'quote"': [``],
});
expect(parse(`foo:"do not escape this ->'<- quote"`)).toEqual({

6
webui/src/pages/list/Filter.tsx
View File

@ -36,7 +36,7 @@ export type Query = { [key: string]: string[] };
function parse(query: string): Query {
const params: Query = {};
let re = new RegExp(/(\w+)(:('.*'|".*"|\S*))?/, 'g');
let re = new RegExp(/([^:\s]+)(:('[^']*'\S*|"[^"]*"\S*|\S*))?/, 'g');
let matches;
while ((matches = re.exec(query)) !== null) {
if (!params[matches[1]]) {
@ -53,8 +53,8 @@ function parse(query: string): Query {
function quote(value: string): string {
const hasSpaces = value.includes(' ');
const isDoubleQuotedRegEx = RegExp(/^'.*'$/);
const isSingleQuotedRegEx = RegExp(/^".*"$/);
const isSingleQuotedRegEx = RegExp(/^'.*'$/);
const isDoubleQuotedRegEx = RegExp(/^".*"$/);
const isQuoted = () =>
isDoubleQuotedRegEx.test(value) || isSingleQuotedRegEx.test(value);