mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 06:34:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Ensure full tree on expression editor parse (#5027)

Browse source 
🐛 Ensure full tree on expression editor parse
This commit is contained in:
Iván Ovejero 2022-12-23 16:13:16 +01:00 committed by GitHub
parent 8881ba8d4a
commit 47854ebc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/editor-ui/src/constants.ts
View file

@ -432,3 +432,5 @@ export enum STORES {
WEBHOOKS = 'webhooks',
HISTORY = 'history',
}
export const EXPRESSION_EDITOR_PARSER_TIMEOUT = 15_000; // ms

31
packages/editor-ui/src/mixins/expressionManager.ts
View file

@ -1,9 +1,10 @@
import mixins from 'vue-typed-mixins';
import { mapStores } from 'pinia';
import { syntaxTree } from '@codemirror/language';
import { ensureSyntaxTree, syntaxTree } from '@codemirror/language';
import { workflowHelpers } from '@/mixins/workflowHelpers';
import { useNDVStore } from '@/stores/ndv';
import { EXPRESSION_EDITOR_PARSER_TIMEOUT } from '@/constants';
import type { PropType } from 'vue';
import type { EditorView } from '@codemirror/view';
@ -60,18 +61,26 @@ export const expressionManager = mixins(workflowHelpers).extend({
const rawSegments: RawSegment[] = [];
syntaxTree(this.editor.state)
.cursor()
.iterate((node) => {
if (!this.editor || node.type.name === 'Program') return;
const fullTree = ensureSyntaxTree(
this.editor.state,
this.editor.state.doc.length,
EXPRESSION_EDITOR_PARSER_TIMEOUT,
);
rawSegments.push({
from: node.from,
to: node.to,
text: this.editor.state.sliceDoc(node.from, node.to),
type: node.type.name,
});
if (fullTree === null) {
throw new Error(`Failed to parse expression: ${this.editor.state.doc.toString()}`);
}
fullTree.cursor().iterate((node) => {
if (!this.editor || node.type.name === 'Program') return;
rawSegments.push({
from: node.from,
to: node.to,
text: this.editor.state.sliceDoc(node.from, node.to),
type: node.type.name,
});
});
return rawSegments.reduce<Segment[]>((acc, segment) => {
const { from, to, text, type } = segment;