Merge branch 'main' into refactor/syntax-highlighting

Author: Jint-lzxy

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [1.4.0](https://github.com/catppuccin/nvim/compare/v1.3.0...v1.4.0) (2023-08-21)
+
+
+### Features
+
+* add ability to enable/disable all integrations by default ([#552](https://github.com/catppuccin/nvim/issues/552)) ([737f60a](https://github.com/catppuccin/nvim/commit/737f60a3a25c79d9bb9574092f6c6c958a3d747a))
+* add flash.nvim integration ([#550](https://github.com/catppuccin/nvim/issues/550)) ([381eddd](https://github.com/catppuccin/nvim/commit/381edddc4ad12126cfa7276818bca07c3d5606ed))
+* enable neogit by default ([91f9f6f](https://github.com/catppuccin/nvim/commit/91f9f6fb413caff2bd06e326ec174deee1c1b7a9)), closes [#568](https://github.com/catppuccin/nvim/issues/568)
+* **flash:** enable by default ([#551](https://github.com/catppuccin/nvim/issues/551)) ([a84ee18](https://github.com/catppuccin/nvim/commit/a84ee1848bfac4601771805396552bdbaa0a0e91))
+* **gitsigns:** Support GitSignsCurrentLineBlame highlights ([#567](https://github.com/catppuccin/nvim/issues/567)) ([3fdd394](https://github.com/catppuccin/nvim/commit/3fdd3942567503d23b65ccc21e7d7757334defd5))
+* **lspsaga:** support v0.3 ([#543](https://github.com/catppuccin/nvim/issues/543)) ([3ffd2f5](https://github.com/catppuccin/nvim/commit/3ffd2f511f3dc6c01258923d7170ccaf1445634b))
+* **lspsaga:** upstream new hl groups ([#544](https://github.com/catppuccin/nvim/issues/544)) ([e0dd3f9](https://github.com/catppuccin/nvim/commit/e0dd3f9bb1513c98ab4ef9404ea26e18babf858a))
+* **neogit:** update highlights ([#545](https://github.com/catppuccin/nvim/issues/545)) ([#549](https://github.com/catppuccin/nvim/issues/549)) ([371430f](https://github.com/catppuccin/nvim/commit/371430f32f2637d2dd5796399b3982d4cada61d8))
+* **telescope:** make nvchad style great again ([#538](https://github.com/catppuccin/nvim/issues/538)) ([51961da](https://github.com/catppuccin/nvim/commit/51961da41e8189ca6f9ed73f37dfa83087b4e65c))
+* **treesitter-context:** add color for normal background ([#564](https://github.com/catppuccin/nvim/issues/564)) ([b1caff9](https://github.com/catppuccin/nvim/commit/b1caff988fb395c0aae585cecff58b1ffa0a21c6))
+
+
+### Bug Fixes
+
+* don't highlight fg of `PmenuSel` ([#554](https://github.com/catppuccin/nvim/issues/554)) ([6425df1](https://github.com/catppuccin/nvim/commit/6425df128d46f2db2cccf9aa7a66ca2823c1d153))
+* highlight NonText characters ([#547](https://github.com/catppuccin/nvim/issues/547)) ([bfe91df](https://github.com/catppuccin/nvim/commit/bfe91dfb3a19ffd4445e43611fcde68acbb3fed4))
+* **integration_default:** hotfix for [#559](https://github.com/catppuccin/nvim/issues/559) ([4913a8b](https://github.com/catppuccin/nvim/commit/4913a8b47554a89a71ed44da39fc1f6e5c2841c3))
+* **integration_default:** override `enabled` key only if integration has one ([#559](https://github.com/catppuccin/nvim/issues/559)) ([9709f82](https://github.com/catppuccin/nvim/commit/9709f8251a40e874238d6f9436cf4fba654b60e1))
+* **noice:** set background blend to 0 for mini popups ([#556](https://github.com/catppuccin/nvim/issues/556)) ([2d50a4e](https://github.com/catppuccin/nvim/commit/2d50a4e3aecffea4144801bb3c0a3cf7b88fdd6b))
+* **nvim-window-picker:** missing table keys ([#569](https://github.com/catppuccin/nvim/issues/569)) ([b9e4dae](https://github.com/catppuccin/nvim/commit/b9e4dae160bf9bc28d4ceb6d29a7e0134b107724))
+* **options:** disable deprecated ts_rainbow and ts_rainbow2 by default ([096385d](https://github.com/catppuccin/nvim/commit/096385dd024ecd1332659916fd7f09d7d18d7374))
+* **telescope:** keep consistency between the two styles ([#540](https://github.com/catppuccin/nvim/issues/540)) ([dfbc8e2](https://github.com/catppuccin/nvim/commit/dfbc8e2b478a65104d34556698067f2d40f1c227))
+* **telescope:** respect transparency ([#542](https://github.com/catppuccin/nvim/issues/542)) ([f36af06](https://github.com/catppuccin/nvim/commit/f36af062e3242f333b12fe9b730053fdda36e000))
+* **treesitter:** avoid possible nil ([17ae783](https://github.com/catppuccin/nvim/commit/17ae783b88bb7ae73dc004370473138d9d43ee46))
+* **types:** make all options besides nested `enabled` optional ([#565](https://github.com/catppuccin/nvim/issues/565)) ([490078b](https://github.com/catppuccin/nvim/commit/490078b1593c6609e6a50ad5001e7902ea601824))
+
 ## [1.3.0](https://github.com/catppuccin/nvim/compare/v1.2.0...v1.3.0) (2023-07-10)
 
 

README.md

@@ -147,7 +147,7 @@ local macchiato = require("catppuccin.palettes").get_palette "macchiato"
 local mocha = require("catppuccin.palettes").get_palette "mocha"
 ```
 
-Will returns a table where the key is the name of the color and the value is its hex value corresponding to each flavour.
+Returns a table where the key is the name of the color and the value is its hex value corresponding to each flavour.
 
 ## Overwriting colors
 
@@ -400,7 +400,7 @@ coc_nvim = false
 
 <details> <summary>Special</summary>
 
-Setting `enabled` to `true` enables this integration. 
+Setting `enabled` to `true` enables this integration.
 
 ```lua
 coc_nvim = true,
@@ -843,7 +843,7 @@ neotree = false
 <td>
 
 ```lua
-neogit = false
+neogit = true
 ```
 
 </td>
@@ -878,6 +878,20 @@ noice = false
 </tr>
 <!-- noice.nvim -->
 
+<!-- notifier.nvim -->
+</tr>
+<tr>
+<td> <a href="https://github.com/vigoux/notifier.nvim">notifier.nvim</a> </td>
+<td>
+
+```lua
+notifier = false
+```
+
+</td>
+</tr>
+<!-- notifier.nvim -->
+
 <!-- nvim-cmp -->
 </tr>
 <tr>
@@ -1087,6 +1101,31 @@ ts_rainbow = true
 </tr>
 <!-- nvim-ts-rainbow -->
 
+<!-- nvim-ufo -->
+</tr>
+<tr>
+<td> <a href="https://github.com/kevinhwang91/nvim-ufo">nvim-ufo</a> </td>
+<td>
+
+```lua
+ufo = false
+```
+
+</td>
+</tr>
+<!-- nvim-ufo -->
+
+<!-- nvim-window-picker -->
+</tr>
+<tr>
+<td> <a href="https://github.com/s1n7ax/nvim-window-picker">nvim-window-picker</a> </td>
+<td>
+
+```lua
+window_picker = false
+```
+<!-- nvim-window-picker -->
+
 <!-- octo.nvim -->
 </tr>
 <tr>
@@ -1263,7 +1302,10 @@ gitgutter = false
 <td>
 
 ```lua
-illuminate = false
+illuminate = {
+    enabled = true,
+    lsp = false
+}
 ```
 
 </td>

doc/catppuccin.txt

@@ -131,8 +131,8 @@ GET CATPPUCCIN COLORS  *catppuccin-customize-highlights-get-catppuccin-colors*
     local mocha = require("catppuccin.palettes").get_palette "mocha"
 <
 
-Will returns a table where the key is the name of the color and the value is
-its hex value corresponding to each flavour.
+Returns a table where the key is the name of the color and the value is its hex
+value corresponding to each flavour.
 
 
 OVERWRITING COLORS        *catppuccin-customize-highlights-overwriting-colors*
@@ -297,8 +297,8 @@ Update your bufferline config to use the Catppuccin components:
     }
 <
 
-Configurations are self-explanatory, see `:h bufferline-highlights` for
-detailed explanations:
+Configurations are self-explanatory, see |bufferline-highlights| for detailed
+explanations:
 
 >lua
     local mocha = require("catppuccin.palettes").get_palette "mocha"
@@ -587,7 +587,7 @@ neo-tree.nvim>lua
 <
 
 neogit>lua
-    neogit = false
+    neogit = true
 <
 
 neotest>lua
@@ -598,6 +598,10 @@ noice.nvim>lua
     noice = false
 <
 
+notifier.nvim>lua
+    notifier = false
+<
+
 nvim-cmp>lua
     cmp = true
 <
@@ -693,6 +697,14 @@ nvim-ts-rainbow>lua
     ts_rainbow = true
 <
 
+nvim-ufo>lua
+    ufo = false
+<
+
+nvim-window-picker>lua
+    window_picker = false
+<
+
 octo.nvim>lua
     octo = false
 <
@@ -750,7 +762,10 @@ vim-gitgutter>lua
 <
 
 vim-illuminate>lua
-    illuminate = false
+    illuminate = {
+        enabled = true,
+        lsp = false
+    }
 <
 
 vim-sandwich>lua

lua/catppuccin/groups/integrations/gitsigns.lua

@@ -11,6 +11,8 @@ function M.get()
 			GitSignsChange = { fg = C.yellow }, -- diff mode: Changed line |diff.txt|
 			GitSignsDelete = { fg = C.red }, -- diff mode: Deleted line |diff.txt|
 
+			GitSignsCurrentLineBlame = { fg = C.surface1 },
+
 			GitSignsAddPreview = O.transparent_background and { fg = U.darken(C.green, 0.72, C.base), bg = C.none }
 				or { link = "DiffAdd" },
 			GitSignsDeletePreview = O.transparent_background and { fg = U.darken(C.red, 0.72, C.base), bg = C.none }
@@ -40,6 +42,8 @@ function M.get()
 			GitSignsChange = { fg = C.yellow }, -- diff mode: Changed line |diff.txt|
 			GitSignsDelete = { fg = C.red }, -- diff mode: Deleted line |diff.txt|
 
+			GitSignsCurrentLineBlame = { fg = C.surface1 },
+
 			GitSignsAddPreview = O.transparent_background and { fg = C.green, bg = C.none } or { link = "DiffAdd" },
 			GitSignsDeletePreview = O.transparent_background and { fg = C.red, bg = C.none } or { link = "DiffDelete" },
 		}

lua/catppuccin/groups/integrations/illuminate.lua

@@ -4,7 +4,10 @@ function M.get()
 	return {
 		IlluminatedWordText = { bg = U.darken(C.surface1, 0.7, C.base) },
 		IlluminatedWordRead = { bg = U.darken(C.surface1, 0.7, C.base) },
-		IlluminatedWordWrite = { bg = U.darken(C.surface1, 0.7, C.base) },
+		IlluminatedWordWrite = {
+			bg = U.darken(C.surface1, 0.7, C.base),
+			style = O.integrations.illuminate.lsp and { "standout" } or {},
+		},
 	}
 end
 

lua/catppuccin/groups/integrations/neogit.lua

@@ -2,8 +2,29 @@ local M = {}
 
 function M.get()
 	return {
-		NeogitBranch = { fg = C.pink },
-		NeogitRemote = { fg = C.pink },
+		NeogitBranch = {
+			fg = C.peach,
+			style = { "bold" },
+		},
+		NeogitRemote = {
+			fg = C.green,
+			style = { "bold" },
+		},
+		NeogitUnmergedInto = {
+			link = "Function",
+		},
+		NeogitUnpulledFrom = {
+			link = "Function",
+		},
+		NeogitObjectId = {
+			link = "Comment",
+		},
+		NeogitStash = {
+			link = "Comment",
+		},
+		NeogitRebaseDone = {
+			link = "Comment",
+		},
 		NeogitHunkHeader = {
 			bg = U.darken(C.blue, 0.095, C.base),
 			fg = U.darken(C.blue, 0.5, C.base),
@@ -36,6 +57,67 @@ function M.get()
 			bg = U.darken(C.blue, 0.300, C.base),
 			fg = U.lighten(C.blue, 0.800, C.text),
 		},
+		NeogitChangeModified = {
+			fg = C.blue,
+			style = { "bold" },
+		},
+
+		NeogitChangeAdded = {
+			fg = C.green,
+			style = { "bold" },
+		},
+		NeogitChangeRenamed = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitChangeUpdated = {
+			fg = C.peach,
+			style = { "bold" },
+		},
+		NeogitChangeCopied = {
+			fg = C.pink,
+			style = { "bold" },
+		},
+		NeogitChangeBothModified = {
+			fg = C.yellow,
+			style = { "bold" },
+		},
+		NeogitChangeNewFile = {
+			fg = C.green,
+			style = { "bold" },
+		},
+		NeogitUntrackedfiles = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitUnstagedchanges = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitUnmergedchanges = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitUnpulledchanges = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitRecentcommits = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitStagedchanges = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitStashes = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
+		NeogitRebasing = {
+			fg = C.mauve,
+			style = { "bold" },
+		},
 		NeogitNotificationInfo = { fg = C.blue },
 		NeogitNotificationWarning = { fg = C.yellow },
 		NeogitNotificationError = { fg = C.red },

lua/catppuccin/groups/integrations/notifier.lua

@@ -0,0 +1,11 @@
+local M = {}
+
+function M.get()
+	return {
+		NotifierIcon = { fg = C.mauve },
+		NotifierContent = { fg = C.overlay2, blend = 0, style = { "italic" } },
+		NotifierContentDim = { fg = C.overlay1, blend = 0, style = { "italic" } },
+	}
+end
+
+return M

lua/catppuccin/groups/integrations/treesitter_context.lua

@@ -1,7 +1,18 @@
 local M = {}
 
 function M.get()
-	return O.transparent_background and { TreesitterContextBottom = { sp = C.dim, style = { "underline" } } } or {}
+	return O.transparent_background and {
+		TreesitterContextBottom = { sp = C.dim, style = { "underline" } },
+	} or {
+		TreesitterContextBottom = {
+			sp = C.surface0,
+			style = { "underline" },
+		},
+		TreesitterContextLineNumber = {
+			fg = C.surface1,
+			bg = C.mantle,
+		},
+	}
 end
 
 return M

lua/catppuccin/groups/integrations/ufo.lua

@@ -0,0 +1,9 @@
+local M = {}
+
+M.get = function()
+	return {
+		UfoFoldedFg = { fg = C.lavender },
+	}
+end
+
+return M

lua/catppuccin/groups/integrations/window_picker.lua

@@ -0,0 +1,12 @@
+local M = {}
+
+function M.get()
+	return {
+		WindowPickerStatusLine = { fg = C.red, style = { "bold" } },
+		WindowPickerStatusLineNC = { fg = C.red, style = { "bold" } },
+		WindowPickerWinBar = { fg = C.red, style = { "bold" } },
+		WindowPickerWinBarNC = { fg = C.red, style = { "bold" } },
+	}
+end
+
+return M