Skip to content

Commit

Permalink
feat: update package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
zoomchik committed Jun 6, 2023
1 parent 0a1955e commit d76402f
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 16 deletions.
31 changes: 19 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@codemirror/language": "^6.6.0",
"@codemirror/legacy-modes": "^6.3.1",
"@codemirror/lint": "^6.2.0",
"codemirror": "^5.47.0",
"@mui/x-date-pickers": "^6.0.0",
"@toast-ui/editor": "^3.2.2",
"@toast-ui/editor-plugin-code-syntax-highlight": "^3.1.0",
Expand Down
17 changes: 13 additions & 4 deletions src/other/codemirror/CodeMirror.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
import "codemirror/lib/codemirror.css";
import "codemirror/mode/jinja2/jinja2";
import "codemirror/mode/fortran/fortran";
import "codemirror/mode/shell/shell";
import "codemirror/mode/python/python";
import "codemirror/mode/javascript/javascript";
import { javascript } from "@codemirror/lang-javascript";
import { json, jsonParseLinter } from "@codemirror/lang-json";
import { python } from "@codemirror/lang-python";
Expand All @@ -6,7 +12,8 @@ import { fortran } from "@codemirror/legacy-modes/mode/fortran";
import { jinja2 } from "@codemirror/legacy-modes/mode/jinja2";
import { shell } from "@codemirror/legacy-modes/mode/shell";
import { linter, lintGutter } from "@codemirror/lint";
import CodeMirrorBase, { BasicSetupOptions, ReactCodeMirrorProps } from "@uiw/react-codemirror";
import { CompletionContext, CompletionResult, autocompletion } from "@codemirror/autocomplete";
import CodeMirrorBase, { BasicSetupOptions } from "@uiw/react-codemirror";
import React from "react";

const LANGUAGES_MAP: Record<string, any> = {
Expand All @@ -24,7 +31,7 @@ export interface CodeMirrorProps {
content?: string;
options: boolean | BasicSetupOptions;
language: string;
extensions: ReactCodeMirrorProps["extensions"][];
completions: (context: CompletionContext) => CompletionResult;
}

export interface CodeMirrorState {
Expand Down Expand Up @@ -64,7 +71,9 @@ class CodeMirror extends React.Component<CodeMirrorProps, CodeMirrorState> {
}

render() {
const { content = "", options = {}, language, extensions = [] } = this.props;
const { content = "", options = {}, language, completions } = this.props;
const completionExtension = autocompletion({ override: [completions] });

return (
<CodeMirrorBase
value={content || ""}
Expand All @@ -76,7 +85,7 @@ class CodeMirror extends React.Component<CodeMirrorProps, CodeMirrorState> {
onBlur={() => this.setState({ isEditing: false })}
basicSetup={options}
theme="light"
extensions={[...extensions, ...this.getLanguageExtensions(language)]}
extensions={[completionExtension, ...this.getLanguageExtensions(language)]}
/>
);
}
Expand Down

0 comments on commit d76402f

Please sign in to comment.