Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(syntax): respect editor style guide #482

Merged
merged 1 commit into from May 10, 2023
Merged

refactor(syntax): respect editor style guide #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lua/catppuccin/groups/integrations/semantic_tokens.lua
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ function M.get()
["@lsp.type.enumMember"] = { link = "@constant" },
["@lsp.type.escapeSequence"] = { link = "@string.escape" },
["@lsp.type.formatSpecifier"] = { link = "@punctuation.special" },
["@lsp.type.interface"] = { link = "@interface" },
["@lsp.type.interface"] = { fg = C.flamingo },
["@lsp.type.keyword"] = { link = "@keyword" },
["@lsp.type.namespace"] = { link = "@namespace" },
["@lsp.type.operator"] = { link = "@operator" },
Expand Down
22 changes: 5 additions & 17 deletions lua/catppuccin/groups/integrations/treesitter.lua
View file
Open in desktop
Expand Up @@ -37,16 +37,16 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci

["@boolean"] = { link = "Boolean" }, -- For booleans.
["@number"] = { link = "Number" }, -- For all numbers
["@float"] = { link = "Number" }, -- For floats.
["@float"] = { link = "Float" }, -- For floats.

-- Functions
["@function"] = { link = "Function" }, -- For function (calls and definitions).
["@function.builtin"] = { fg = C.peach, style = O.styles.functions or {} }, -- For builtin functions: table.insert in Lua.
["@function.call"] = { link = "@function" }, -- function calls
["@function.call"] = { link = "Function" }, -- function calls
["@function.macro"] = { fg = C.teal, style = O.styles.functions or {} }, -- For macro defined functions (calls and definitions): each macro_rules in RusC.
["@method"] = { fg = C.peach, style = O.styles.functions or {} }, -- For method calls and definitions.
["@method"] = { link = "Function" }, -- For method calls and definitions.

["@method.call"] = { link = "@method" }, -- method calls
["@method.call"] = { link = "Function" }, -- method calls

["@constructor"] = { fg = C.sapphire }, -- For constructor calls and definitions: = { } in Lua, and Java constructors.
["@parameter"] = { fg = C.maroon, style = { "italic" } }, -- For parameters of a function.
Expand Down Expand Up @@ -83,7 +83,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
["@variable"] = { fg = C.text, style = O.styles.variables or {} }, -- Any variable name that does not have another highlight.
["@variable.builtin"] = { fg = C.red }, -- Variable names that are defined by the languages, like this or self.

["@constant"] = { fg = C.peach }, -- For constants
["@constant"] = { link = "Constant" }, -- For constants
["@constant.builtin"] = { fg = C.peach, style = O.styles.keywords or {} }, -- For constant that are built in the language: nil in Lua.
["@constant.macro"] = { link = "Macro" }, -- For constants that are defined by macros: NULL in C.

Expand Down Expand Up @@ -120,18 +120,6 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
["@tag.attribute"] = { fg = C.teal, style = { "italic" } }, -- Tags like html tag names.
["@tag.delimiter"] = { fg = C.sky }, -- Tag delimiter like < > /

-- Semantic tokens
["@class"] = { fg = C.blue },
["@struct"] = { fg = C.blue },
["@enum"] = { fg = C.teal },
["@enumMember"] = { fg = C.flamingo },
["@event"] = { fg = C.flamingo },
["@interface"] = { fg = C.flamingo },
["@modifier"] = { fg = C.flamingo },
["@regexp"] = { fg = C.pink },
["@typeParameter"] = { fg = C.yellow },
["@decorator"] = { fg = C.flamingo },

-- Language specific:

-- css
Expand Down