Skip to content

Commit f150486

Browse files
committed
centralize language definitions
1 parent 1f48ce4 commit f150486

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

src/kit/CodeEditor.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import { json } from '@codemirror/lang-json';
2-
import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
3-
import { python } from '@codemirror/lang-python';
4-
import { yaml } from '@codemirror/lang-yaml';
51
import ReactCodeMirror, { BasicSetupOptions } from '@uiw/react-codemirror';
62
import { Tree } from 'antd';
73
import React, { lazy, Suspense, useCallback, useMemo } from 'react';
@@ -11,6 +7,7 @@ import Icon from 'kit/Icon';
117
import Message from 'kit/Message';
128
import Spinner from 'kit/Spinner';
139
import { useTheme } from 'kit/Theme';
10+
import { langs } from 'kit/utils/codemirrorLanguages';
1411
import { ErrorHandler } from 'kit/utils/error';
1512
import { Loadable } from 'kit/utils/loadable';
1613
import { TreeNode, ValueOf } from 'kit/utils/types';
@@ -22,13 +19,6 @@ const { DirectoryTree } = Tree;
2219
import css from './CodeEditor/CodeEditor.module.scss';
2320
import './CodeEditor/index.scss';
2421

25-
const langs = {
26-
json,
27-
markdown: () => markdown({ base: markdownLanguage }),
28-
python,
29-
yaml,
30-
};
31-
3222
const MARKDOWN_CONFIG: BasicSetupOptions = {
3323
autocompletion: false,
3424
foldGutter: false,

src/kit/internal/CodeMirrorEditor.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { langs } from '@uiw/codemirror-extensions-langs';
21
import ReactCodeMirror, { ReactCodeMirrorProps } from '@uiw/react-codemirror';
32
import React from 'react';
43

54
import { useTheme } from 'kit/Theme';
5+
import { langs } from 'kit/utils/codemirrorLanguages';
66

77
interface Props extends ReactCodeMirrorProps {
88
syntax: keyof typeof langs;

src/kit/utils/codemirrorLanguages.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { json } from '@codemirror/lang-json';
2+
import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
3+
import { python } from '@codemirror/lang-python';
4+
import { yaml } from '@codemirror/lang-yaml';
5+
import { LanguageSupport } from '@codemirror/language';
6+
7+
export const langs = {
8+
json,
9+
markdown: (): LanguageSupport => markdown({ base: markdownLanguage }),
10+
python,
11+
yaml,
12+
};

0 commit comments

Comments
 (0)