admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Fix highlighting in SQL editor (#19291)

Browse Source
This commit is contained in:
yehorkardash
2025-09-11 11:46:41 +00:00
committed by GitHub
parent 45e8209142
commit 03b865d4db
23 changed files with 1581 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/editor-ui/package.json
View File

@@ -37,7 +37,7 @@
"@n8n/api-types": "workspace:*",
"@n8n/chat": "workspace:*",
"@n8n/codemirror-lang": "workspace:*",
"@n8n/codemirror-lang-sql": "^1.0.2",
"@n8n/codemirror-lang-sql": "workspace:*",
"@n8n/composables": "workspace:*",
"@n8n/constants": "workspace:*",
"@n8n/design-system": "workspace:*",

10
packages/frontend/editor-ui/src/components/SqlEditor/SqlEditor.vue
View File

@@ -6,9 +6,8 @@ import { n8nCompletionSources } from '@/plugins/codemirror/completions/addComple
import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
import { editorKeymap } from '@/plugins/codemirror/keymap';
import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
import { ifNotIn } from '@codemirror/autocomplete';
import { history } from '@codemirror/commands';
import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
import { bracketMatching, foldGutter, indentOnInput, LanguageSupport } from '@codemirror/language';
import { Prec, type Line } from '@codemirror/state';
import {
EditorView,
@@ -79,9 +78,9 @@ const extensions = computed(() => {
const dialect = SQL_DIALECTS[props.dialect] ?? SQL_DIALECTS.StandardSQL;
function sqlWithN8nLanguageSupport() {
return new LanguageSupport(dialect.language, [
dialect.language.data.of({ closeBrackets: expressionCloseBracketsConfig }),
dialect.language.data.of({
autocomplete: ifNotIn(['Resolvable'], keywordCompletionSource(dialect, true)),
dialect.sqlLanguage.data.of({ closeBrackets: expressionCloseBracketsConfig }),
dialect.sqlLanguage.data.of({
autocomplete: keywordCompletionSource(dialect, true),
}),
n8nCompletionSources().map((source) => dialect.language.data.of(source)),
]);
@@ -114,6 +113,7 @@ const extensions = computed(() => {
mappingDropCursor(),
]);
}
return baseExtensions;
});
const {