Got json-schema autocomplete working again

This commit is contained in:
Gregory Schier
2024-02-24 16:22:22 -08:00
parent e4f0d2a341
commit 9780dc88a1
3 changed files with 87 additions and 48 deletions

View File

@@ -1,5 +1,5 @@
import { defaultKeymap } from '@codemirror/commands';
import { Compartment, EditorState } from '@codemirror/state';
import { Compartment, EditorState, type Extension } from '@codemirror/state';
import { keymap, placeholder as placeholderExt, tooltips } from '@codemirror/view';
import classNames from 'classnames';
import { EditorView } from 'codemirror';
@@ -53,6 +53,7 @@ export interface EditorProps {
format?: (v: string) => string;
autocomplete?: GenericCompletionConfig;
autocompleteVariables?: boolean;
extraExtensions?: Extension[];
actions?: ReactNode;
}
@@ -76,6 +77,7 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(
singleLine,
format,
autocomplete,
extraExtensions,
autocompleteVariables,
actions,
wrapLines,
@@ -188,6 +190,7 @@ const _Editor = forwardRef<EditorView | undefined, EditorProps>(function Editor(
onBlur: handleBlur,
onKeyDown: handleKeyDown,
}),
...(extraExtensions ?? []),
],
});

View File

@@ -17,6 +17,7 @@ import {
syntaxHighlighting,
} from '@codemirror/language';
import { lintKeymap } from '@codemirror/lint';
import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
import { EditorState } from '@codemirror/state';
import {
@@ -85,7 +86,6 @@ const myTheme = EditorView.theme({}, { dark: true });
// ]);
const syntaxExtensions: Record<string, LanguageSupport> = {
'application/grpc': json(), // TODO: Make JSONSchema work
'application/graphql': graphqlLanguageSupport(),
'application/json': json(),
'application/javascript': javascript(),