github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(editor): remove yaml specific highlighting [r8s-441] (#1010)

release/2.33.0-rc1
Ali 2025-08-12 11:53:31 +12:00 committed by GitHub
parent 8fe5eaee29
commit 3ee20863d6
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/react/components/CodeEditor/CodeEditor.tsx
View File

@ -46,6 +46,10 @@ export const theme = createTheme({
selectionMatch: 'var(--bg-codemirror-selected-color)', selectionMatch: 'var(--bg-codemirror-selected-color)',
}, },
styles: [ styles: [
{
tag: [highlightTags.propertyName, highlightTags.attributeName],
color: 'var(--text-cm-default-color)',
},
{ tag: highlightTags.atom, color: 'var(--text-cm-default-color)' }, { tag: highlightTags.atom, color: 'var(--text-cm-default-color)' },
{ tag: highlightTags.meta, color: 'var(--text-cm-meta-color)' }, { tag: highlightTags.meta, color: 'var(--text-cm-meta-color)' },
{ {

8
app/react/components/CodeEditor/useCodeEditorExtensions.ts
View File

@ -2,16 +2,11 @@ import { useMemo } from 'react';
import { import {
StreamLanguage, StreamLanguage,
LanguageSupport, LanguageSupport,
syntaxHighlighting,
indentService, indentService,
} from '@codemirror/language'; } from '@codemirror/language';
import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile'; import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
import { shell } from '@codemirror/legacy-modes/mode/shell'; import { shell } from '@codemirror/legacy-modes/mode/shell';
import { import { keymap, Extension } from '@uiw/react-codemirror';
oneDarkHighlightStyle,
keymap,
Extension,
} from '@uiw/react-codemirror';
import type { JSONSchema7 } from 'json-schema'; import type { JSONSchema7 } from 'json-schema';
import { lintKeymap, lintGutter } from '@codemirror/lint'; import { lintKeymap, lintGutter } from '@codemirror/lint';
import { defaultKeymap } from '@codemirror/commands'; import { defaultKeymap } from '@codemirror/commands';
@ -45,7 +40,6 @@ function yamlLanguage(schema?: JSONSchema7) {
linter, linter,
stateExtensions, stateExtensions,
yamlIndentExtension, yamlIndentExtension,
syntaxHighlighting(oneDarkHighlightStyle),
// explicitly setting lineNumbers() as an extension ensures that the gutter order is the same between the diff viewer and the code editor // explicitly setting lineNumbers() as an extension ensures that the gutter order is the same between the diff viewer and the code editor
lineNumbers(), lineNumbers(),
!!schema && lintGutter(), !!schema && lintGutter(),