diff --git a/styles/src/styleTree/feedback.ts b/styles/src/styleTree/feedback.ts index d7946744397f629324af4c832e1c704c58cbe6c8..ba688d1e2ee8067b5618f712fcdad0a30f62874f 100644 --- a/styles/src/styleTree/feedback.ts +++ b/styles/src/styleTree/feedback.ts @@ -32,7 +32,13 @@ export default function feedback(colorScheme: ColorScheme) { }, button_margin: 8, info_text_default: text(layer, "sans", "default", { size: "xs" }), - link_text_default: text(layer, "sans", "default", { size: "xs", underline: true }), - link_text_hover: text(layer, "sans", "hovered", { size: "xs", underline: true }) + link_text_default: text(layer, "sans", "default", { + size: "xs", + underline: true, + }), + link_text_hover: text(layer, "sans", "hovered", { + size: "xs", + underline: true, + }), } } diff --git a/styles/src/themes/common/syntax.ts b/styles/src/themes/common/syntax.ts index 11d16eea16832761de779a0b12c1690723fbfb8d..7295a5432e6ca8fcd83c6a6c679fd3c3e5e67585 100644 --- a/styles/src/themes/common/syntax.ts +++ b/styles/src/themes/common/syntax.ts @@ -1,8 +1,6 @@ import deepmerge from "deepmerge" import { FontWeight, fontWeights } from "../../common" -import { - ColorScheme, -} from "./colorScheme" +import { ColorScheme } from "./colorScheme" export interface SyntaxHighlightStyle { color: string @@ -56,7 +54,8 @@ export interface Syntax { "string.regex": SyntaxHighlightStyle // == Types ====== / - constructor: SyntaxHighlightStyle + // We allow Function here because all JS objects literals have this property + constructor: SyntaxHighlightStyle | Function variant: SyntaxHighlightStyle type: SyntaxHighlightStyle // js: predefined_type @@ -120,7 +119,8 @@ export interface Syntax { // HACK: "constructor" as a key in the syntax interface returns an error when a theme tries to use it. // For now hack around it by omiting constructor as a valid key for overrides. -export type ThemeSyntax = Partial> +// export type ThemeSyntax = Partial> +export type ThemeSyntax = Partial const defaultSyntaxHighlightStyle: Omit = { weight: fontWeights.normal, @@ -312,8 +312,6 @@ function buildDefaultSyntax(colorScheme: ColorScheme): Syntax { }, } - console.log(JSON.stringify(defaultSyntax, null, 2)) - return defaultSyntax } diff --git a/styles/src/themes/one-dark.ts b/styles/src/themes/one-dark.ts index 48305e5bd92bb81cf79217f273c84085cd2ad56a..2803cab572e19e7ce3ec50ba32aaed9154258cb5 100644 --- a/styles/src/themes/one-dark.ts +++ b/styles/src/themes/one-dark.ts @@ -63,6 +63,7 @@ const syntax: ThemeSyntax = { type: { color: color.teal }, "variable.special": { color: color.orange }, variant: { color: color.blue }, + constructor: { color: color.blue }, } export const dark = createColorScheme(name, false, ramps, syntax)