Frontend Visual Theme Spec and Retirement of Host-Consumed Semantic CSS
This commit is contained in:
+28
-28
@@ -12,34 +12,34 @@ public class PBSFrontendThemes {
|
||||
"PBS Default",
|
||||
new FrontendEditorPaletteSpec(
|
||||
"#d9e2ec",
|
||||
"#2d4f6b",
|
||||
"#2d4f6b",
|
||||
"#6f8193",
|
||||
"#2c2140",
|
||||
"#a47dff",
|
||||
"#efe6ff"),
|
||||
"#2f3f5b",
|
||||
"#23314a",
|
||||
"#6b7f99",
|
||||
"#241f38",
|
||||
"#b392f0",
|
||||
"#f5efff"),
|
||||
List.of(
|
||||
new FrontendTokenStyleSpec("pbs-comment", "#c090b0", true, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-string", "#00c088", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-number", "#ff90b0", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-literal", "#4fc1ff", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-lifecycle", "#ef50c0", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-keyword", "#569cd6", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-operator", "#d4d4d4", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-punctuation", "#d4d4d4", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-function", "#f2c14e", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-method", "#f2c14e", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-constructor", "#ecdcaa", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-struct", "#4ec9b0", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-contract", "#78dce8", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-host", "#b7a2fa", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-builtin-type", "#8be9fd", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-service", "#b7a2fa", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-error", "#ff5b5b", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-enum", "#56cfe1", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-callback", "#b7a2fa", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-global", "#f790fc", true, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-const", "#f78c6c", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-implements", "#a1c181", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-comment", "#8b949e", true, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-string", "#7ee787", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-number", "#ffa657", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-literal", "#79c0ff", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-lifecycle", "#ff7b72", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-keyword", "#d2a8ff", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-operator", "#c9d1d9", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-punctuation", "#8b949e", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-function", "#ffa657", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-method", "#ffd580", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-constructor", "#e3b341", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-struct", "#56d4dd", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-contract", "#79c0ff", false, false, true),
|
||||
new FrontendTokenStyleSpec("pbs-host", "#c297ff", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-builtin-type", "#7ee787", true, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-service", "#c297ff", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-error", "#ff7b72", false, false, true),
|
||||
new FrontendTokenStyleSpec("pbs-enum", "#56d4dd", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-callback", "#ffb3e6", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-global", "#f778ba", true, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-const", "#ffab70", false, true, false),
|
||||
new FrontendTokenStyleSpec("pbs-implements", "#a5d6ff", false, false, false),
|
||||
new FrontendTokenStyleSpec("pbs-identifier", "#d4d4d4", false, false, false)));
|
||||
}
|
||||
|
||||
+4
-3
@@ -51,12 +51,13 @@ public enum PbsSemanticKind {
|
||||
case COMMENT -> COMMENT;
|
||||
case STRING_LITERAL -> STRING;
|
||||
case INT_LITERAL, FLOAT_LITERAL, BOUNDED_LITERAL -> NUMBER;
|
||||
case TRUE, FALSE, NONE -> LITERAL;
|
||||
case TRUE, FALSE, NONE, SOME, OK, ERR -> LITERAL;
|
||||
case VOID, OPTIONAL, RESULT -> BUILTIN_TYPE;
|
||||
case IMPORT, FROM, AS, SERVICE, HOST, FN, APPLY, BIND, NEW, IMPLEMENTS, USING, CTOR,
|
||||
DECLARE, LET, CONST, GLOBAL, STRUCT, CONTRACT, ERROR, ENUM, CALLBACK, BUILTIN,
|
||||
SELF, THIS, PUB, MUT, MOD, TYPE, IF, ELSE, SWITCH, DEFAULT, FOR, UNTIL, STEP,
|
||||
WHILE, BREAK, CONTINUE, RETURN, VOID, OPTIONAL, RESULT, SOME, OK, ERR, HANDLE,
|
||||
AND, OR, NOT, SPAWN, YIELD, SLEEP, MATCH -> KEYWORD;
|
||||
WHILE, BREAK, CONTINUE, RETURN, HANDLE, AND, OR, NOT, SPAWN, YIELD, SLEEP,
|
||||
MATCH -> KEYWORD;
|
||||
case PLUS, MINUS, STAR, SLASH, PERCENT, BANG, PLUS_EQUAL, MINUS_EQUAL, STAR_EQUAL,
|
||||
SLASH_EQUAL, PERCENT_EQUAL, BANG_EQUAL, EQUAL, EQUAL_EQUAL, LESS, LESS_EQUAL,
|
||||
GREATER, GREATER_EQUAL, AND_AND, OR_OR, ARROW, QUESTION -> OPERATOR;
|
||||
|
||||
+2
-1
@@ -20,7 +20,8 @@ final class PbsSemanticPresentationContractTest {
|
||||
assertEquals(1, presentation.themes().size());
|
||||
assertEquals("PBS Default", presentation.defaultTheme().displayName());
|
||||
assertEquals("#d9e2ec", presentation.defaultTheme().editorPalette().baseForeground());
|
||||
assertEquals("#569cd6", presentation.defaultTheme().requireTokenStyle("pbs-keyword").foreground());
|
||||
assertEquals("#d2a8ff", presentation.defaultTheme().requireTokenStyle("pbs-keyword").foreground());
|
||||
assertTrue(presentation.defaultTheme().requireTokenStyle("pbs-builtin-type").italic());
|
||||
assertTrue(presentation.defaultTheme().requireTokenStyle("pbs-comment").italic());
|
||||
assertEquals(PBSFrontendHostProjections.VSCODE_HOST_ID, presentation.requireHostProjection("vscode").hostId());
|
||||
}
|
||||
|
||||
-6
@@ -8,12 +8,6 @@ public record FrontendSemanticPresentationSpec(
|
||||
String defaultThemeId,
|
||||
List<FrontendHostProjectionSpec> hostProjections) {
|
||||
|
||||
public FrontendSemanticPresentationSpec(
|
||||
final List<FrontendVisualThemeSpec> themes,
|
||||
final String defaultThemeId) {
|
||||
this(themes, defaultThemeId, List.of());
|
||||
}
|
||||
|
||||
public FrontendSemanticPresentationSpec {
|
||||
themes = List.copyOf(Objects.requireNonNull(themes, "themes"));
|
||||
defaultThemeId = Objects.requireNonNull(defaultThemeId, "defaultThemeId").trim();
|
||||
|
||||
Reference in New Issue
Block a user