From 20d3115e4a0294917f4b2152e65888d7d549b2b1 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Sat, 29 Jan 2022 19:27:49 -0600 Subject: [PATCH] Framework for custom theme --- src/ScriptEditor/ui/themes.ts | 180 +++++++++++++++++++++++++++++++++- src/Settings/Settings.ts | 13 ++- 2 files changed, 191 insertions(+), 2 deletions(-) diff --git a/src/ScriptEditor/ui/themes.ts b/src/ScriptEditor/ui/themes.ts index 943b94ccb..51cc15d15 100644 --- a/src/ScriptEditor/ui/themes.ts +++ b/src/ScriptEditor/ui/themes.ts @@ -1,3 +1,182 @@ +export interface IScriptEditorTheme { + base: string; + inherit: boolean; + common: { + accent: string; + bg: string; + fg: string; + }; + syntax: { + tag: string; + entity: string; + string: string; + regexp: string; + markup: string; + keyword: string; + comment: string; + constant: string; + operator: string; + error: string; + }; + ui: { + line: string; + panel: { + bg: string; + shadow: string; + border: string; + }; + selection: { + bg: string; + }; + }; +} + +export const defaultMonacoTheme: IScriptEditorTheme = { + base: "vs-dark", + inherit: true, + common: { + accent: "b5cea8", + bg: "1E1E1E", + fg: "D4D4D4", + }, + syntax: { + tag: "569cd6", + entity: "569cd6", + string: "ce9178", + regexp: "646695", + markup: "569cd6", + keyword: "569cd6", + comment: "6A9955", + constant: "1E1E1E", + operator: "d4d4d4", + error: "f44747" + }, + ui: { + line: "1E1E1E", + panel: { + bg: "252526", + shadow: "252526", + border: "1E1E1E" + }, + selection: { + bg: "ADD6FF26" + } + } +} + +export function makeTheme(theme: IScriptEditorTheme): any { + const themeRules = [ + { + token: "", + background: theme.ui.line, + foreground: theme.common.fg + }, + { + token: "identifier", + foreground: theme.common.accent + }, + { + token: "operators", + foreground: theme.syntax.operator + }, + { + token: "keyword", + foreground: theme.syntax.keyword + }, + { + token: "string", + foreground: theme.syntax.string + }, + { + token: "string.escape", + foreground: theme.syntax.regexp + }, + { + token: "comment", + foreground: theme.syntax.comment + }, + { + token: "constant", + foreground: theme.syntax.constant + }, + { + token: "entity", + foreground: theme.syntax.entity + }, + { + token: "tag", + foreground: theme.syntax.tag + }, + { + token: "regexp", + foreground: theme.syntax.regexp + }, + { + token: "attribute", + foreground: theme.syntax.tag + }, + { + token: "constructor", + foreground: theme.syntax.markup + }, + { + token: "invalid", + foreground: theme.syntax.error + }, + { + token: "number", + foreground: theme.common.accent + }, + { + token: "delimiter", + foreground: theme.common.fg + "B3" + }, + // Custom tokens + { + token: "ns", + foreground: theme.syntax.tag + }, + { + token: "netscriptfunction", + foreground: theme.syntax.markup + }, + { + token: "otherkeywords", + foreground: theme.syntax.keyword + }, + { + token: "otherkeyvars", + foreground: theme.common.accent + }, + { + token: "this", + foreground: theme.syntax.tag + } + ]; + + const themeColors = Object.fromEntries([ + ["editor.background", theme.common.bg], + ["editor.foreground", theme.common.fg], + ["editor.lineHighlightBackground", theme.ui.line], + ["editor.selectionBackground", theme.ui.selection.bg], + + ["editorSuggestWidget.background", theme.ui.panel.bg], + ["editorSuggestWidget.border", theme.ui.panel.border], + ["editorSuggestWidget.selectedBackground", theme.ui.panel.shadow], + + ["editorHoverWidget.background", theme.ui.panel.bg], + ["editorHoverWidget.border", theme.ui.panel.border], + + ["editorWidget.background", theme.ui.panel.bg], + ["editorWidget.border", theme.ui.panel.border], + + ["input.background", theme.ui.panel.bg], + ["input.border", theme.ui.panel.border] + ].map(([k, v]) => [k, "#" + v])); + + return { base: theme.base, inherit: theme.inherit, rules: themeRules, colors: themeColors } +} + export async function loadThemes(monaco: { editor: any }): Promise { monaco.editor.defineTheme("monokai", { base: "vs-dark", @@ -260,7 +439,6 @@ export async function loadThemes(monaco: { editor: any }): Promise { token: "ns", foreground: "FFB86C", fontStyle: "italic", - }, { token: "netscriptfunction", diff --git a/src/Settings/Settings.ts b/src/Settings/Settings.ts index 77c29fdb9..3ea55030c 100644 --- a/src/Settings/Settings.ts +++ b/src/Settings/Settings.ts @@ -5,6 +5,7 @@ import { defaultStyles } from "../Themes/Styles"; import { WordWrapOptions } from "../ScriptEditor/ui/Options"; import { OverviewSettings } from "../ui/React/Overview"; import { IStyleSettings } from "../ScriptEditor/NetscriptDefinitions"; +import { defaultMonacoTheme, IScriptEditorTheme } from "../ScriptEditor/ui/themes"; /** * Represents the default settings the player could customize. @@ -147,6 +148,11 @@ interface IDefaultSettings { * If the game's sidebar is opened */ IsSidebarOpened: boolean; + + /** + * Script editor theme data + */ + EditorTheme: IScriptEditorTheme; } /** @@ -204,6 +210,8 @@ export const defaultSettings: IDefaultSettings = { theme: defaultTheme, styles: defaultStyles, overview: { x: 0, y: 0, opened: true }, + + EditorTheme: defaultMonacoTheme, }; /** @@ -244,10 +252,11 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = { MonacoFontSize: 20, MonacoVim: false, MonacoWordWrap: "off", - + theme: { ...defaultTheme }, styles: { ...defaultStyles }, overview: defaultSettings.overview, + EditorTheme: { ...defaultMonacoTheme }, init() { Object.assign(Settings, defaultSettings); }, @@ -259,6 +268,8 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = { delete save.styles; Object.assign(Settings.overview, save.overview); delete save.overview; + Object.assign(Settings.EditorTheme, save.EditorTheme); + delete save.EditorTheme; Object.assign(Settings, save); }, };