Merge branch 'main' into main

folke · Nov 3, 2024 · 3aa8099 · 3aa8099
2 parents e2e73de + 52d67cc
commit 3aa8099
Show file tree

Hide file tree

Showing 13 changed files with 438 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -55,8 +55,10 @@ TokyoNight](https://github.com/enkia/tokyo-night-vscode-theme) theme. Includes
 | [ale](https://github.com/dense-analysis/ale) | [`ale`](lua/tokyonight/groups/ale.lua) |
 | [alpha-nvim](https://github.com/goolord/alpha-nvim) | [`alpha`](lua/tokyonight/groups/alpha.lua) |
 | [barbar.nvim](https://github.com/romgrk/barbar.nvim) | [`barbar`](lua/tokyonight/groups/barbar.lua) |
+| [blink.cmp](https://github.com/Saghen/blink.cmp) | [`blink`](lua/tokyonight/groups/blink.lua) |
 | [bufferline.nvim](https://github.com/akinsho/bufferline.nvim) | [`bufferline`](lua/tokyonight/groups/bufferline.lua) |
 | [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) | [`cmp`](lua/tokyonight/groups/cmp.lua) |
+| [copilot.lua](https://github.com/zbirenbaum/copilot.lua) | [`copilot`](lua/tokyonight/groups/copilot.lua) |
 | [nvim-dap](https://github.com/mfussenegger/nvim-dap) | [`dap`](lua/tokyonight/groups/dap.lua) |
 | [dashboard-nvim](https://github.com/nvimdev/dashboard-nvim) | [`dashboard`](lua/tokyonight/groups/dashboard.lua) |
 | [flash.nvim](https://github.com/folke/flash.nvim) | [`flash`](lua/tokyonight/groups/flash.lua) |

diff --git a/doc/tokyonight.nvim.txt b/doc/tokyonight.nvim.txt
@@ -1,4 +1,4 @@
-*tokyonight.nvim.txt*          For Neovim         Last change: 2024 October 24
+*tokyonight.nvim.txt*         For Neovim         Last change: 2024 November 01
 
 ==============================================================================
 Table of Contents                          *tokyonight.nvim-table-of-contents*
@@ -48,10 +48,14 @@ Supported Plugins ~
 
   barbar.nvim                         barbar
 
+  blink.cmp                           blink
+
   bufferline.nvim                     bufferline
 
   nvim-cmp                            cmp
 
+  copilot.lua                         copilot
+
   nvim-dap                            dap
 
   dashboard-nvim                      dashboard

diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
@@ -393,6 +393,84 @@ local highlights = {
   AlphaShortcut = {
     fg = "#b15c00"
   },
+  BlinkCmpDoc = {
+    bg = "#d0d5e3",
+    fg = "#3760bf"
+  },
+  BlinkCmpDocBorder = {
+    bg = "#d0d5e3",
+    fg = "#4094a3"
+  },
+  BlinkCmpGhostText = {
+    fg = "#a1a6c5"
+  },
+  BlinkCmpKindArray = "LspKindArray",
+  BlinkCmpKindBoolean = "LspKindBoolean",
+  BlinkCmpKindClass = "LspKindClass",
+  BlinkCmpKindCodeium = {
+    bg = "NONE",
+    fg = "#118c74"
+  },
+  BlinkCmpKindColor = "LspKindColor",
+  BlinkCmpKindConstant = "LspKindConstant",
+  BlinkCmpKindConstructor = "LspKindConstructor",
+  BlinkCmpKindCopilot = {
+    bg = "NONE",
+    fg = "#118c74"
+  },
+  BlinkCmpKindDefault = {
+    bg = "NONE",
+    fg = "#6172b0"
+  },
+  BlinkCmpKindEnum = "LspKindEnum",
+  BlinkCmpKindEnumMember = "LspKindEnumMember",
+  BlinkCmpKindEvent = "LspKindEvent",
+  BlinkCmpKindField = "LspKindField",
+  BlinkCmpKindFile = "LspKindFile",
+  BlinkCmpKindFolder = "LspKindFolder",
+  BlinkCmpKindFunction = "LspKindFunction",
+  BlinkCmpKindInterface = "LspKindInterface",
+  BlinkCmpKindKey = "LspKindKey",
+  BlinkCmpKindKeyword = "LspKindKeyword",
+  BlinkCmpKindMethod = "LspKindMethod",
+  BlinkCmpKindModule = "LspKindModule",
+  BlinkCmpKindNamespace = "LspKindNamespace",
+  BlinkCmpKindNull = "LspKindNull",
+  BlinkCmpKindNumber = "LspKindNumber",
+  BlinkCmpKindObject = "LspKindObject",
+  BlinkCmpKindOperator = "LspKindOperator",
+  BlinkCmpKindPackage = "LspKindPackage",
+  BlinkCmpKindProperty = "LspKindProperty",
+  BlinkCmpKindReference = "LspKindReference",
+  BlinkCmpKindSnippet = "LspKindSnippet",
+  BlinkCmpKindString = "LspKindString",
+  BlinkCmpKindStruct = "LspKindStruct",
+  BlinkCmpKindSupermaven = {
+    bg = "NONE",
+    fg = "#118c74"
+  },
+  BlinkCmpKindTabNine = {
+    bg = "NONE",
+    fg = "#118c74"
+  },
+  BlinkCmpKindText = "LspKindText",
+  BlinkCmpKindTypeParameter = "LspKindTypeParameter",
+  BlinkCmpKindUnit = "LspKindUnit",
+  BlinkCmpKindValue = "LspKindValue",
+  BlinkCmpKindVariable = "LspKindVariable",
+  BlinkCmpLabel = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  BlinkCmpLabelDeprecated = {
+    bg = "NONE",
+    fg = "#a8aecb",
+    strikethrough = true
+  },
+  BlinkCmpLabelMatch = {
+    bg = "NONE",
+    fg = "#188092"
+  },
   Bold = {
     bold = true,
     fg = "#3760bf"
@@ -661,6 +739,12 @@ local highlights = {
   Constant = {
     fg = "#b15c00"
   },
+  CopilotAnnotation = {
+    fg = "#a1a6c5"
+  },
+  CopilotSuggestion = {
+    fg = "#a1a6c5"
+  },
   CurSearch = "IncSearch",
   Cursor = {
     bg = "#3760bf",

diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
@@ -393,6 +393,84 @@ local highlights = {
   AlphaShortcut = {
     fg = "#ff966c"
   },
+  BlinkCmpDoc = {
+    bg = "#1e2030",
+    fg = "#c8d3f5"
+  },
+  BlinkCmpDocBorder = {
+    bg = "#1e2030",
+    fg = "#589ed7"
+  },
+  BlinkCmpGhostText = {
+    fg = "#444a73"
+  },
+  BlinkCmpKindArray = "LspKindArray",
+  BlinkCmpKindBoolean = "LspKindBoolean",
+  BlinkCmpKindClass = "LspKindClass",
+  BlinkCmpKindCodeium = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  BlinkCmpKindColor = "LspKindColor",
+  BlinkCmpKindConstant = "LspKindConstant",
+  BlinkCmpKindConstructor = "LspKindConstructor",
+  BlinkCmpKindCopilot = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  BlinkCmpKindDefault = {
+    bg = "NONE",
+    fg = "#828bb8"
+  },
+  BlinkCmpKindEnum = "LspKindEnum",
+  BlinkCmpKindEnumMember = "LspKindEnumMember",
+  BlinkCmpKindEvent = "LspKindEvent",
+  BlinkCmpKindField = "LspKindField",
+  BlinkCmpKindFile = "LspKindFile",
+  BlinkCmpKindFolder = "LspKindFolder",
+  BlinkCmpKindFunction = "LspKindFunction",
+  BlinkCmpKindInterface = "LspKindInterface",
+  BlinkCmpKindKey = "LspKindKey",
+  BlinkCmpKindKeyword = "LspKindKeyword",
+  BlinkCmpKindMethod = "LspKindMethod",
+  BlinkCmpKindModule = "LspKindModule",
+  BlinkCmpKindNamespace = "LspKindNamespace",
+  BlinkCmpKindNull = "LspKindNull",
+  BlinkCmpKindNumber = "LspKindNumber",
+  BlinkCmpKindObject = "LspKindObject",
+  BlinkCmpKindOperator = "LspKindOperator",
+  BlinkCmpKindPackage = "LspKindPackage",
+  BlinkCmpKindProperty = "LspKindProperty",
+  BlinkCmpKindReference = "LspKindReference",
+  BlinkCmpKindSnippet = "LspKindSnippet",
+  BlinkCmpKindString = "LspKindString",
+  BlinkCmpKindStruct = "LspKindStruct",
+  BlinkCmpKindSupermaven = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  BlinkCmpKindTabNine = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  BlinkCmpKindText = "LspKindText",
+  BlinkCmpKindTypeParameter = "LspKindTypeParameter",
+  BlinkCmpKindUnit = "LspKindUnit",
+  BlinkCmpKindValue = "LspKindValue",
+  BlinkCmpKindVariable = "LspKindVariable",
+  BlinkCmpLabel = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  BlinkCmpLabelDeprecated = {
+    bg = "NONE",
+    fg = "#3b4261",
+    strikethrough = true
+  },
+  BlinkCmpLabelMatch = {
+    bg = "NONE",
+    fg = "#65bcff"
+  },
   Bold = {
     bold = true,
     fg = "#c8d3f5"
@@ -661,6 +739,12 @@ local highlights = {
   Constant = {
     fg = "#ff966c"
   },
+  CopilotAnnotation = {
+    fg = "#444a73"
+  },
+  CopilotSuggestion = {
+    fg = "#444a73"
+  },
   CurSearch = "IncSearch",
   Cursor = {
     bg = "#c8d3f5",

diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
@@ -393,6 +393,84 @@ local highlights = {
   AlphaShortcut = {
     fg = "#ff9e64"
   },
+  BlinkCmpDoc = {
+    bg = "#16161e",
+    fg = "#c0caf5"
+  },
+  BlinkCmpDocBorder = {
+    bg = "#16161e",
+    fg = "#27a1b9"
+  },
+  BlinkCmpGhostText = {
+    fg = "#414868"
+  },
+  BlinkCmpKindArray = "LspKindArray",
+  BlinkCmpKindBoolean = "LspKindBoolean",
+  BlinkCmpKindClass = "LspKindClass",
+  BlinkCmpKindCodeium = {
+    bg = "NONE",
+    fg = "#1abc9c"
+  },
+  BlinkCmpKindColor = "LspKindColor",
+  BlinkCmpKindConstant = "LspKindConstant",
+  BlinkCmpKindConstructor = "LspKindConstructor",
+  BlinkCmpKindCopilot = {
+    bg = "NONE",
+    fg = "#1abc9c"
+  },
+  BlinkCmpKindDefault = {
+    bg = "NONE",
+    fg = "#a9b1d6"
+  },
+  BlinkCmpKindEnum = "LspKindEnum",
+  BlinkCmpKindEnumMember = "LspKindEnumMember",
+  BlinkCmpKindEvent = "LspKindEvent",
+  BlinkCmpKindField = "LspKindField",
+  BlinkCmpKindFile = "LspKindFile",
+  BlinkCmpKindFolder = "LspKindFolder",
+  BlinkCmpKindFunction = "LspKindFunction",
+  BlinkCmpKindInterface = "LspKindInterface",
+  BlinkCmpKindKey = "LspKindKey",
+  BlinkCmpKindKeyword = "LspKindKeyword",
+  BlinkCmpKindMethod = "LspKindMethod",
+  BlinkCmpKindModule = "LspKindModule",
+  BlinkCmpKindNamespace = "LspKindNamespace",
+  BlinkCmpKindNull = "LspKindNull",
+  BlinkCmpKindNumber = "LspKindNumber",
+  BlinkCmpKindObject = "LspKindObject",
+  BlinkCmpKindOperator = "LspKindOperator",
+  BlinkCmpKindPackage = "LspKindPackage",
+  BlinkCmpKindProperty = "LspKindProperty",
+  BlinkCmpKindReference = "LspKindReference",
+  BlinkCmpKindSnippet = "LspKindSnippet",
+  BlinkCmpKindString = "LspKindString",
+  BlinkCmpKindStruct = "LspKindStruct",
+  BlinkCmpKindSupermaven = {
+    bg = "NONE",
+    fg = "#1abc9c"
+  },
+  BlinkCmpKindTabNine = {
+    bg = "NONE",
+    fg = "#1abc9c"
+  },
+  BlinkCmpKindText = "LspKindText",
+  BlinkCmpKindTypeParameter = "LspKindTypeParameter",
+  BlinkCmpKindUnit = "LspKindUnit",
+  BlinkCmpKindValue = "LspKindValue",
+  BlinkCmpKindVariable = "LspKindVariable",
+  BlinkCmpLabel = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  BlinkCmpLabelDeprecated = {
+    bg = "NONE",
+    fg = "#3b4261",
+    strikethrough = true
+  },
+  BlinkCmpLabelMatch = {
+    bg = "NONE",
+    fg = "#2ac3de"
+  },
   Bold = {
     bold = true,
     fg = "#c0caf5"
@@ -661,6 +739,12 @@ local highlights = {
   Constant = {
     fg = "#ff9e64"
   },
+  CopilotAnnotation = {
+    fg = "#414868"
+  },
+  CopilotSuggestion = {
+    fg = "#414868"
+  },
   CurSearch = "IncSearch",
   Cursor = {
     bg = "#c0caf5",