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

fix highlighting

Browse Source
This commit is contained in:
zadam
2020-05-21 11:18:15 +02:00
parent 08dbf90a8c
commit a8d12f723f
4 changed files with 311 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,9 @@ const NoteCacheFulltextExp = require('./expressions/note_cache_fulltext');
const NoteContentFulltextExp = require('./expressions/note_content_fulltext');
const comparatorBuilder = require('./comparator_builder');
function getFulltext(tokens, includingNoteContent) {
function getFulltext(tokens, includingNoteContent, highlightedTokens) {
highlightedTokens.push(...tokens);
if (tokens.length === 0) {
return null;
}
@@ -26,7 +28,7 @@ function isOperator(str) {
return str.match(/^[=<>*]+$/);
}
function getExpression(tokens) {
function getExpression(tokens, highlightedTokens) {
if (tokens.length === 0) {
return null;
}
@@ -42,15 +44,19 @@ function getExpression(tokens) {
}
if (Array.isArray(token)) {
expressions.push(getExpression(token));
expressions.push(getExpression(token, highlightedTokens));
}
else if (token.startsWith('#') || token.startsWith('@')) {
const type = token.startsWith('#') ? 'label' : 'relation';
highlightedTokens.push(token.substr(1));
if (i < tokens.length - 2 && isOperator(tokens[i + 1])) {
const operator = tokens[i + 1];
const comparedValue = tokens[i + 2];
highlightedTokens.push(comparedValue);
const comparator = comparatorBuilder(operator, comparedValue);
if (!comparator) {
@@ -93,10 +99,12 @@ function getExpression(tokens) {
}
}
function parse(fulltextTokens, expressionTokens, includingNoteContent) {
function parse({fulltextTokens, expressionTokens, includingNoteContent, highlightedTokens}) {
highlightedTokens = highlightedTokens || [];
return AndExp.of([
getFulltext(fulltextTokens, includingNoteContent),
getExpression(expressionTokens)
getFulltext(fulltextTokens, includingNoteContent, highlightedTokens),
getExpression(expressionTokens, highlightedTokens)
]);
}