From 7cf5944a22ca5b249a12d4ec4309e08b3a5ddaa4 Mon Sep 17 00:00:00 2001 From: Bogdan Condorachi Date: Fri, 24 May 2024 13:21:18 +0300 Subject: [PATCH] Rename BOOLEAN to LITERAL --- .../{PyBooleanPattern.php => PyLogicalValuePattern.php} | 4 ++-- src/Languages/Python/PythonLanguage.php | 6 +++--- src/Themes/Css/andromeeda.css | 2 +- src/Themes/Css/aurora-x.css | 2 +- src/Themes/Css/ayu-dark.css | 2 +- src/Themes/Css/catppuccin-frappe.css | 2 +- src/Themes/Css/catppuccin-latte.css | 2 +- src/Themes/Css/catppuccin-macchiato.css | 2 +- src/Themes/Css/catppuccin-mocha.css | 2 +- src/Themes/Css/dark-plus.css | 2 +- src/Themes/Css/dracula-soft.css | 2 +- src/Themes/Css/dracula.css | 2 +- src/Themes/Css/github-dark-default.css | 2 +- src/Themes/Css/github-dark-dimmed.css | 2 +- src/Themes/Css/github-dark.css | 2 +- src/Themes/Css/github-light-default.css | 2 +- src/Themes/Css/github-light.css | 2 +- src/Themes/Css/highlight-light-lite.css | 2 +- src/Themes/Css/houston.css | 2 +- src/Themes/Css/light-plus.css | 2 +- src/Themes/Css/material-theme-darker.css | 2 +- src/Themes/Css/material-theme-lighter.css | 2 +- src/Themes/Css/material-theme-ocean.css | 2 +- src/Themes/Css/material-theme-palenight.css | 2 +- src/Themes/Css/material-theme.css | 2 +- src/Themes/Css/min-dark.css | 2 +- src/Themes/Css/min-light.css | 2 +- src/Themes/Css/monokai.css | 2 +- src/Themes/Css/night-owl.css | 2 +- src/Themes/Css/nord.css | 2 +- src/Themes/Css/one-dark-pro.css | 2 +- src/Themes/Css/poimandres.css | 2 +- src/Themes/Css/red.css | 2 +- src/Themes/Css/rose-pine-dawn.css | 2 +- src/Themes/Css/rose-pine-moon.css | 2 +- src/Themes/Css/rose-pine.css | 2 +- src/Themes/Css/slack-dark.css | 2 +- src/Themes/Css/slack-ochin.css | 2 +- src/Themes/Css/solarized-dark.css | 2 +- src/Themes/Css/solarized-light.css | 2 +- src/Themes/Css/synthwave-84.css | 2 +- src/Themes/Css/tokyo-night.css | 2 +- src/Themes/Css/vesper.css | 2 +- src/Themes/Css/vitesse-black.css | 2 +- src/Themes/Css/vitesse-dark.css | 2 +- src/Themes/Css/vitesse-light.css | 2 +- src/Themes/CssTheme.php | 6 +++--- src/Themes/InlineTheme.php | 6 +++--- src/Themes/LightTerminalTheme.php | 2 +- src/Tokens/TokenTypeEnum.php | 6 +++--- 50 files changed, 59 insertions(+), 59 deletions(-) rename src/Languages/Python/Patterns/{PyBooleanPattern.php => PyLogicalValuePattern.php} (79%) diff --git a/src/Languages/Python/Patterns/PyBooleanPattern.php b/src/Languages/Python/Patterns/PyLogicalValuePattern.php similarity index 79% rename from src/Languages/Python/Patterns/PyBooleanPattern.php rename to src/Languages/Python/Patterns/PyLogicalValuePattern.php index e42d3af..560756a 100644 --- a/src/Languages/Python/Patterns/PyBooleanPattern.php +++ b/src/Languages/Python/Patterns/PyLogicalValuePattern.php @@ -8,7 +8,7 @@ use Tempest\Highlight\Pattern; use Tempest\Highlight\Tokens\TokenTypeEnum; -final readonly class PyBooleanPattern implements Pattern +final readonly class PyLogicalValuePattern implements Pattern { use IsPattern; @@ -19,6 +19,6 @@ public function getPattern(): string public function getTokenType(): TokenTypeEnum { - return TokenTypeEnum::BOOLEAN; + return TokenTypeEnum::LITERAL; } } diff --git a/src/Languages/Python/PythonLanguage.php b/src/Languages/Python/PythonLanguage.php index 9b0ced0..bca87ad 100644 --- a/src/Languages/Python/PythonLanguage.php +++ b/src/Languages/Python/PythonLanguage.php @@ -8,7 +8,6 @@ use Tempest\Highlight\Languages\Php\Patterns\DoubleQuoteValuePattern; use Tempest\Highlight\Languages\Php\Patterns\SingleQuoteValuePattern; use Tempest\Highlight\Languages\Python\Patterns\PyArgumentPattern; -use Tempest\Highlight\Languages\Python\Patterns\PyBooleanPattern; use Tempest\Highlight\Languages\Python\Patterns\PyBuiltinPattern; use Tempest\Highlight\Languages\Python\Patterns\PyClassNamePattern; use Tempest\Highlight\Languages\Python\Patterns\PyCommentPattern; @@ -17,6 +16,7 @@ use Tempest\Highlight\Languages\Python\Patterns\PyKeywordPattern; use Tempest\Highlight\Languages\Python\Patterns\PyNumberPattern; use Tempest\Highlight\Languages\Python\Patterns\PyOperatorPattern; +use Tempest\Highlight\Languages\Python\Patterns\PyLogicalValuePattern; use Tempest\Highlight\Languages\Python\Patterns\PyTripleDoubleQuoteStringPattern; use Tempest\Highlight\Languages\Python\Patterns\PyTripleSingleQuoteStringPattern; @@ -61,8 +61,8 @@ public function getPatterns(): array // NUMBERS new PyNumberPattern(), - // BOOLEANS - new PyBooleanPattern(), + // LITERALS + new PyLogicalValuePattern(), // OPERATORS new PyOperatorPattern(), diff --git a/src/Themes/Css/andromeeda.css b/src/Themes/Css/andromeeda.css index 3b6959c..c834c00 100644 --- a/src/Themes/Css/andromeeda.css +++ b/src/Themes/Css/andromeeda.css @@ -27,7 +27,7 @@ pre, code { color: #96E072; } -.hl-boolean { +.hl-literal { color: #96E072; } diff --git a/src/Themes/Css/aurora-x.css b/src/Themes/Css/aurora-x.css index ab84a88..8ba7b98 100644 --- a/src/Themes/Css/aurora-x.css +++ b/src/Themes/Css/aurora-x.css @@ -27,7 +27,7 @@ pre, code { color: #C3E88D; } -.hl-boolean { +.hl-literal { color: #C3E88D; } diff --git a/src/Themes/Css/ayu-dark.css b/src/Themes/Css/ayu-dark.css index 0bf7c19..1f59ce4 100644 --- a/src/Themes/Css/ayu-dark.css +++ b/src/Themes/Css/ayu-dark.css @@ -27,7 +27,7 @@ pre, code { color: #aad94c; } -.hl-boolean { +.hl-literal { color: #aad94c; } diff --git a/src/Themes/Css/catppuccin-frappe.css b/src/Themes/Css/catppuccin-frappe.css index 0fac46f..924b9dc 100644 --- a/src/Themes/Css/catppuccin-frappe.css +++ b/src/Themes/Css/catppuccin-frappe.css @@ -27,7 +27,7 @@ pre, code { color: #a6d189; } -.hl-boolean { +.hl-literal { color: #a6d189; } diff --git a/src/Themes/Css/catppuccin-latte.css b/src/Themes/Css/catppuccin-latte.css index 1008d93..1bffd5f 100644 --- a/src/Themes/Css/catppuccin-latte.css +++ b/src/Themes/Css/catppuccin-latte.css @@ -27,7 +27,7 @@ pre, code { color: #40a02b; } -.hl-boolean { +.hl-literal { color: #40a02b; } diff --git a/src/Themes/Css/catppuccin-macchiato.css b/src/Themes/Css/catppuccin-macchiato.css index ea079b8..218ca5a 100644 --- a/src/Themes/Css/catppuccin-macchiato.css +++ b/src/Themes/Css/catppuccin-macchiato.css @@ -27,7 +27,7 @@ pre, code { color: #a6da95; } -.hl-boolean { +.hl-literal { color: #a6da95; } diff --git a/src/Themes/Css/catppuccin-mocha.css b/src/Themes/Css/catppuccin-mocha.css index 5330bfd..e2639b5 100644 --- a/src/Themes/Css/catppuccin-mocha.css +++ b/src/Themes/Css/catppuccin-mocha.css @@ -27,7 +27,7 @@ pre, code { color: #a6e3a1; } -.hl-boolean { +.hl-literal { color: #a6e3a1; } diff --git a/src/Themes/Css/dark-plus.css b/src/Themes/Css/dark-plus.css index 1c0ab12..fc0b86a 100644 --- a/src/Themes/Css/dark-plus.css +++ b/src/Themes/Css/dark-plus.css @@ -27,7 +27,7 @@ pre, code { color: #ce9178; } -.hl-boolean { +.hl-literal { color: #ce9178; } diff --git a/src/Themes/Css/dracula-soft.css b/src/Themes/Css/dracula-soft.css index f27bbcb..7ae40f0 100644 --- a/src/Themes/Css/dracula-soft.css +++ b/src/Themes/Css/dracula-soft.css @@ -27,7 +27,7 @@ pre, code { color: #e7ee98; } -.hl-boolean { +.hl-literal { color: #e7ee98; } diff --git a/src/Themes/Css/dracula.css b/src/Themes/Css/dracula.css index 938b608..2cfaa91 100644 --- a/src/Themes/Css/dracula.css +++ b/src/Themes/Css/dracula.css @@ -27,7 +27,7 @@ pre, code { color: #F1FA8C; } -.hl-boolean { +.hl-literal { color: #F1FA8C; } diff --git a/src/Themes/Css/github-dark-default.css b/src/Themes/Css/github-dark-default.css index 0f52c50..0e60b6e 100644 --- a/src/Themes/Css/github-dark-default.css +++ b/src/Themes/Css/github-dark-default.css @@ -27,7 +27,7 @@ pre, code { color: #a5d6ff; } -.hl-boolean { +.hl-literal { color: #a5d6ff; } diff --git a/src/Themes/Css/github-dark-dimmed.css b/src/Themes/Css/github-dark-dimmed.css index 3415474..6051fe5 100644 --- a/src/Themes/Css/github-dark-dimmed.css +++ b/src/Themes/Css/github-dark-dimmed.css @@ -27,7 +27,7 @@ pre, code { color: #96d0ff; } -.hl-boolean { +.hl-literal { color: #96d0ff; } diff --git a/src/Themes/Css/github-dark.css b/src/Themes/Css/github-dark.css index 521fef2..fe6dd50 100644 --- a/src/Themes/Css/github-dark.css +++ b/src/Themes/Css/github-dark.css @@ -27,7 +27,7 @@ pre, code { color: #9ecbff; } -.hl-boolean { +.hl-literal { color: #9ecbff; } diff --git a/src/Themes/Css/github-light-default.css b/src/Themes/Css/github-light-default.css index 978a55b..de355df 100644 --- a/src/Themes/Css/github-light-default.css +++ b/src/Themes/Css/github-light-default.css @@ -27,7 +27,7 @@ pre, code { color: #0a3069; } -.hl-boolean { +.hl-literal { color: #0a3069; } diff --git a/src/Themes/Css/github-light.css b/src/Themes/Css/github-light.css index 12a4bcd..ff31ca6 100644 --- a/src/Themes/Css/github-light.css +++ b/src/Themes/Css/github-light.css @@ -27,7 +27,7 @@ pre, code { color: #032f62; } -.hl-boolean { +.hl-literal { color: #032f62; } diff --git a/src/Themes/Css/highlight-light-lite.css b/src/Themes/Css/highlight-light-lite.css index c7768ff..a35560a 100644 --- a/src/Themes/Css/highlight-light-lite.css +++ b/src/Themes/Css/highlight-light-lite.css @@ -24,7 +24,7 @@ pre, code { } .hl-number, -.hl-boolean, +.hl-literal, .hl-value { color: #000; } diff --git a/src/Themes/Css/houston.css b/src/Themes/Css/houston.css index 52d6dd7..5c1e9ff 100644 --- a/src/Themes/Css/houston.css +++ b/src/Themes/Css/houston.css @@ -27,7 +27,7 @@ pre, code { color: #ffd493; } -.hl-boolean { +.hl-literal { color: #ffd493; } diff --git a/src/Themes/Css/light-plus.css b/src/Themes/Css/light-plus.css index 69afe11..b59efb0 100644 --- a/src/Themes/Css/light-plus.css +++ b/src/Themes/Css/light-plus.css @@ -27,7 +27,7 @@ pre, code { color: #a31515; } -.hl-boolean { +.hl-literal { color: #a31515; } diff --git a/src/Themes/Css/material-theme-darker.css b/src/Themes/Css/material-theme-darker.css index c4b4c9d..f4c112f 100644 --- a/src/Themes/Css/material-theme-darker.css +++ b/src/Themes/Css/material-theme-darker.css @@ -27,7 +27,7 @@ pre, code { color: #C3E88D; } -.hl-boolean { +.hl-literal { color: #ff9cac; } diff --git a/src/Themes/Css/material-theme-lighter.css b/src/Themes/Css/material-theme-lighter.css index 8c338ce..6de8a47 100644 --- a/src/Themes/Css/material-theme-lighter.css +++ b/src/Themes/Css/material-theme-lighter.css @@ -27,7 +27,7 @@ pre, code { color: #91B859; } -.hl-boolean { +.hl-literal { color: #FF5370; } diff --git a/src/Themes/Css/material-theme-ocean.css b/src/Themes/Css/material-theme-ocean.css index 9596df3..a8c4a64 100644 --- a/src/Themes/Css/material-theme-ocean.css +++ b/src/Themes/Css/material-theme-ocean.css @@ -27,7 +27,7 @@ pre, code { color: #C3E88D; } -.hl-boolean { +.hl-literal { color: #ff9cac; } diff --git a/src/Themes/Css/material-theme-palenight.css b/src/Themes/Css/material-theme-palenight.css index 165c3e2..cdd6504 100644 --- a/src/Themes/Css/material-theme-palenight.css +++ b/src/Themes/Css/material-theme-palenight.css @@ -27,7 +27,7 @@ pre, code { color: #C3E88D; } -.hl-boolean { +.hl-literal { color: #ff9cac; } diff --git a/src/Themes/Css/material-theme.css b/src/Themes/Css/material-theme.css index c1a2a50..a6e9fc7 100644 --- a/src/Themes/Css/material-theme.css +++ b/src/Themes/Css/material-theme.css @@ -27,7 +27,7 @@ pre, code { color: #C3E88D; } -.hl-boolean { +.hl-literal { color: #ff9cac; } diff --git a/src/Themes/Css/min-dark.css b/src/Themes/Css/min-dark.css index 97cf6d6..fa5f511 100644 --- a/src/Themes/Css/min-dark.css +++ b/src/Themes/Css/min-dark.css @@ -27,7 +27,7 @@ pre, code { color: #9db1c5; } -.hl-boolean { +.hl-literal { color: #9db1c5; } diff --git a/src/Themes/Css/min-light.css b/src/Themes/Css/min-light.css index 2abc8e8..029af8d 100644 --- a/src/Themes/Css/min-light.css +++ b/src/Themes/Css/min-light.css @@ -27,7 +27,7 @@ pre, code { color: #2b5581; } -.hl-boolean { +.hl-literal { color: #2b5581; } diff --git a/src/Themes/Css/monokai.css b/src/Themes/Css/monokai.css index 7a82bdb..ba06580 100644 --- a/src/Themes/Css/monokai.css +++ b/src/Themes/Css/monokai.css @@ -27,7 +27,7 @@ pre, code { color: #E6DB74; } -.hl-boolean { +.hl-literal { color: #E6DB74; } diff --git a/src/Themes/Css/night-owl.css b/src/Themes/Css/night-owl.css index 428ac84..479c54a 100644 --- a/src/Themes/Css/night-owl.css +++ b/src/Themes/Css/night-owl.css @@ -27,7 +27,7 @@ pre, code { color: #ecc48d; } -.hl-boolean { +.hl-literal { color: #ff5874; } diff --git a/src/Themes/Css/nord.css b/src/Themes/Css/nord.css index 8a05ed7..b9f41cb 100644 --- a/src/Themes/Css/nord.css +++ b/src/Themes/Css/nord.css @@ -27,7 +27,7 @@ pre, code { color: #A3BE8C; } -.hl-boolean { +.hl-literal { color: #A3BE8C; } diff --git a/src/Themes/Css/one-dark-pro.css b/src/Themes/Css/one-dark-pro.css index 79aabba..72e898f 100644 --- a/src/Themes/Css/one-dark-pro.css +++ b/src/Themes/Css/one-dark-pro.css @@ -27,7 +27,7 @@ pre, code { color: #98c379; } -.hl-boolean { +.hl-literal { color: #98c379; } diff --git a/src/Themes/Css/poimandres.css b/src/Themes/Css/poimandres.css index 9604244..67c0f9b 100644 --- a/src/Themes/Css/poimandres.css +++ b/src/Themes/Css/poimandres.css @@ -27,7 +27,7 @@ pre, code { color: #5DE4c7; } -.hl-boolean { +.hl-literal { color: #5DE4c7; } diff --git a/src/Themes/Css/red.css b/src/Themes/Css/red.css index 3edd002..a8bf987 100644 --- a/src/Themes/Css/red.css +++ b/src/Themes/Css/red.css @@ -27,7 +27,7 @@ pre, code { color: #cd8d8dff; } -.hl-boolean { +.hl-literal { color: #cd8d8dff; } diff --git a/src/Themes/Css/rose-pine-dawn.css b/src/Themes/Css/rose-pine-dawn.css index dddb65a..0faedac 100644 --- a/src/Themes/Css/rose-pine-dawn.css +++ b/src/Themes/Css/rose-pine-dawn.css @@ -27,7 +27,7 @@ pre, code { color: #ea9d34; } -.hl-boolean { +.hl-literal { color: #ea9d34; } diff --git a/src/Themes/Css/rose-pine-moon.css b/src/Themes/Css/rose-pine-moon.css index c60b210..c79406b 100644 --- a/src/Themes/Css/rose-pine-moon.css +++ b/src/Themes/Css/rose-pine-moon.css @@ -27,7 +27,7 @@ pre, code { color: #f6c177; } -.hl-boolean { +.hl-literal { color: #f6c177; } diff --git a/src/Themes/Css/rose-pine.css b/src/Themes/Css/rose-pine.css index 7d2541a..c64753b 100644 --- a/src/Themes/Css/rose-pine.css +++ b/src/Themes/Css/rose-pine.css @@ -27,7 +27,7 @@ pre, code { color: #f6c177; } -.hl-boolean { +.hl-literal { color: #f6c177; } diff --git a/src/Themes/Css/slack-dark.css b/src/Themes/Css/slack-dark.css index dfbff7c..9a5973f 100644 --- a/src/Themes/Css/slack-dark.css +++ b/src/Themes/Css/slack-dark.css @@ -27,7 +27,7 @@ pre, code { color: #ce9178; } -.hl-boolean { +.hl-literal { color: #ce9178; } diff --git a/src/Themes/Css/slack-ochin.css b/src/Themes/Css/slack-ochin.css index 8fcd29b..b3979ff 100644 --- a/src/Themes/Css/slack-ochin.css +++ b/src/Themes/Css/slack-ochin.css @@ -27,7 +27,7 @@ pre, code { color: #a44185; } -.hl-boolean { +.hl-literal { color: #a44185; } diff --git a/src/Themes/Css/solarized-dark.css b/src/Themes/Css/solarized-dark.css index f894bec..c58701d 100644 --- a/src/Themes/Css/solarized-dark.css +++ b/src/Themes/Css/solarized-dark.css @@ -27,7 +27,7 @@ pre, code { color: #2AA198; } -.hl-boolean { +.hl-literal { color: #2AA198; } diff --git a/src/Themes/Css/solarized-light.css b/src/Themes/Css/solarized-light.css index 24e085d..fbf93de 100644 --- a/src/Themes/Css/solarized-light.css +++ b/src/Themes/Css/solarized-light.css @@ -27,7 +27,7 @@ pre, code { color: #2AA198; } -.hl-boolean { +.hl-literal { color: #2AA198; } diff --git a/src/Themes/Css/synthwave-84.css b/src/Themes/Css/synthwave-84.css index a490409..5ef7da3 100644 --- a/src/Themes/Css/synthwave-84.css +++ b/src/Themes/Css/synthwave-84.css @@ -27,7 +27,7 @@ pre, code { color: #000; } -.hl-boolean { +.hl-literal { color: #000; } diff --git a/src/Themes/Css/tokyo-night.css b/src/Themes/Css/tokyo-night.css index db047f1..53296cc 100644 --- a/src/Themes/Css/tokyo-night.css +++ b/src/Themes/Css/tokyo-night.css @@ -27,7 +27,7 @@ pre, code { color: #9ece6a; } -.hl-boolean { +.hl-literal { color: #9ece6a; } diff --git a/src/Themes/Css/vesper.css b/src/Themes/Css/vesper.css index 4b3967c..fdf016e 100644 --- a/src/Themes/Css/vesper.css +++ b/src/Themes/Css/vesper.css @@ -27,7 +27,7 @@ pre, code { color: #99FFE4; } -.hl-boolean { +.hl-literal { color: #FFC799; } diff --git a/src/Themes/Css/vitesse-black.css b/src/Themes/Css/vitesse-black.css index 3ec831a..fc6839d 100644 --- a/src/Themes/Css/vitesse-black.css +++ b/src/Themes/Css/vitesse-black.css @@ -27,7 +27,7 @@ pre, code { color: #c98a7d; } -.hl-boolean { +.hl-literal { color: #c98a7d; } diff --git a/src/Themes/Css/vitesse-dark.css b/src/Themes/Css/vitesse-dark.css index 1abd55e..eeb022b 100644 --- a/src/Themes/Css/vitesse-dark.css +++ b/src/Themes/Css/vitesse-dark.css @@ -27,7 +27,7 @@ pre, code { color: #c98a7d; } -.hl-boolean { +.hl-literal { color: #c98a7d; } diff --git a/src/Themes/Css/vitesse-light.css b/src/Themes/Css/vitesse-light.css index aa2a04c..93acd67 100644 --- a/src/Themes/Css/vitesse-light.css +++ b/src/Themes/Css/vitesse-light.css @@ -27,7 +27,7 @@ pre, code { color: #b56959; } -.hl-boolean { +.hl-literal { color: #b56959; } diff --git a/src/Themes/CssTheme.php b/src/Themes/CssTheme.php index 7a2d901..a0c3bc4 100644 --- a/src/Themes/CssTheme.php +++ b/src/Themes/CssTheme.php @@ -21,15 +21,15 @@ public function before(TokenType $tokenType): string $class = match ($tokenType) { TokenTypeEnum::KEYWORD => 'hl-keyword', - TokenTypeEnum::VARIABLE => 'hl-variable', TokenTypeEnum::OPERATOR => 'hl-operator', TokenTypeEnum::TYPE => 'hl-type', TokenTypeEnum::VALUE => 'hl-value', - TokenTypeEnum::NUMBER => 'hl-number', - TokenTypeEnum::BOOLEAN => 'hl-boolean', + TokenTypeEnum::VARIABLE => 'hl-variable', TokenTypeEnum::PROPERTY => 'hl-property', TokenTypeEnum::ATTRIBUTE => 'hl-attribute', TokenTypeEnum::GENERIC => 'hl-generic', + TokenTypeEnum::NUMBER => 'hl-number', + TokenTypeEnum::LITERAL => 'hl-literal', TokenTypeEnum::COMMENT => 'hl-comment', TokenTypeEnum::INJECTION => 'hl-injection', default => $tokenType->getValue(), diff --git a/src/Themes/InlineTheme.php b/src/Themes/InlineTheme.php index a2ef3bc..e65f17c 100644 --- a/src/Themes/InlineTheme.php +++ b/src/Themes/InlineTheme.php @@ -43,15 +43,15 @@ public function before(TokenType $tokenType): string $class = match ($tokenType) { TokenTypeEnum::KEYWORD => 'hl-keyword', - TokenTypeEnum::VARIABLE => 'hl-variable', TokenTypeEnum::OPERATOR => 'hl-operator', TokenTypeEnum::TYPE => 'hl-type', TokenTypeEnum::VALUE => 'hl-value', - TokenTypeEnum::NUMBER => 'hl-number', - TokenTypeEnum::BOOLEAN => 'hl-boolean', + TokenTypeEnum::VARIABLE => 'hl-variable', TokenTypeEnum::PROPERTY => 'hl-property', TokenTypeEnum::ATTRIBUTE => 'hl-attribute', TokenTypeEnum::GENERIC => 'hl-generic', + TokenTypeEnum::NUMBER => 'hl-number', + TokenTypeEnum::LITERAL => 'hl-literal', TokenTypeEnum::COMMENT => 'hl-comment', TokenTypeEnum::INJECTION => 'hl-injection', default => $tokenType->getValue(), diff --git a/src/Themes/LightTerminalTheme.php b/src/Themes/LightTerminalTheme.php index dcf49bc..a14e3f5 100644 --- a/src/Themes/LightTerminalTheme.php +++ b/src/Themes/LightTerminalTheme.php @@ -19,7 +19,7 @@ public function before(TokenType $tokenType): string TokenTypeEnum::TYPE => TerminalStyle::FG_DARK_RED, TokenTypeEnum::VALUE => TerminalStyle::FG_BLACK, TokenTypeEnum::NUMBER => TerminalStyle::FG_DARK_YELLOW, - TokenTypeEnum::BOOLEAN => TerminalStyle::FG_DARK_BLUE, + TokenTypeEnum::LITERAL => TerminalStyle::FG_DARK_BLUE, TokenTypeEnum::PROPERTY => TerminalStyle::FG_DARK_GREEN, TokenTypeEnum::GENERIC => TerminalStyle::FG_DARK_CYAN, TokenTypeEnum::COMMENT => TerminalStyle::FG_GRAY, diff --git a/src/Tokens/TokenTypeEnum.php b/src/Tokens/TokenTypeEnum.php index 8648459..4269b39 100644 --- a/src/Tokens/TokenTypeEnum.php +++ b/src/Tokens/TokenTypeEnum.php @@ -7,15 +7,15 @@ enum TokenTypeEnum: string implements TokenType { case KEYWORD = 'keyword'; - case VARIABLE = 'variable'; case OPERATOR = 'operator'; case TYPE = 'type'; case VALUE = 'value'; - case NUMBER = 'number'; - case BOOLEAN = 'boolean'; + case VARIABLE = 'variable'; case PROPERTY = 'property'; case ATTRIBUTE = 'attribute'; case GENERIC = 'generic'; + case NUMBER = 'number'; + case LITERAL = 'literal'; case COMMENT = 'comment'; case INJECTION = 'injection'; case HIDDEN = 'hidden';