new: added support for toml and json formats in theme configurations (#…

…300)

.github/workflows/ci.yml

@@ -16,18 +16,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Validate configs
+      - name: Validate YAML configs
         uses: cardinalby/schema-validator-action@v3
         with:
           file: 'etc/defaults/config*.yaml'
           schema: 'schema/json/config.schema.json'
 
-      - name: Validate themes
+      - name: Validate YAML themes
         uses: cardinalby/schema-validator-action@v3
         with:
-          file: 'etc/defaults/themes/*.yaml|src/testing/assets/themes/*.yaml'
+          file: 'etc/defaults/themes/*.yaml'
           schema: 'schema/json/theme.schema.json'
 
+      - name: Setup taplo
+        uses: uncenter/setup-taplo@v1
+
+      - name: Validate TOML configs and themes
+        run: taplo check
+
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:

.taplo.toml

@@ -0,0 +1 @@
+include = ["src/testing/assets/themes/test.toml"]

Cargo.toml

@@ -4,7 +4,7 @@ members = [".", "crate/encstr"]
 [workspace.package]
 repository = "https://github.com/pamburus/hl"
 authors = ["Pavel Ivanov <mr.pavel.ivanov@gmail.com>"]
-version = "0.29.7-alpha.4"
+version = "0.29.7-alpha.5"
 edition = "2021"
 license = "MIT"
 
@@ -74,6 +74,7 @@ snap = "1"
 strum = { version = "0", features = ["derive"] }
 thiserror = "1"
 titlecase = "3"
+toml = "0"
 wildflower = { git = "https://github.com/cassaundra/wildflower.git" }
 winapi-util = { version = "0" }
 wyhash = "0"

Makefile

@@ -16,15 +16,20 @@ help:
 .PHONY: help
 
 ## Run continuous integration tests
-ci: check-fmt test build
+ci: check-fmt check-schema test build
 	@cargo run -- --version
 .PHONY: ci
 
 ## Run code formatting tests
-check-fmt:
+check-fmt: contrib-build
 	@cargo +nightly fmt --all -- --check
 .PHONY: check-fmt
 
+## Run schema validation tests
+check-schema: contrib-build
+	@taplo check
+.PHONY: check-schema
+
 ## Automatically format code
 fmt:
 	@cargo +nightly fmt --all

contrib/bin/setup.sh

@@ -120,12 +120,20 @@ setup_screenshot_tools() {
     setup_alacritty
 }
 
+setup_taplo() {
+    setup_cargo
+    if [ ! -x "$(command -v taplo)" ]; then
+        cargo install taplo-cli --locked --features lsp
+    fi
+}
+
 # --- main ---
 
 while [ $# -gt 0 ]; do
     case $1 in
         build)
             setup_cargo
+            setup_taplo
             ;;
         coverage)
             setup_coverage_tools

src/error.rs

@@ -43,12 +43,21 @@ pub enum Error {
     UnrecognizedTime(String),
     #[error("unknown theme {name:?}, use any of {known:?}")]
     UnknownTheme { name: String, known: Vec<String> },
+    #[error("failed to load theme {}: {source}", HILITE.paint(.filename))]
+    FailedToLoadTheme {
+        name: String,
+        filename: String,
+        #[source]
+        source: Box<Error>,
+    },
     #[error("failed to parse utf-8 string: {0}")]
     Utf8Error(#[from] std::str::Utf8Error),
     #[error("failed to construct utf-8 string from bytes: {0}")]
     FromUtf8Error(#[from] std::string::FromUtf8Error),
     #[error("failed to parse yaml: {0}")]
     YamlError(#[from] serde_yaml::Error),
+    #[error(transparent)]
+    TomlError(#[from] toml::de::Error),
     #[error("failed to parse json: {0}")]
     WrongFieldFilter(String),
     #[error("wrong regular expression: {0}")]

src/testing/assets/themes/invalid-type.yaml/.gitignore

@@ -0,0 +1 @@
+!.gitignore

src/testing/assets/themes/invalid.json

@@ -0,0 +1,9 @@
+{
+    "elements": {
+        "input": {
+            "modes": [
+                "invalid"
+            ]
+        }
+    }
+}

src/testing/assets/themes/test.toml

@@ -0,0 +1,74 @@
+#:schema ../../../../schema/json/theme.schema.json
+
+[elements.input]
+modes = ["faint"]
+
+[elements.time]
+modes = ["faint", "italic"]
+
+[elements.logger]
+modes = ["faint", "underline"]
+
+[elements.caller]
+modes = ["faint", "italic"]
+
+[elements.level]
+foreground = "cyan"
+
+[elements.message]
+foreground = "default"
+modes = ["bold"]
+
+[elements.field]
+modes = ["faint"]
+
+[elements.key]
+foreground = "green"
+
+[elements.ellipsis]
+modes = ["faint"]
+
+[elements.object]
+foreground = "yellow"
+
+[elements.array]
+foreground = "bright-yellow"
+
+[elements.string]
+foreground = "default"
+
+[elements.number]
+foreground = "bright-blue"
+
+[elements.boolean]
+foreground = "bright-green"
+
+[elements.null]
+foreground = "bright-red"
+
+[levels.debug.level-inner]
+foreground = "bright-magenta"
+
+[levels.info.level-inner]
+foreground = "cyan"
+
+[levels.warning.level]
+foreground = "yellow"
+modes = ["reverse"]
+
+[levels.error.time]
+foreground = "bright-red"
+
+[levels.error.level]
+foreground = "bright-red"
+modes = ["reverse"]
+
+[indicators.sync.synced]
+text = " "
+
+[indicators.sync.failed]
+text = "!"
+
+[indicators.sync.failed.inner.style]
+foreground = "yellow"
+modes = ["bold"]