Merge pull request #3794 from Steve-Mcl/fix-code-editor-theme-from-theme

Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js
This commit is contained in:
Nick O'Leary
2022-07-21 16:27:41 +01:00
committed by GitHub

View File

@@ -327,10 +327,9 @@ module.exports = {
themeContext.header.url = themePlugin.header.url || themeContext.header.url themeContext.header.url = themePlugin.header.url || themeContext.header.url
} }
} }
if(theme.codeEditor) { theme.codeEditor = theme.codeEditor || {}
theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options); theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
} }
}
activeThemeInitialised = true; activeThemeInitialised = true;
} }
return themeContext; return themeContext;