From 82add48e51da2b443b70b8521815bfbf6333587f Mon Sep 17 00:00:00 2001 From: "Sean E. Russell" Date: Thu, 20 Feb 2020 13:05:28 -0600 Subject: [PATCH] Fixes #57. Also renames files that came with a pull request such that they follow golang file naming conventions (underscores rather than dashes), mainly for consistency. --- colorschemes/default_dark.go | 2 +- colorschemes/registry_test.go | 20 +++++++++++++++++++ ...olarized16-dark.go => solarized16_dark.go} | 2 +- ...arized16-light.go => solarized16_light.go} | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 colorschemes/registry_test.go rename colorschemes/{solarized16-dark.go => solarized16_dark.go} (90%) rename colorschemes/{solarized16-light.go => solarized16_light.go} (90%) diff --git a/colorschemes/default_dark.go b/colorschemes/default_dark.go index 7ddb5f7..849f85b 100644 --- a/colorschemes/default_dark.go +++ b/colorschemes/default_dark.go @@ -1,7 +1,7 @@ package colorschemes func init() { - register("defaultdark", Colorscheme{ + register("default-dark", Colorscheme{ Fg: 235, Bg: -1, diff --git a/colorschemes/registry_test.go b/colorschemes/registry_test.go new file mode 100644 index 0000000..e4216ab --- /dev/null +++ b/colorschemes/registry_test.go @@ -0,0 +1,20 @@ +package colorschemes + +import ( + "reflect" + "testing" +) + +func TestColorRegistry(t *testing.T) { + colors := []string{"default", "default-dark", "solarized", "solarized16-dark", "solarized16-light", "monokai", "vice"} + zeroCS := Colorscheme{} + for _, cn := range colors { + c, e := FromName("", cn) + if e != nil { + t.Errorf("unexpected error fetching built-in color %s: %s", cn, e) + } + if reflect.DeepEqual(c, zeroCS) { + t.Error("expected a colorscheme, but got back a zero value.") + } + } +} diff --git a/colorschemes/solarized16-dark.go b/colorschemes/solarized16_dark.go similarity index 90% rename from colorschemes/solarized16-dark.go rename to colorschemes/solarized16_dark.go index 202dbab..354991b 100644 --- a/colorschemes/solarized16-dark.go +++ b/colorschemes/solarized16_dark.go @@ -3,7 +3,7 @@ package colorschemes // This scheme assumes the terminal already uses Solarized. Only DiskBar is // different between dark/light. func init() { - register("solarized16dark", Colorscheme{ + register("solarized16-dark", Colorscheme{ Fg: -1, Bg: -1, diff --git a/colorschemes/solarized16-light.go b/colorschemes/solarized16_light.go similarity index 90% rename from colorschemes/solarized16-light.go rename to colorschemes/solarized16_light.go index 351fe4e..0fae397 100644 --- a/colorschemes/solarized16-light.go +++ b/colorschemes/solarized16_light.go @@ -3,7 +3,7 @@ package colorschemes // This scheme assumes the terminal already uses Solarized. Only DiskBar is // different between dark/light. func init() { - register("solarized16light", Colorscheme{ + register("solarized16-light", Colorscheme{ Fg: -1, Bg: -1,