summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEero Ruohola <eero.ruohola@icloud.com>2021-02-11 01:06:19 +0200
committerGitHub <noreply@github.com>2021-02-10 15:06:19 -0800
commit87ffae295edf4fb2a9c33c552b12f09921def29f (patch)
tree18a0adfcd6d69c7516bac02c841cc2e48e20e7b4
parent000102ef9b617e3da1f99d0b637602205304db11 (diff)
Fix issue where `syntax_style` config value would not have any effect (#1241)
These config properties got introduced in 41dd24e8 as a means to have more granular control over the syntax highlighting. The problem is that these cannot be in the default config file since `get_config()` always reads both the default config file and the user specified one, and there is no way to unset these variables in the user specified config file to restore their default behavior. Even if there would be a way, it wouldn't be intuitive at all to be required to unset some random settings under the `[colors]` section just to be able to use the well documented `syntax_style` setting. Note that one *can* still set these three lines in their user config file if they want to utilize them. Resolves #1212
-rw-r--r--AUTHORS1
-rw-r--r--changelog.rst8
-rw-r--r--pgcli/pgclirc9
3 files changed, 15 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index baaf758c..b7f50adf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -114,6 +114,7 @@ Contributors:
* Tom Caruso (tomplex)
* Jan Brun Rasmussen (janbrunrasmussen)
* Kevin Marsh (kevinmarsh)
+ * Eero Ruohola (ruohola)
Creator:
--------
diff --git a/changelog.rst b/changelog.rst
index ec506354..224934c1 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,3 +1,11 @@
+TBD
+===
+
+Bug fixes:
+----------
+
+* Fix issue where `syntax_style` config value would not have any effect. (#1212)
+
3.1.0
=====
diff --git a/pgcli/pgclirc b/pgcli/pgclirc
index e97afdab..d9a8c2b4 100644
--- a/pgcli/pgclirc
+++ b/pgcli/pgclirc
@@ -170,9 +170,12 @@ arg-toolbar = 'noinherit bold'
arg-toolbar.text = 'nobold'
bottom-toolbar.transaction.valid = 'bg:#222222 #00ff5f bold'
bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold'
-literal.string = '#ba2121'
-literal.number = '#666666'
-keyword = 'bold #008000'
+# These three values can be used to further refine the syntax highlighting.
+# They are commented out by default, since they have priority over the theme set
+# with the `syntax_style` setting and overriding its behavior can be confusing.
+# literal.string = '#ba2121'
+# literal.number = '#666666'
+# keyword = 'bold #008000'
# style classes for colored table output
output.header = "#00ff5f bold"