mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix nunjucks regression (#5433)

Browse Source
This commit is contained in:
Jack Kavanagh 2022-11-16 16:22:58 +00:00 committed by GitHub
parent 22274f3dd1
commit be8fa82a74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/insomnia/src/ui/components/codemirror/code-editor.tsx
View File

@ -191,7 +191,7 @@ export const CodeEditor = forwardRef<CodeEditorHandle, CodeEditorProps>(({
Tab: (cm: CodeMirror.Editor) => cm.somethingSelected() ? cm.indentSelection('add') : cm.replaceSelection(indentChars, 'end'),
};
const { handleRender, handleGetRenderContext } = useGatedNunjucks({ disabled: !enableNunjucks });
const prettifyXML = (code: string, filter?:string) => {
const prettifyXML = (code: string, filter?: string) => {
if (updateFilter && filter) {
try {
const results = queryXPath(code, filter);
@ -208,7 +208,7 @@ export const CodeEditor = forwardRef<CodeEditorHandle, CodeEditorProps>(({
return code;
}
};
const prettifyJSON = (code: string, filter?:string) => {
const prettifyJSON = (code: string, filter?: string) => {
try {
let jsonString = code;
if (updateFilter && filter) {
@ -305,7 +305,7 @@ export const CodeEditor = forwardRef<CodeEditorHandle, CodeEditorProps>(({
extraKeys: CodeMirror.normalizeKeyMap(extraKeys),
gutters: showGuttersAndLineNumbers ? ['CodeMirror-lint-markers', 'CodeMirror-linenumbers', 'CodeMirror-foldgutter'] : [],
foldOptions: { widget: (from: CodeMirror.Position, to: CodeMirror.Position) => widget(codeMirror.current, from, to) },
mode: normalizeMimeType(mode),
mode: !handleRender ? normalizeMimeType(mode) : { name: 'nunjucks', baseMode: normalizeMimeType(mode) },
environmentAutocomplete: {
getVariables: async () => !handleGetRenderContext ? [] : (await handleGetRenderContext())?.keys || [],
getTags: async () => !handleGetRenderContext ? [] : (await getTagDefinitions()).map(transformEnums).flat(),
@ -468,7 +468,7 @@ export const CodeEditor = forwardRef<CodeEditorHandle, CodeEditorProps>(({
useEffect(() => codeMirror.current?.setOption('info', infoOptions), [infoOptions]);
useEffect(() => codeMirror.current?.setOption('jump', jumpOptions), [jumpOptions]);
useEffect(() => codeMirror.current?.setOption('lint', lintOptions), [lintOptions]);
useEffect(() => codeMirror.current?.setOption('mode', normalizeMimeType(mode)), [mode]);
useEffect(() => codeMirror.current?.setOption('mode', !handleRender ? normalizeMimeType(mode) : { name: 'nunjucks', baseMode: normalizeMimeType(mode) }), [handleRender, mode]);
useImperativeHandle(ref, () => ({
setValue: value => codeMirror.current?.setValue(value),