zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 15:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix inQuotes + tests

Browse source
This commit is contained in:
zadam 2020-07-19 23:23:48 +02:00
parent 35469f6f2d
commit 4e5ddaf7d1
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
spec/search/lexer.spec.js
View file

@ -49,6 +49,22 @@ describe("Lexer expression", () => {
.toEqual(["#label", "*=*", "text"]);
});
it("simple label operator with in quotes and without", () => {
expect(lexer("#label*=*'text'").expressionTokens)
.toEqual([
{token: "#label", inQuotes: false},
{token: "*=*", inQuotes: false},
{token: "text", inQuotes: true}
]);
expect(lexer("#label*=*text").expressionTokens)
.toEqual([
{token: "#label", inQuotes: false},
{token: "*=*", inQuotes: false},
{token: "text", inQuotes: false}
]);
});
it("complex expressions with and, or and parenthesis", () => {
expect(lexer(`# (#label=text OR #second=text) AND ~relation`).expressionTokens.map(t => t.token))
.toEqual(["#", "(", "#label", "=", "text", "or", "#second", "=", "text", ")", "and", "~relation"]);

6
src/services/search/lexer.js
View file

@ -28,7 +28,7 @@ function lexer(str) {
const rec = {
token: currentWord,
inQuotes: quotes
inQuotes: !!quotes
};
if (fulltextEnded) {
@ -71,9 +71,9 @@ function lexer(str) {
}
}
else if (quotes === chr) {
quotes = false;
finishWord();
quotes = false;
}
else {
// it's a quote but within other kind of quotes so it's valid as a literal character