Skip to content

Commit f6deb62

Browse files
author
Filipe Cancelinha
committed
fix: constant definiton highlight semantic token collision
1 parent 6155880 commit f6deb62

File tree

5 files changed

+106
-93
lines changed

5 files changed

+106
-93
lines changed

‎lua/nordern/base.lua

+70-70
Original file line numberDiff line numberDiff line change
@@ -33,78 +33,78 @@ local B = {}
3333

3434
-- Base neovim
3535
B.gui = {
36-
ColorColumn = { fg = C.none, bg = C.bg }, -- Used for the columns set with 'colorcolumn'.
37-
Conceal = { fg = C.none, bg = C.bg }, -- Placeholder characters substituted for concealed text (see 'conceallevel').
38-
CurSearch = { fg = C.bg, bg = C.frost.turquoise }, --Used for highlighting a search pattern under the cursor (see 'hlsearch').
39-
Cursor = { fg = C.bg, bg = C.frost.turquoise }, -- Character under the cursor.
40-
CursorColumn = { fg = C.none, bg = C.night.c1 }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
41-
CursorIM = { fg = C.bg, bg = C.frost.turquoise }, -- Like Cursor, but used when in IME mode. CursorIM
42-
CursorLine = { fg = C.none, bg = C.blend.blue }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
43-
CursorLineFold = { fg = C.none, bg = C.fg }, -- Like FoldColumn when 'cursorline' is set for the cursor line.
44-
CursorLineNr = { fg = C.bg, bg = C.frost.turquoise }, --Like LineNr when 'cursorline' is set and 'cursorlineopt' contains "number" or is "both", for the cursor line.
45-
CursorLineSign = { fg = C.night.c1, bg = C.blend.blue }, -- Like SignColumn when 'cursorline' is set for the cursor line.
46-
Directory = { fg = C.fg, bg = C.none }, -- Directory names (and other special names in listings) fg = C.none, bg = C.blend.bluec1 .
47-
EndOfBuffer = { fg = C.night.c1, bg = C.none }, -- Filler lines (~) after the end of the buffer. By default, this is highlighted like hl-NonText.
48-
ErrorMsg = { fg = C.aurora.red, bg = C.bg }, -- Error messages on the command line.
49-
FloatBorder = { fg = C.frost.turquoise, bg = C.bg }, -- Border of floating windows.
50-
FloatFooter = { fg = C.frost.turquoise, bg = C.none }, -- Footer of floating windows.
51-
FloatTitle = { fg = C.fg, bg = C.bg }, -- Title of floating windows.
52-
FoldColumn = { fg = C.none, bg = C.none }, -- 'foldcolumn'
53-
Folded = { fg = C.none, bg = C.none }, -- Line used for closed folds.
54-
IncSearch = { link = "CurSearch" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c".
55-
LineNr = { fg = C.fg, bg = C.none }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
56-
LineNrAbove = { fg = C.night.c3, bg = C.none }, -- Line number for when the 'relativenumber' option is set, above the cursor line.
57-
LineNrBelow = { fg = C.night.c3, bg = C.none }, -- Line number for when the 'relativenumber' option is set, below the cursor line.
58-
MatchParen = { fg = C.none, bg = C.night.c3 }, -- Character under the cursor or just before it, if it is a paired bracket, and its match. pi_paren.txt
59-
ModeMsg = { fg = C.fg, bg = C.bg }, -- 'showmode' message (e.g., "-- INSERT --").
60-
MoreMsg = { fg = C.fg, bg = C.bg }, -- more-prompt
61-
MsgArea = { fg = C.none, bg = C.bg }, -- Area for messages and cmdline.
62-
MsgSeparator = { fg = C.night.c1, bg = C.bg }, -- Separator for scrolled messages msgsep.
63-
NonText = { fg = C.bg, bg = C.bg }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also hl-EndOfBuffer.
64-
Normal = { fg = C.fg, bg = C.bg }, -- Normal text.
65-
NormalFloat = { fg = C.fg, bg = C.bg }, -- Normal text in floating windows.
66-
NormalNC = { fg = C.fg, bg = C.bg }, -- Normal text in non-current windows.
36+
ColorColumn = { fg = C.none, bg = C.bg }, -- Used for the columns set with 'colorcolumn'.
37+
Conceal = { fg = C.none, bg = C.bg }, -- Placeholder characters substituted for concealed text (see 'conceallevel').
38+
CurSearch = { fg = C.bg, bg = C.frost.turquoise }, --Used for highlighting a search pattern under the cursor (see 'hlsearch').
39+
Cursor = { fg = C.bg, bg = C.frost.turquoise }, -- Character under the cursor.
40+
CursorColumn = { fg = C.none, bg = C.night.c1 }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
41+
CursorIM = { fg = C.bg, bg = C.frost.turquoise }, -- Like Cursor, but used when in IME mode. CursorIM
42+
CursorLine = { fg = C.none, bg = C.blend.blue }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
43+
CursorLineFold = { fg = C.none, bg = C.fg }, -- Like FoldColumn when 'cursorline' is set for the cursor line.
44+
CursorLineNr = { fg = C.bg, bg = C.frost.turquoise }, --Like LineNr when 'cursorline' is set and 'cursorlineopt' contains "number" or is "both", for the cursor line.
45+
CursorLineSign = { fg = C.night.c1, bg = C.blend.blue }, -- Like SignColumn when 'cursorline' is set for the cursor line.
46+
Directory = { fg = C.fg, bg = C.none }, -- Directory names (and other special names in listings) fg = C.none, bg = C.blend.bluec1 .
47+
EndOfBuffer = { fg = C.night.c1, bg = C.none }, -- Filler lines (~) after the end of the buffer. By default, this is highlighted like hl-NonText.
48+
ErrorMsg = { fg = C.aurora.red, bg = C.bg }, -- Error messages on the command line.
49+
FloatBorder = { fg = C.frost.turquoise, bg = C.none }, -- Border of floating windows.
50+
FloatFooter = { fg = C.frost.turquoise, bg = C.none }, -- Footer of floating windows.base
51+
FloatTitle = { fg = C.fg, bg = C.none }, -- Title of floating windows.
52+
FoldColumn = { fg = C.none, bg = C.none }, -- 'foldcolumn'
53+
Folded = { fg = C.none, bg = C.none }, -- Line used for closed folds.
54+
IncSearch = { link = "CurSearch" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c".
55+
LineNr = { fg = C.fg, bg = C.none }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
56+
LineNrAbove = { fg = C.night.c3, bg = C.none }, -- Line number for when the 'relativenumber' option is set, above the cursor line.
57+
LineNrBelow = { fg = C.night.c3, bg = C.none }, -- Line number for when the 'relativenumber' option is set, below the cursor line.
58+
MatchParen = { fg = C.none, bg = C.night.c3 }, -- Character under the cursor or just before it, if it is a paired bracket, and its match. pi_paren.txt
59+
ModeMsg = { fg = C.fg, bg = C.bg }, -- 'showmode' message (e.g., "-- INSERT --").
60+
MoreMsg = { fg = C.fg, bg = C.bg }, -- more-prompt
61+
MsgArea = { fg = C.none, bg = C.bg }, -- Area for messages and cmdline.
62+
MsgSeparator = { fg = C.night.c1, bg = C.bg }, -- Separator for scrolled messages msgsep.
63+
NonText = { fg = C.bg, bg = C.bg }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also hl-EndOfBuffer.
64+
Normal = { fg = C.fg, bg = C.bg }, -- Normal text.
65+
NormalFloat = { fg = C.fg, bg = C.bg }, -- Normal text in floating windows.
66+
NormalNC = { fg = C.fg, bg = C.bg }, -- Normal text in non-current windows.
6767
-- Pmenu
68-
Pmenu = { fg = C.fg, bg = C.night.c0 }, -- Popup menu: Normal item.
69-
PmenuExtra = { fg = C.frost.light_blue, bg = C.bg }, -- Popup menu: Normal item "extra text".
70-
PmenuExtraSel = { fg = C.night.c1, bg = C.blend.blue }, -- Popup menu: Selected item "extra text".
71-
PmenuKind = { fg = C.frost.turquoise, bg = C.none }, -- Popup menu: Normal item "kind".
72-
PmenuKindSel = { fg = C.frost.sea, bg = C.blend.blue }, -- Popup menu: Selected item "kind".
73-
PmenuSbar = { fg = C.blend.turquoise, bg = C.none }, -- Popup menu: Scrollbar.
74-
PmenuSel = { fg = C.none, bg = C.blend.blue }, -- Popup menu: Selected item.
75-
PmenuThumb = { fg = C.night.c1, bg = C.night.c2 }, -- Popup menu: Thumb of the scrollbar.
76-
Question = { fg = C.frost.turquoise, bg = C.bg }, -- hit-enter prompt and yes/no questions.
77-
QuickFixLine = { fg = C.fg, bg = C.none }, -- Current quickfix item in the quickfix window. Combined with hl-CursorLine when the cursor is there.
78-
Search = { link = "CurSearch" }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
79-
SignColumn = { fg = C.none, bg = C.bg }, -- Column where signs are displayed.
80-
SpecialKey = { fg = C.night.c1, bg = C.bg }, -- Unprintable characters: Text displayed differently from what it really is. But not 'listchars' whitespace. hl-Whitespace
81-
SpellBad = { fg = C.aurora.red, bg = C.bg }, -- Word that is not recognized by the spellchecker. spell Combined with the highlighting used otherwise.
82-
SpellCap = { fg = C.aurora.red, bg = C.bg }, -- Word that should start with a capital. spell Combined with the highlighting used otherwise.
83-
SpellLocal = { fg = C.aurora.yellow, bg = C.bg }, -- Word that is recognized by the spellchecker as one that is used in another region. spell Combined with the highlighting used otherwise.
84-
SpellRare = { fg = C.aurora.yellow, bg = C.bg }, -- Word that is recognized by the spellchecker as one that is hardly ever used. spell Combined with the highlighting used otherwise.
85-
StatusLine = { fg = C.none, bg = C.none }, -- Status line of current window.
86-
StatusLineNC = { fg = C.none, bg = C.none }, -- Status lines of not-current windows. Note: If this is equal to "StatusLine", Vim will use "^^^" in the status line of the current window.
87-
Substitute = { link = "CurSearch" }, -- :substitute replacement text highlighting.
88-
TabLine = { fg = C.bg, bg = C.bg }, -- Tab pages line, not active tab page label.
89-
TabLineFill = { fg = C.bg, bg = C.bg }, -- Tab pages line, where there are no labels.
90-
TabLineSel = { fg = C.bg, bg = C.bg }, -- Tab pages line, active tab page label.
91-
TermCursor = { fg = C.none, bg = C.blend.bluec1 }, -- Cursor in a focused terminal.
92-
TermCursorNC = { fg = C.none, bg = C.blend.bluec1 }, -- Cursor in an unfocused terminal.
93-
Title = { fg = C.fg, bg = C.bg }, -- Titles for output from ":set all", ":autocmd" etc.
94-
Visual = { fg = C.none, bg = C.blend.blue }, -- Visual mode selection.
95-
VisualNOS = { fg = C.none, bg = C.blend.blue }, -- Visual mode selection when vim is "Not Owning the Selection".
96-
WarningMsg = { fg = C.aurora.yellow, bg = C.none }, -- Warning messages.
97-
Whitespace = { fg = C.bg, bg = C.bg, sp = C.none }, -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
98-
WildMenu = { fg = C.frost.turquoise, bg = C.night.c1 }, -- Current match in 'wildmenu' completion.
99-
WinBar = { fg = C.none, bg = C.bg }, -- Window bar of current window.
100-
WinBarNC = { fg = C.none, bg = C.bg }, -- Window bar of not-current windows
101-
WinSeparator = { fg = C.night.c1, bg = C.bg }, -- Separators between window splits.
102-
lCursor = { fg = C.none, bg = C.frost.turquoise }, -- Character under the cursor when language-mapping is used (see 'guicursor').
68+
Pmenu = { fg = C.fg, bg = C.night.c0 }, -- Popup menu: Normal item.
69+
PmenuExtra = { fg = C.frost.light_blue, bg = C.bg }, -- Popup menu: Normal item "extra text".
70+
PmenuExtraSel = { fg = C.night.c1, bg = C.blend.blue }, -- Popup menu: Selected item "extra text".
71+
PmenuKind = { fg = C.frost.turquoise, bg = C.none }, -- Popup menu: Normal item "kind".
72+
PmenuKindSel = { fg = C.frost.sea, bg = C.blend.blue }, -- Popup menu: Selected item "kind".
73+
PmenuSbar = { fg = C.blend.turquoise, bg = C.none }, -- Popup menu: Scrollbar.
74+
PmenuSel = { fg = C.none, bg = C.blend.blue }, -- Popup menu: Selected item.
75+
PmenuThumb = { fg = C.night.c1, bg = C.night.c2 }, -- Popup menu: Thumb of the scrollbar.
76+
Question = { fg = C.frost.turquoise, bg = C.bg }, -- hit-enter prompt and yes/no questions.
77+
QuickFixLine = { fg = C.fg, bg = C.none }, -- Current quickfix item in the quickfix window. Combined with hl-CursorLine when the cursor is there.
78+
Search = { link = "CurSearch" }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out.
79+
SignColumn = { fg = C.none, bg = C.bg }, -- Column where signs are displayed.
80+
SpecialKey = { fg = C.night.c1, bg = C.bg }, -- Unprintable characters: Text displayed differently from what it really is. But not 'listchars' whitespace. hl-Whitespace
81+
SpellBad = { fg = C.aurora.red, bg = C.bg }, -- Word that is not recognized by the spellchecker. spell Combined with the highlighting used otherwise.
82+
SpellCap = { fg = C.aurora.red, bg = C.bg }, -- Word that should start with a capital. spell Combined with the highlighting used otherwise.
83+
SpellLocal = { fg = C.aurora.yellow, bg = C.bg }, -- Word that is recognized by the spellchecker as one that is used in another region. spell Combined with the highlighting used otherwise.
84+
SpellRare = { fg = C.aurora.yellow, bg = C.bg }, -- Word that is recognized by the spellchecker as one that is hardly ever used. spell Combined with the highlighting used otherwise.
85+
StatusLine = { fg = C.none, bg = C.none }, -- Status line of current window.
86+
StatusLineNC = { fg = C.none, bg = C.none }, -- Status lines of not-current windows. Note: If this is equal to "StatusLine", Vim will use "^^^" in the status line of the current window.
87+
Substitute = { link = "CurSearch" }, -- :substitute replacement text highlighting.
88+
TabLine = { fg = C.bg, bg = C.bg }, -- Tab pages line, not active tab page label.
89+
TabLineFill = { fg = C.bg, bg = C.bg }, -- Tab pages line, where there are no labels.
90+
TabLineSel = { fg = C.bg, bg = C.bg }, -- Tab pages line, active tab page label.
91+
TermCursor = { fg = C.none, bg = C.blend.bluec1 }, -- Cursor in a focused terminal.
92+
TermCursorNC = { fg = C.none, bg = C.blend.bluec1 }, -- Cursor in an unfocused terminal.
93+
Title = { fg = C.fg, bg = C.bg }, -- Titles for output from ":set all", ":autocmd" etc.
94+
Visual = { fg = C.none, bg = C.blend.blue }, -- Visual mode selection.
95+
VisualNOS = { fg = C.none, bg = C.blend.blue }, -- Visual mode selection when vim is "Not Owning the Selection".
96+
WarningMsg = { fg = C.aurora.yellow, bg = C.none }, -- Warning messages.
97+
Whitespace = { fg = C.bg, bg = C.bg, sp = C.none }, -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
98+
WildMenu = { fg = C.frost.turquoise, bg = C.blend.bluec1 }, -- Current match in 'wildmenu' completion.
99+
WinBar = { fg = C.none, bg = C.bg }, -- Window bar of current window.
100+
WinBarNC = { fg = C.none, bg = C.bg }, -- Window bar of not-current windows
101+
WinSeparator = { fg = C.night.c1, bg = C.bg }, -- Separators between window splits.
102+
lCursor = { fg = C.none, bg = C.frost.turquoise }, -- Character under the cursor when language-mapping is used (see 'guicursor').
103103
--- Diff
104-
DiffAdd = { fg = C.aurora.green, bg = C.blend.green }, -- Diff mode: Added line. diff.txt
105-
DiffChange = { fg = C.aurora.yellow, bg = C.blend.yellow }, -- Diff mode: Changed line. diff.txt
106-
DiffDelete = { fg = C.aurora.red, bg = C.blend.red }, -- Diff mode: Deleted line. diff.txt
107-
DiffText = { fg = C.fg, bg = C.none }, -- Diff mode: Changed text within a changed line. diff.txt
104+
DiffAdd = { fg = C.aurora.green, bg = C.blend.green }, -- Diff mode: Added line. diff.txt
105+
DiffChange = { fg = C.aurora.yellow, bg = C.blend.yellow }, -- Diff mode: Changed line. diff.txt
106+
DiffDelete = { fg = C.aurora.red, bg = C.blend.red }, -- Diff mode: Deleted line. diff.txt
107+
DiffText = { fg = C.fg, bg = C.none }, -- Diff mode: Changed text within a changed line. diff.txt
108108
--Health
109109
healthError = { fg = C.aurora.red, bg = C.blend.red },
110110
healthSuccess = { fg = C.aurora.green, bg = C.blend.green },

‎lua/nordern/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- *******************************************************************************
2-
-- Name: Northern.nvim
2+
-- Name: Nordern.nvim
33
-- Description: Carefully crafted nord colorscheme for neovim in Lua, using arctic studio's palette choosing the warmer colors.
4-
-- Author: @fcancelinha https://github.com/fcancelinha
4+
-- Author: dcancelinha https://github.com/fcancelinha
55
-- Website: https://github.com/fcancelinha/nordern.nvim
66
-- License: MIT
77
-- Year: 2023

0 commit comments

Comments
 (0)