From 4eea819b2496b849ca8e1e7a6e11fef45e141225 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 8 Apr 2021 11:53:00 +0200 Subject: Monaco improvements (#15333) - Create theme at runtime which follows the CSS variables of the site - Disable a few opinionated Monaco defaults like minimap and word highlights - Move styles to separate file Co-authored-by: zeripath --- web_src/js/features/codeeditor.js | 52 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) (limited to 'web_src/js') diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index 3b6864ffe7..f6a50dc8b8 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -3,6 +3,22 @@ import {basename, extname, isObject, isDarkTheme} from '../utils.js'; const languagesByFilename = {}; const languagesByExt = {}; +const baseOptions = { + fontFamily: 'var(--fonts-monospace)', + fontSize: 14, // https://github.com/microsoft/monaco-editor/issues/2242 + links: false, + minimap: {enabled: false}, + occurrencesHighlight: false, + overviewRulerLanes: 0, + renderIndentGuides: false, + renderLineHighlight: 'all', + renderLineHighlightOnlyWhenFocus: true, + renderWhitespace: 'none', + rulers: false, + scrollbar: {horizontalScrollbarSize: 6, verticalScrollbarSize: 6}, + scrollBeyondLastLine: false, +}; + function getEditorconfig(input) { try { return JSON.parse(input.dataset.editorconfig); @@ -27,7 +43,7 @@ function getLanguage(filename) { } function updateEditor(monaco, editor, filename, lineWrapExts) { - editor.updateOptions({...getFileBasedOptions(filename, lineWrapExts)}); + editor.updateOptions(getFileBasedOptions(filename, lineWrapExts)); const model = editor.getModel(); const language = model.getModeId(); const newLanguage = getLanguage(filename); @@ -51,9 +67,40 @@ export async function createMonaco(textarea, filename, editorOpts) { container.className = 'monaco-editor-container'; textarea.parentNode.appendChild(container); + // https://github.com/microsoft/monaco-editor/issues/2427 + const styles = window.getComputedStyle(document.documentElement); + const getProp = (name) => styles.getPropertyValue(name).trim(); + + monaco.editor.defineTheme('gitea', { + base: isDarkTheme() ? 'vs-dark' : 'vs', + inherit: true, + rules: [ + { + background: getProp('--color-code-bg'), + } + ], + colors: { + 'editor.background': getProp('--color-code-bg'), + 'editor.foreground': getProp('--color-text'), + 'editor.inactiveSelectionBackground': getProp('--color-primary-light-4'), + 'editor.lineHighlightBackground': getProp('--color-editor-line-highlight'), + 'editor.selectionBackground': getProp('--color-primary-light-3'), + 'editor.selectionForeground': getProp('--color-primary-light-3'), + 'editorLineNumber.background': getProp('--color-code-bg'), + 'editorLineNumber.foreground': getProp('--color-secondary-dark-6'), + 'editorWidget.background': getProp('--color-body'), + 'editorWidget.border': getProp('--color-secondary'), + 'input.background': getProp('--color-input-background'), + 'input.border': getProp('--color-input-border'), + 'input.foreground': getProp('--color-input-text'), + 'scrollbar.shadow': getProp('--color-shadow'), + 'progressBar.background': getProp('--color-primary'), + } + }); + const editor = monaco.editor.create(container, { value: textarea.value, - theme: isDarkTheme() ? 'vs-dark' : 'vs', + theme: 'gitea', language, ...other, }); @@ -100,6 +147,7 @@ export async function createCodeEditor(textarea, filenameInput, previewFileModes } const {monaco, editor} = await createMonaco(textarea, filename, { + ...baseOptions, ...getFileBasedOptions(filenameInput.value, lineWrapExts), ...getEditorConfigOptions(editorConfig), }); -- cgit v1.2.3