Skip to content

fix(lxlquery): handle unclosed quotes + pills #1647

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

Draft
jesperengstrom wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

fix(lxlquery): handle unclosed quotes + pills #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0642a9
Add StrliteralIncomplete
jesperengstrom Jun 22, 2026
1304f90
do not export strliteralIncomplete
jesperengstrom Jun 24, 2026
5cc5f5a
fix test
jesperengstrom Jun 25, 2026
752ff57
Add some test cases
jesperengstrom Jun 25, 2026
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
7 changes: 4 additions & 3 deletions packages/codemirror-lang-lxlquery/src/syntax.grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ andcomb { term ( AndOperator term | term )* }
term { String | Group | UTerm | Qualifier }
Group { "(" orcomb? ")" }
UTerm { UOperator term }
String { strliteral | str }
String { strliteral | strliteralIncomplete | str }
Qualifier {
( QualifierKey { String } QualifierOperator { bOperator } QualifierValue { String } ) |
( QualifierKey { String } QualifierOperator { bOperatorEq } QualifierValue { qualifierTerm } ) |
Expand All @@ -31,12 +31,13 @@ QualifierInnerGroup { "(" qualifierOrcomb? ")" }
UOperator { "NOT" | "INTE" }
bOperator {"<" | ">" | "<=" | ">=" }
bOperatorEq { ":" | "=" | "~" }
strliteral { '"' (!["\\] | "\\" _)* '"' }
strliteral { '"' (!["\\\n()] | "\\" ![\n])* '"' }
strliteralIncomplete { '"' (!["\\\n \t\r():=~<>] | "\\" ![\n \t\r():=~<>])* }
str { ![:~><=()"\ ]+ }
filterAlias { "excludeEplikt" | "includeEplikt" | "excludePreliminary" | "includePreliminary" | "existsImage" | "alias-myLibraries" | "freeOnline" | "_suecia" | "_collections" }
space { @whitespace+ }

@precedence { OrOperator, AndOperator, UOperator, bOperator, bOperatorEq, filterAlias, str, space}
@precedence { OrOperator, AndOperator, UOperator, bOperator, bOperatorEq, filterAlias, strliteral, strliteralIncomplete, str, space }
}

@detectDelim
67 changes: 65 additions & 2 deletions packages/codemirror-lang-lxlquery/test/cases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,14 +423,77 @@ NOT
Query(UTerm(UOperator ⚠))


# fail unclosed quote
# NO fail unclosed quote (does not fail since token strliteralIncomplete)

"Astrid Lind

==>

Query(⚠ String String)
Query(String String)


# handle unclosed quote + qualifier

" förf:("Astid Lindgren")

==>

Query(
String,
Qualifier(
QualifierKey(String),
QualifierOperator,
QualifierValue(
QualifierOuterGroup(
String
)
)
)
)

# handle unclosed quote in qualifier + qualifier

item:("akka) item:("packa")

==>

Query(
Qualifier(
QualifierKey(
String),
QualifierOperator,
QualifierValue(
QualifierOuterGroup(
String
)
)
),
Qualifier(
QualifierKey(
String
),
QualifierOperator,
QualifierValue(
QualifierOuterGroup(
String
)
)
)
)


# expectedly mishandle unclosed quote + qualifier without group

" förf:"Astid Lindgren"

==>

Query(
String,
String,
String,
String
)

# allow empty paren

Expand Down
Loading