mirror/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2025-12-23 22:48:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only close brackets for json-like langs

Browse Source 
Fixes #162
This commit is contained in:
Gregory Schier
2025-02-21 13:50:21 -08:00
parent e510204b8c
commit ed7fdb1b4c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src-web/components/core/Editor/extensions.ts
View File

@@ -21,6 +21,7 @@ import {
import { lintKeymap } from '@codemirror/lint';
import { searchKeymap } from '@codemirror/search';
import type { Extension } from '@codemirror/state';
import { EditorState } from '@codemirror/state';
import {
crosshairCursor,
@@ -73,6 +74,8 @@ export const syntaxHighlightStyle = HighlightStyle.define([
const syntaxTheme = EditorView.theme({}, { dark: true });
const closeBracketsExts: Extension = [closeBrackets(), keymap.of([...closeBracketsKeymap])];
const syntaxExtensions: Record<NonNullable<EditorProps['language']>, LanguageSupport | null> = {
graphql: null,
json: json(),
@@ -85,6 +88,8 @@ const syntaxExtensions: Record<NonNullable<EditorProps['language']>, LanguageSup
markdown: markdown(),
};
const closeBracketsFor: (keyof typeof syntaxExtensions)[] = ['json', 'javascript'];
export function getLanguageExtension({
language,
useTemplating = false,
@@ -110,7 +115,13 @@ export function getLanguageExtension({
return base;
}
const extraExtensions = language === 'url' ? [pathParametersPlugin(onClickPathParameter)] : [];
const extraExtensions: Extension[] =
language === 'url' ? [pathParametersPlugin(onClickPathParameter)] : [];
// Only close brackets on languages that need it
if (language && closeBracketsFor.includes(language)) {
extraExtensions.push(closeBracketsExts);
}
return twig({
base,
@@ -209,9 +220,8 @@ export const multiLineExtensions = ({ hideGutter }: { hideGutter?: boolean }) =>
}),
EditorState.allowMultipleSelections.of(true),
indentOnInput(),
closeBrackets(),
rectangularSelection(),
crosshairCursor(),
highlightActiveLineGutter(),
keymap.of([...closeBracketsKeymap, ...searchKeymap, ...foldKeymap, ...lintKeymap]),
keymap.of([...searchKeymap, ...foldKeymap, ...lintKeymap]),
];