ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-12 04:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix

Browse source
This commit is contained in:
bkellam 2025-11-25 11:52:09 -08:00
parent 8e036a340f
commit dc857d8321
9 changed files with 103 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/queryLanguage/src/parser.terms.ts
View file

@ -1,6 +1,6 @@
// This file was generated by lezer-generator. You probably shouldn't edit it.
export const
negate = 22,
negate = 23,
Program = 1,
OrExpr = 2,
AndExpr = 3,
@ -18,4 +18,5 @@ export const
SymExpr = 15,
RepoSetExpr = 16,
ParenExpr = 17,
Term = 18
QuotedTerm = 18,
Term = 19

16
packages/queryLanguage/src/parser.ts
View file

File diff suppressed because one or more lines are too long

10
packages/queryLanguage/src/query.grammar
View file

@ -24,12 +24,13 @@ expr {
NegateExpr |
ParenExpr |
PrefixExpr |
QuotedTerm |
Term
}
NegateExpr { !negate negate (PrefixExpr | ParenExpr) }
ParenExpr { "(" query ")" }
ParenExpr { "(" query? ")" }
PrefixExpr {
ArchivedExpr |
@ -63,7 +64,8 @@ archivedValue { "yes" | "no" | "only" }
forkValue { "yes" | "no" | "only" }
visibilityValue { "public" | "private" | "any" }
Term { quotedString | word }
QuotedTerm { quotedString }
Term { word }
value { quotedString | word }
@ -86,9 +88,7 @@ value { quotedString | word }
quotedString { '"' (!["\\\n] | "\\" _)* '"' }
// Allow almost anything in a word except spaces, parens, quotes
// Colons and dashes are allowed anywhere in words (including at the start)
word { (![ \t\n()"]) (![ \t\n()":] | ":" | "-")* }
word { (![ \t\n()]) (![ \t\n():] | ":" | "-")* }
space { $[ \t\n]+ }

2
packages/queryLanguage/test/grouping.txt
View file

@ -4,7 +4,7 @@
==>
Program(ParenExpr(Term(⚠)))
Program(ParenExpr)
# Simple grouping

4
packages/queryLanguage/test/negation.txt
View file

@ -12,7 +12,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Dash in middle
@ -244,7 +244,7 @@ Program(NegateExpr(ParenExpr(AndExpr(PrefixExpr(FileExpr),PrefixExpr(LangExpr)))
==>
Program(NegateExpr(ParenExpr(Term(⚠))))
Program(NegateExpr(ParenExpr))
# Negate with space after dash

4
packages/queryLanguage/test/operators.txt
View file

@ -36,7 +36,7 @@ Program(OrExpr(Term,NegateExpr(PrefixExpr(FileExpr))))
==>
Program(OrExpr(Term,Term))
Program(OrExpr(QuotedTerm,QuotedTerm))
# OR with different prefixes
@ -260,7 +260,7 @@ Program(OrExpr(PrefixExpr(FileExpr),PrefixExpr(FileExpr)))
==>
Program(OrExpr(ParenExpr(Term(⚠)),ParenExpr(Term(⚠))))
Program(OrExpr(ParenExpr,ParenExpr))
# OR with negated groups

6
packages/queryLanguage/test/precedence.txt
View file

@ -156,7 +156,7 @@ Program(AndExpr(ParenExpr(OrExpr(Term,Term)),ParenExpr(OrExpr(Term,Term))))
==>
Program(Term)
Program(QuotedTerm)
# Prefix with OR value doesn't split
@ -188,7 +188,7 @@ Program(OrExpr(Term,ParenExpr(AndExpr(Term,Term))))
==>
Program(OrExpr(ParenExpr(Term(⚠)),AndExpr(Term,Term)))
Program(OrExpr(ParenExpr,AndExpr(Term,Term)))
# Negation of empty group
@ -196,5 +196,5 @@ Program(OrExpr(ParenExpr(Term(⚠)),AndExpr(Term,Term)))
==>
Program(AndExpr(NegateExpr(ParenExpr(Term(⚠))),Term))
Program(AndExpr(NegateExpr(ParenExpr),Term))

122
packages/queryLanguage/test/quoted.txt
View file

@ -4,6 +4,22 @@
==>
Program(QuotedTerm)
# Leading unclosed quote
"hello
==>
Program(Term)
# Trailing unclosed quote
hello"
==>
Program(Term)
# Quoted string with spaces
@ -12,7 +28,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Multiple words in quotes
@ -20,7 +36,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with escaped quote
@ -28,7 +44,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with escaped backslash
@ -36,7 +52,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Double backslash
@ -44,7 +60,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Multiple escaped quotes
@ -52,7 +68,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Mixed escaped characters
@ -60,7 +76,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Empty quoted string
@ -68,7 +84,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with only spaces
@ -76,7 +92,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string in file prefix
@ -116,7 +132,7 @@ Program(PrefixExpr(RevisionExpr))
==>
Program(AndExpr(Term,Term))
Program(AndExpr(QuotedTerm,QuotedTerm))
# Quoted and unquoted mixed
@ -124,7 +140,7 @@ unquoted "quoted string" another
==>
Program(AndExpr(Term,Term,Term))
Program(AndExpr(Term,QuotedTerm,Term))
# Quoted string with parentheses inside
@ -132,7 +148,7 @@ Program(AndExpr(Term,Term,Term))
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with brackets
@ -140,7 +156,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with special chars
@ -148,7 +164,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with colons
@ -156,7 +172,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with dashes
@ -164,7 +180,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with dots
@ -172,7 +188,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with regex pattern
@ -180,7 +196,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with forward slashes
@ -188,7 +204,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with underscores
@ -196,7 +212,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with numbers
@ -204,7 +220,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with mixed case
@ -212,7 +228,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted prefix value with spaces
@ -236,7 +252,7 @@ Program(AndExpr(PrefixExpr(FileExpr),PrefixExpr(RepoExpr)))
==>
Program(ParenExpr(Term))
Program(ParenExpr(QuotedTerm))
# Multiple quoted in parentheses
@ -244,7 +260,7 @@ Program(ParenExpr(Term))
==>
Program(ParenExpr(AndExpr(Term,Term)))
Program(ParenExpr(AndExpr(QuotedTerm,QuotedTerm)))
# Quoted with escaped newline
@ -252,7 +268,7 @@ Program(ParenExpr(AndExpr(Term,Term)))
==>
Program(Term)
Program(QuotedTerm)
# Quoted with tab character
@ -260,7 +276,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Lang prefix with quoted value
@ -292,7 +308,7 @@ Program(PrefixExpr(ContentExpr))
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with hash
@ -300,7 +316,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with dollar sign
@ -308,7 +324,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with percent
@ -316,7 +332,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with ampersand
@ -324,7 +340,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with asterisk
@ -332,7 +348,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with plus
@ -340,7 +356,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with equals
@ -348,7 +364,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with angle brackets
@ -356,7 +372,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with pipe
@ -364,7 +380,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with tilde
@ -372,7 +388,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with backtick
@ -380,7 +396,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with question mark
@ -388,7 +404,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with exclamation
@ -396,7 +412,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with semicolon
@ -404,7 +420,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted string with comma
@ -412,7 +428,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Multiple quotes in content
@ -428,7 +444,7 @@ Program(PrefixExpr(ContentExpr))
==>
Program(Term)
Program(QuotedTerm)
# Quoted file prefix as literal
@ -436,7 +452,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted lang prefix as literal
@ -444,7 +460,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quoted partial prefix
@ -452,7 +468,7 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Mix of quoted prefix and real prefix
@ -460,7 +476,7 @@ Program(Term)
==>
Program(AndExpr(Term,PrefixExpr(FileExpr)))
Program(AndExpr(QuotedTerm,PrefixExpr(FileExpr)))
# Quoted short form prefix
@ -468,7 +484,7 @@ Program(AndExpr(Term,PrefixExpr(FileExpr)))
==>
Program(Term)
Program(QuotedTerm)
# Quoted revision prefix
@ -476,4 +492,12 @@ Program(Term)
==>
Program(Term)
Program(QuotedTerm)
# Quotes can be used within words
name\s*=\s*"projectmanagementlugapi lang:HCL
==>
Program(AndExpr(Term, PrefixExpr(LangExpr)))

7
packages/web/src/features/search/parser.ts
View file

@ -18,6 +18,7 @@ import {
SymExpr,
SyntaxNode,
Term,
QuotedTerm,
Tree,
VisibilityExpr,
} from '@sourcebot/query-language';
@ -175,8 +176,12 @@ const transformTreeToIR = async ({
// PrefixExpr contains specific prefix types
return transformPrefixExpr(node);
case QuotedTerm:
case Term: {
const termText = input.substring(node.from, node.to).replace(/^"|"$/g, '');
const fullText = input.substring(node.from, node.to);
// If the term is quoted, then we remove the quotes as they are
// not interpreted.
const termText = node.type.id === QuotedTerm ? fullText.replace(/^"|"$/g, '') : fullText;
return isRegexEnabled ? {
regexp: {