From 4c0e7dda9fef584279396094e32436c77a4849f7 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 21 Jan 2024 13:07:16 -0800 Subject: [PATCH] =?UTF-8?q?Highlight=20JSON=20keys=20in=20the=20other=20si?= =?UTF-8?q?x=20builtin=20syntax=20themes=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …always using the color that was already used to highlight YAML keys. --- packages/atom-dark-syntax/index.less | 1 + packages/atom-dark-syntax/styles/syntax/json.less | 11 +++++++++++ packages/atom-light-syntax/index.less | 1 + packages/atom-light-syntax/styles/syntax/json.less | 11 +++++++++++ .../styles/syntax-legacy/json.less | 7 +++++++ .../styles/syntax-legacy/json.less | 7 +++++++ packages/solarized-dark-syntax/index.less | 1 + .../styles/syntax-legacy/json.less | 11 +++++++++++ packages/solarized-light-syntax/index.less | 1 + .../styles/syntax-legacy/json.less | 11 +++++++++++ 10 files changed, 62 insertions(+) create mode 100644 packages/atom-dark-syntax/styles/syntax/json.less create mode 100644 packages/atom-light-syntax/styles/syntax/json.less create mode 100644 packages/solarized-dark-syntax/styles/syntax-legacy/json.less create mode 100644 packages/solarized-light-syntax/styles/syntax-legacy/json.less diff --git a/packages/atom-dark-syntax/index.less b/packages/atom-dark-syntax/index.less index 161afc862..7a20f8eb9 100644 --- a/packages/atom-dark-syntax/index.less +++ b/packages/atom-dark-syntax/index.less @@ -9,3 +9,4 @@ @import "styles/syntax/base.less"; @import "styles/syntax/css.less"; @import "styles/syntax/html.less"; +@import "styles/syntax/json.less"; diff --git a/packages/atom-dark-syntax/styles/syntax/json.less b/packages/atom-dark-syntax/styles/syntax/json.less new file mode 100644 index 000000000..011feb3b2 --- /dev/null +++ b/packages/atom-dark-syntax/styles/syntax/json.less @@ -0,0 +1,11 @@ + +.syntax--source.syntax--json { + + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: #96CBFE; + } + } + +} diff --git a/packages/atom-light-syntax/index.less b/packages/atom-light-syntax/index.less index d86a25ba2..639a66be4 100644 --- a/packages/atom-light-syntax/index.less +++ b/packages/atom-light-syntax/index.less @@ -8,3 +8,4 @@ @import "styles/syntax/base.less"; @import "styles/syntax/css.less"; +@import "styles/syntax/json.less"; diff --git a/packages/atom-light-syntax/styles/syntax/json.less b/packages/atom-light-syntax/styles/syntax/json.less new file mode 100644 index 000000000..6891b18a3 --- /dev/null +++ b/packages/atom-light-syntax/styles/syntax/json.less @@ -0,0 +1,11 @@ + +.syntax--source.syntax--json { + + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: #008080; + } + } + +} diff --git a/packages/base16-tomorrow-dark-theme/styles/syntax-legacy/json.less b/packages/base16-tomorrow-dark-theme/styles/syntax-legacy/json.less index 9d451633f..a80b366aa 100644 --- a/packages/base16-tomorrow-dark-theme/styles/syntax-legacy/json.less +++ b/packages/base16-tomorrow-dark-theme/styles/syntax-legacy/json.less @@ -8,6 +8,13 @@ } } + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: @red; + } + } + .syntax--meta.syntax--structure.syntax--dictionary.syntax--json, .syntax--meta.syntax--structure.syntax--array.syntax--json { & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json, & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json > .syntax--punctuation { diff --git a/packages/base16-tomorrow-light-theme/styles/syntax-legacy/json.less b/packages/base16-tomorrow-light-theme/styles/syntax-legacy/json.less index 9d451633f..a80b366aa 100644 --- a/packages/base16-tomorrow-light-theme/styles/syntax-legacy/json.less +++ b/packages/base16-tomorrow-light-theme/styles/syntax-legacy/json.less @@ -8,6 +8,13 @@ } } + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: @red; + } + } + .syntax--meta.syntax--structure.syntax--dictionary.syntax--json, .syntax--meta.syntax--structure.syntax--array.syntax--json { & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json, & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json > .syntax--punctuation { diff --git a/packages/solarized-dark-syntax/index.less b/packages/solarized-dark-syntax/index.less index 66afd1ccf..b1a8c3699 100644 --- a/packages/solarized-dark-syntax/index.less +++ b/packages/solarized-dark-syntax/index.less @@ -12,6 +12,7 @@ @import "styles/syntax-legacy/css.less"; // @import "styles/syntax-legacy/go.less"; @import "styles/syntax-legacy/java.less"; +@import "styles/syntax-legacy/json.less"; // @import "styles/syntax-legacy/javascript.less"; @import "styles/syntax-legacy/markdown.less"; @import "styles/syntax-legacy/markup.less"; diff --git a/packages/solarized-dark-syntax/styles/syntax-legacy/json.less b/packages/solarized-dark-syntax/styles/syntax-legacy/json.less new file mode 100644 index 000000000..cdfa507c0 --- /dev/null +++ b/packages/solarized-dark-syntax/styles/syntax-legacy/json.less @@ -0,0 +1,11 @@ + +.syntax--source.syntax--json { + + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: @blue; + } + } + +} diff --git a/packages/solarized-light-syntax/index.less b/packages/solarized-light-syntax/index.less index 66afd1ccf..b1a8c3699 100644 --- a/packages/solarized-light-syntax/index.less +++ b/packages/solarized-light-syntax/index.less @@ -12,6 +12,7 @@ @import "styles/syntax-legacy/css.less"; // @import "styles/syntax-legacy/go.less"; @import "styles/syntax-legacy/java.less"; +@import "styles/syntax-legacy/json.less"; // @import "styles/syntax-legacy/javascript.less"; @import "styles/syntax-legacy/markdown.less"; @import "styles/syntax-legacy/markup.less"; diff --git a/packages/solarized-light-syntax/styles/syntax-legacy/json.less b/packages/solarized-light-syntax/styles/syntax-legacy/json.less new file mode 100644 index 000000000..cdfa507c0 --- /dev/null +++ b/packages/solarized-light-syntax/styles/syntax-legacy/json.less @@ -0,0 +1,11 @@ + +.syntax--source.syntax--json { + + // Color JSON keys differently from other strings. + .syntax--meta.syntax--structure.syntax--key { + .syntax--string.syntax--quoted.syntax--double { + color: @blue; + } + } + +}