Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 17:55:52 +01:00
Code Issues Packages Projects Releases Activity

prefix match for autocomplete attribute search

Browse Source
This commit is contained in:
zadam
2020-05-21 12:05:12 +02:00
parent 75d8627f1c
commit 2e6395ad88
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/search/parser.js
View File

@@ -1,6 +1,5 @@
"use strict";
const ParsingContext = require('./parsing_context');
const AndExp = require('./expressions/and');
const OrExp = require('./expressions/or');
const NotExp = require('./expressions/not');
@@ -63,7 +62,8 @@ function getExpression(tokens, parsingContext) {
const comparator = comparatorBuilder(operator, comparedValue);
if (!comparator) {
throw new Error(`Can't find operator '${operator}'`);
parsingContext.addError(`Can't find operator '${operator}'`);
continue;
}
expressions.push(new FieldComparisonExp(type, token.substr(1), comparator));
@@ -71,7 +71,7 @@ function getExpression(tokens, parsingContext) {
i += 2;
}
else {
expressions.push(new AttributeExistsExp(type, token.substr(1)));
expressions.push(new AttributeExistsExp(type, token.substr(1), parsingContext.fuzzyAttributeSearch));
}
}
else if (['and', 'or'].includes(token.toLowerCase())) {
@@ -79,14 +79,14 @@ function getExpression(tokens, parsingContext) {
op = token.toLowerCase();
}
else if (op !== token.toLowerCase()) {
throw new Error('Mixed usage of AND/OR - always use parenthesis to group AND/OR expressions.');
parsingContext.addError('Mixed usage of AND/OR - always use parenthesis to group AND/OR expressions.');
}
}
else if (isOperator(token)) {
throw new Error(`Misplaced or incomplete expression "${token}"`);
parsingContext.addError(`Misplaced or incomplete expression "${token}"`);
}
else {
throw new Error(`Unrecognized expression "${token}"`);
parsingContext.addError(`Unrecognized expression "${token}"`);
}
if (!op && expressions.length > 1) {