Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

parsing and setting isInheritable flag

Browse Source
This commit is contained in:
zadam
2020-07-13 23:27:23 +02:00
parent 5dd73562da
commit 528418aecb
8 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/public/app/services/attribute_parser.js
View File

@@ -92,6 +92,15 @@ function lexer(str) {
finishWord(i - 1);
continue;
}
else if (['(', ')'].includes(chr)) {
finishWord(i - 1);
currentWord = chr;
finishWord(i);
continue;
}
else if (previousOperatorSymbol() !== isOperatorSymbol(chr)) {
finishWord(i - 1);
@@ -122,15 +131,30 @@ function parser(tokens, str, allowEmptyRelations = false) {
}
for (let i = 0; i < tokens.length; i++) {
const {text, startIndex, endIndex} = tokens[i];
const {text, startIndex} = tokens[i];
function isInheritable() {
if (tokens.length > i + 3
&& tokens[i + 1].text === '('
&& tokens[i + 2].text === 'inheritable'
&& tokens[i + 3].text === ')') {
i += 3;
return true;
}
else {
return false;
}
}
if (text.startsWith('#')) {
const attr = {
type: 'label',
name: text.substr(1),
isInheritable: false, // FIXME
isInheritable: isInheritable(),
startIndex: startIndex,
endIndex: endIndex
endIndex: tokens[i].endIndex // i could be moved by isInheritable
};
if (i + 1 < tokens.length && tokens[i + 1].text === "=") {
@@ -150,9 +174,9 @@ function parser(tokens, str, allowEmptyRelations = false) {
const attr = {
type: 'relation',
name: text.substr(1),
isInheritable: false, // FIXME
isInheritable: isInheritable(),
startIndex: startIndex,
endIndex: endIndex
endIndex: tokens[i].endIndex // i could be moved by isInheritable
};
attrs.push(attr);