Skip to content

Commit

Permalink
feat(highlights): Added some missed highlights primarily for markup l…
Browse files Browse the repository at this point in the history 
…anguages (#123)
  • Loading branch information
@juniorsundar
juniorsundar committed Apr 11, 2024
1 parent 7c08e4f commit 6819225
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 18 deletions.
100 changes: 83 additions & 17 deletions lua/nordic/groups/integrations.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,24 +280,42 @@ function M.get_groups()
G['@comment'] = { link = 'Comment' }
--G['@comment.documentation'] = { link = 'Comment' }
G['@comment.documentation'] = { link = 'Comment' }
G["@comment.note"] = { fg = C.hint }
G["@comment.error"] = { fg = C.error }
G["@comment.hint"] = { fg = C.hint }
G["@comment.info"] = { fg = C.info }
G["@comment.warning"] = { fg = C.warning }
G["@comment.todo"] = { fg = C.todo }
G['@operator'] = { fg = C.fg } -- For any operator: `+`, but also `->` and `*` in C.
--- Punctuation
G['@punctuation.delimiter'] = { link = '@operator' } -- For delimiters ie: `.`
G['@punctuation.delimiter'] = { link = 'Delimiter' } -- For delimiters ie: `.`
G['@punctuation.bracket'] = { link = '@operator' } -- For brackets and parens.
G['@punctuation.special'] = { link = 'Macro' } -- For special punctutation that does not fall in the catagories before.
G['@punctuation.special.markdown'] = { fg = C.orange.base, bold = true }
--- Literals
G["@string"] = { link = "String" }
G['@string.documentation'] = { link = 'String' }
G['@string.regex'] = { fg = C.magenta.bright } -- For regexes.
G['@string.escape'] = { fg = C.magenta.bright } -- For escape characters within a string.
G['@string.regex'] = { fg = C.magenta.bright } -- For regexes.
--- Functions
G['@constructor'] = { link = 'Function' } -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
G['@parameter'] = { fg = C.fg, italic = true } -- For parameters of a function.
G['@parameter.builtin'] = { link = 'Builtin' } -- For builtin parameters of a function, e.g. "..." or Smali's pG[1-99]
--- Keywords
G['@keyword'] = { link = 'Keyword' } -- For keywords that don't fall in previous categories.
G["@keyword.conditional"] = { link = "Conditional" }
G['@keyword.coroutine'] = { link = 'Macro' } -- For keywords related to coroutines.
G["@keyword.debug"] = { link = "Debug" }
G["@keyword.directive"] = { link = "PreProc" }
G["@keyword.directive.define"] = { link = "Define" }
G["@keyword.exception"] = { link = "Exception" }
G['@keyword.export'] = { link = 'Keyword' }
G['@keyword.function'] = { link = 'Keyword' } -- For keywords used to define a fuction.
G["@keyword.import"] = { link = "Include" }
G['@keyword.operator'] = { link = 'Keyword' }
G["@keyword.repeat"] = { link = "Repeat" }
G['@keyword.return'] = { link = 'Keyword' }
G["@keyword.storage"] = { link = "StorageClass" }
G['@label'] = { link = 'Keyword' } -- For labels: `label:` in C and `:label:` in Lua.
--- Types
G['@type.builtin'] = { link = 'Type' }
Expand All @@ -306,9 +324,18 @@ function M.get_groups()
--- Identifiers
G['@variable'] = { link = 'Variable' } -- Any variable name that does not have another highlight.
G['@variable.builtin'] = { link = 'Builtin' } -- Variable names that are defined by the languages, like `this` or `self`.
G['@variable.member'] = { link = 'Field' }
--- Text
G['@spell'] = { link = 'Comment' }
-- G['@spell'] = { link = 'Comment' } -- This seems to interfere with regular text
-- G["@text.literal.markdown"] = { }
G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language.
G['@text.strong'] = { bold = true }
G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis.
G['@text.underline'] = { underline = true } -- For text to be represented with an underline.
G['@text.strike'] = { strikethrough = true } -- For strikethrough text.
G['@text.title'] = { link = 'Title' } -- Text that is part of a title.
G['@text.uri'] = { underline = true } -- Any URI like a link or email.
G['@text.literal'] = { link = 'String' }
G['@text.literal.markdown_inline'] = { bg = C.black2, fg = C.fg }
G['@text.reference'] = { link = 'Link' }
G['@text.todo.unchecked'] = { fg = C.blue1 } -- For brackets and parens.
Expand All @@ -317,6 +344,35 @@ function M.get_groups()
G['@text.danger'] = { fg = C.error }
G['@text.diff.add'] = { link = 'DiffAdd' }
G['@text.diff.delete'] = { link = 'DiffDelete' }
G['@text.todo'] = { link = 'Todo' }
G['@text.note'] = { link = 'Note' }
--- Markup
G["@markup"] = { link = "@none" }
G["@markup.emphasis"] = { italic = true }
G["@markup.environment"] = { link = "Macro" }
G["@markup.environment.name"] = { link = "Type" }
G["@markup.heading"] = { link = "Title" }
G["@markup.heading.1"] = { fg = C.yellow.base, bold = true }
G["@markup.heading.2"] = { fg = C.orange.base, bold = true }
G["@markup.heading.3"] = { fg = C.magenta.base, bold = true }
G["@markup.heading.4"] = { fg = C.green.base }
G["@markup.heading.5"] = { fg = C.blue2, italic = true }
G["@markup.heading.6"] = { fg = C.cyan.base, italic = true }
G["@markup.italic"] = { italic = true }
G['@markup.list'] = { link = '@operator' }
G["@markup.list.checked"] = { link = 'Field' }
G['@markup.list.markdown'] = { fg = C.yellow.base, bold = true }
G["@markup.list.unchecked"] = { fg = C.fg }
G['@markup.link'] = { fg = C.cyan.base }
G["@markup.link.label"] = { link = "SpecialChar" }
G["@markup.link.label.symbol"] = { link = "Identifier" }
G["@markup.link.url"] = { link = "Underlined" }
G["@markup.math"] = { link = "Special" }
G["@markup.raw"] = { link = "String" }
G['@markup.raw.markdown_inline'] = { bg = C.black2, fg = C.fg }
G["@markup.strong"] = { bold = true }
G["@markup.strikethrough"] = { strikethrough = true }
G["@markup.underline"] = { underline = true }
-- TSX
G['@tag.tsx'] = { fg = C.blue1 }
G['@constructor.tsx'] = { fg = C.blue1 }
Expand All @@ -339,7 +395,7 @@ function M.get_groups()
G['@lsp.type.selfKeyword'] = { link = 'Builtin' }
G['@lsp.type.string.rust'] = { link = 'String' }
G['@lsp.type.typeAlias'] = { link = 'Type' }
G['@lsp.type.unresolvedReference'] = {}
G['@lsp.type.unresolvedReference'] = { undercurl = true, sp = C.error }
G['@lsp.type.variable'] = {} -- use treesitter styles for regular variables
G['@lsp.typemod.class.defaultLibrary'] = { link = 'Type' }
G['@lsp.typemod.enum.defaultLibrary'] = { link = 'Type' }
Expand All @@ -355,34 +411,29 @@ function M.get_groups()
G['@lsp.typemod.variable.injected'] = { link = 'Variable' }
G['@lsp.typemod.variable.globalScope'] = { link = 'Macro' }
-- Things that seems to be missing?
G['@text.todo'] = { link = 'Todo' }
G['@text.note'] = { link = 'Note' }
G["@annotation"] = { link = "PreProc" }
G["@diff.plus"] = { link = "DiffAdd" }
G["@diff.minus"] = { link = "DiffDelete" }
G["@diff.delta"] = { link = "DiffChange" }
G["@character"] = { link = "Character" }
G["@character.special"] = { link = "SpecialChar" }
G['@string.special'] = { fg = C.yellow.base } -- For escape characters within a string.
G['@tag'] = { fg = C.blue1 } -- Tags like html tag names.
G['@tag.delimiter'] = { fg = C.fg } -- Tag delimiter like `<` `>` `/`
G['@tag.attribute'] = { fg = C.yellow.base } -- Tag attribute like `id` `class`
G['@text'] = { link = 'Normal' } -- For strings considered text in a markup language.
G['@text.strong'] = { bold = true }
G['@text.emphasis'] = { italic = true } -- For text to be represented with emphasis.
G['@text.underline'] = { underline = true } -- For text to be represented with an underline.
G['@text.strike'] = { strikethrough = true } -- For strikethrough text.
G['@text.title'] = { link = 'Title' } -- Text that is part of a title.
G['@text.uri'] = { underline = true } -- Any URI like a link or email.
G['@text.literal'] = { link = 'String' }
G['@constant'] = { link = 'Constant' }
G['@number'] = { link = 'Constant' }
G['@float'] = { link = 'Constant' }
G['@boolean'] = { link = 'Constant' }
G['@constant.macro'] = { link = 'Constant' }
G['@constant.builtin'] = { link = 'Constant' }
G['@keyword.return'] = { link = 'Keyword' }
G['@keyword.export'] = { link = 'Keyword' }
G['@repeat'] = { link = 'Keyword' }
G['@conditional'] = { link = 'Keyword' }
G['@class'] = { link = 'Keyword' }
G['@keyword.operator'] = { link = 'Keyword' }
G['@include'] = { link = 'Include' }
G['@macro'] = { link = 'Macro' }
G["@module"] = { fg = C.yellow.base }
G['@module.builtin'] = { link = 'Builtin' }
G['@preproc'] = { link = 'Macro' }
G['@attribute'] = { link = 'Macro' }
G['@function.macro'] = { link = 'Macro' }
Expand Down Expand Up @@ -414,6 +465,21 @@ function M.get_groups()
G.TreesitterContext = { bg = bg }
G.TreesitterContextLineNumber = { fg = fg, bg = bg }

-- Neorg
G["@neorg.headings.1.title"] = { link = "@markup.heading.1" }
G["@neorg.headings.1.prefix"] = { link = "@markup.heading.1" }
G["@neorg.headings.2.title"] = { link = "@markup.heading.2" }
G["@neorg.headings.2.prefix"] = { link = "@markup.heading.2" }
G["@neorg.headings.3.title"] = { link = "@markup.heading.3" }
G["@neorg.headings.3.prefix"] = { link = "@markup.heading.3" }
G["@neorg.headings.4.title"] = { link = "@markup.heading.4" }
G["@neorg.headings.4.prefix"] = { link = "@markup.heading.4" }
G["@neorg.headings.5.title"] = { link = "@markup.heading.5" }
G["@neorg.headings.5.prefix"] = { link = "@markup.heading.5" }
G["@neorg.headings.6.title"] = { link = "@markup.heading.6" }
G["@neorg.headings.6.prefix"] = { link = "@markup.heading.6" }


-- Trouble.
G.TroubleNormal = { bg = C.bg_float }
G.TroubleText = { fg = C.fg }
Expand Down
2 changes: 1 addition & 1 deletion lua/nordic/groups/native.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function M.get_groups()
G.Special = { fg = C.blue1 } -- (preferred) any special symbol
-- SpecialChar = { } -- special character in a constant
-- Tag = { } -- you can use CTRL-] on this
-- Delimiter = { } -- character that needs attention
G.Delimiter = { italic = true, fg = C.gray5} -- character that needs attention
-- SpecialComment= { } -- special things inside a comment
-- Debug = { } -- debugging statements
G.Underlined = { underline = true } -- (preferred) text that stands out, HTML links
Expand Down

0 comments on commit 6819225

Please sign in to comment.