feat!: support leap (drop lightspeed) (#94)

zenbones-theme · Sep 18, 2022 · d8a93c2 · d8a93c2
1 parent 30d9598
commit d8a93c2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ currently supported.
 -   [Indent Blankline](https://github.com/lukas-reineke/indent-blankline.nvim)
 -   [Telescope](https://github.com/nvim-telescope/telescope.nvim)
 -   [Sneak](https://github.com/justinmk/vim-sneak)
--   [Lightspeed](https://github.com/ggandor/lightspeed.nvim)
+-   [Leap](https://github.com/ggandor/leap.nvim)
 -   [Hop](https://github.com/phaazon/hop.nvim)
 -   [Lualine](https://github.com/hoob3rt/lualine.nvim)
 -   [Lightline](https://github.com/itchyny/lightline.vim)

diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua
@@ -307,22 +307,15 @@ local function generate(p, opt)
 			SneakLabel                       { WildMenu },
 			SneakLabelMask                   { bg = p.blossom, fg = p.blossom },
 
-			LightspeedLabel                  { fg = p.blossom, gui = "bold,underline" },
-			LightspeedLabelOverlapped        { fg = p.blossom, gui = "underline" },
-			LightspeedLabelDistant           { fg = p.sky, gui = "bold,underline" },
-			LightspeedLabelDistantOverlapped { fg = p.sky, gui = "underline" },
-			LightspeedShortcut               { SneakLabel, gui = "bold,underline" },
-			LightspeedOneCharMatch           { SneakLabel, gui = "bold" },
-			LightspeedMaskedChar             { Conceal },
-			LightspeedUnlabeledMatch         { Bold },
-			LightspeedPendingOpArea          { SneakLabel },
-			LightspeedPendingChangeOpArea    { fg = p.blossom },
-			LightspeedGreyWash               { fg = Comment.fg },
-
-			HopNextKey                       { LightspeedLabel },
-			HopNextKey1                      { LightspeedLabelDistant },
+			LeapMatch                        { gui = "bold,underline,nocombine" },
+			LeapLabelPrimary                 { Search , gui = "bold,nocombine" },
+			LeapLabelSecondary               { DiffText, gui = "bold,nocombine" },
+			LeapLabelSelected                { IncSearch },
+
+			HopNextKey                       { fg = p.blossom, gui = "bold,underline" },
+			HopNextKey1                      { fg = p.sky, gui = "bold,underline" },
 			HopNextKey2                      { fg = p.water },
-			HopUnmatched                     { LightspeedGreyWash } ,
+			HopUnmatched                     { fg = Comment.fg },
 
 			BufferCurrent                    { TabLineSel },
 			BufferVisible                    { fg = StatusLineNC.fg },

diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua
@@ -68,7 +68,7 @@ local function generate(p, opt)
 			LineNr          { fg = p1.bg.da(opt.darken_line_nr or 33), bg = opt.solid_line_nr and p1.bg.da(4) or "NONE" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
 			SignColumn      { LineNr }, -- column where |signs| are displayed
 			FoldColumn      { LineNr, gui = "bold" }, -- 'foldcolumn'
-			Folded          { bg = p1.bg.da(16), fg = p1.bg.da(64) }, -- line used for closed folds
+			Folded          { bg = not opt.transparent_background and p1.bg.da(16) or "NONE", fg = p1.bg.da(64) }, -- line used for closed folds
 			CursorLineNr    { LineNr, fg = p.fg, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
 
 			-- ModeMsg      { }, -- 'showmode' message (e.g., "-- INSERT -- ")
@@ -307,22 +307,15 @@ local function generate(p, opt)
 			SneakLabel                       { WildMenu },
 			SneakLabelMask                   { bg = p.blossom, fg = p.blossom },
 
-			LightspeedLabel                  { fg = p.blossom, gui = "bold,underline" },
-			LightspeedLabelOverlapped        { fg = p.blossom, gui = "underline" },
-			LightspeedLabelDistant           { fg = p.sky, gui = "bold,underline" },
-			LightspeedLabelDistantOverlapped { fg = p.sky, gui = "underline" },
-			LightspeedShortcut               { SneakLabel, gui = "bold,underline" },
-			LightspeedOneCharMatch           { SneakLabel, gui = "bold" },
-			LightspeedMaskedChar             { Conceal },
-			LightspeedUnlabeledMatch         { Bold },
-			LightspeedPendingOpArea          { SneakLabel },
-			LightspeedPendingChangeOpArea    { fg = p.blossom },
-			LightspeedGreyWash               { fg = Comment.fg },
-
-			HopNextKey                       { LightspeedLabel },
-			HopNextKey1                      { LightspeedLabelDistant },
+			LeapMatch                        { gui = "bold,underline,nocombine" },
+			LeapLabelPrimary                 { Search , gui = "bold,nocombine" },
+			LeapLabelSecondary               { DiffText, gui = "bold,nocombine" },
+			LeapLabelSelected                { IncSearch },
+
+			HopNextKey                       { fg = p.blossom, gui = "bold,underline" },
+			HopNextKey1                      { fg = p.sky, gui = "bold,underline" },
 			HopNextKey2                      { fg = p.water },
-			HopUnmatched                     { LightspeedGreyWash } ,
+			HopUnmatched                     { fg = Comment.fg },
 
 			BufferCurrent                    { TabLineSel },
 			BufferVisible                    { fg = StatusLineNC.fg },