Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf67971c

Browse files
fix!: align treesitter colors with vscode/updated style guide (#804)
Co-authored-by: robin <comfysage@isabelroses.com>
1 parent931a129 commitf67971c

File tree

1 file changed

+29
-35
lines changed

1 file changed

+29
-35
lines changed

‎lua/catppuccin/groups/integrations/treesitter.lua‎

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
1717
["@variable"]= {fg=C.text,style=O.styles.variablesor {} },-- Any variable name that does not have another highlight.
1818
["@variable.builtin"]= {fg=C.red,style=O.styles.propertiesor {} },-- Variable names that are defined by the languages, like this or self.
1919
["@variable.parameter"]= {fg=C.maroon,style=O.styles.variablesor {} },-- For parameters of a function.
20-
["@variable.member"]= {fg=C.lavender },-- For fields.
20+
["@variable.member"]= {fg=C.text },-- For fields.
2121

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

26-
["@module"]= {fg=C.lavender,style=O.styles.miscsor {"italic"} },-- For identifiers referring to modules and namespaces.
26+
["@module"]= {fg=C.yellow,style=O.styles.miscsor {"italic"} },-- For identifiers referring to modules and namespaces.
2727
["@label"]= {link="Label"},-- For labels: label: in C and :label: in Lua.
2828

2929
-- Literals
@@ -34,7 +34,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
3434
["@string.special"]= {link="Special"},-- other special strings (e.g. dates)
3535
["@string.special.path"]= {link="Special"},-- filenames
3636
["@string.special.symbol"]= {fg=C.flamingo },-- symbols or atoms
37-
["@string.special.url"]= {fg=C.rosewater,style= {"italic","underline"} },-- urls, links and emails
37+
["@string.special.url"]= {fg=C.blue,style= {"italic","underline"} },-- urls, links and emails
3838

3939
["@character"]= {link="Character"},-- character literals
4040
["@character.special"]= {link="SpecialChar"},-- special characters (e.g. wildcards)
@@ -45,11 +45,11 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
4545

4646
-- Types
4747
["@type"]= {link="Type"},-- For types.
48-
["@type.builtin"]= {fg=C.yellow,style=O.styles.propertiesor {"italic"} },-- For builtin types.
48+
["@type.builtin"]= {fg=C.mauve,style=O.styles.propertiesor {"italic"} },-- For builtin types.
4949
["@type.definition"]= {link="Type"},-- type definitions (e.g. `typedef` in C)
5050

5151
["@attribute"]= {link="Constant"},-- attribute annotations (e.g. Python decorators)
52-
["@property"]= {fg=C.lavender,style=O.styles.propertiesor {} },-- Same as TSField.
52+
["@property"]= {fg=C.blue,style=O.styles.propertiesor {} },-- Same as TSField.
5353

5454
-- Functions
5555
["@function"]= {link="Function"},-- For function (calls and definitions).
@@ -60,7 +60,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
6060
["@function.method"]= {link="Function"},-- For method definitions.
6161
["@function.method.call"]= {link="Function"},-- For method calls.
6262

63-
["@constructor"]= {fg=C.sapphire },-- For constructor calls and definitions: = { } in Lua, and Java constructors.
63+
["@constructor"]= {fg=C.yellow },-- For constructor calls and definitions: = { } in Lua, and Java constructors.
6464
["@operator"]= {link="Operator"},-- For any operator: +, but also -> and * in C.
6565

6666
-- Keywords
@@ -69,7 +69,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
6969
["@keyword.type"]= {link="Keyword"},-- For keywords describing composite types (e.g. `struct`, `enum`)
7070
["@keyword.coroutine"]= {link="Keyword"},-- For keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
7171
["@keyword.function"]= {fg=C.mauve,style=O.styles.keywordsor {} },-- For keywords used to define a function.
72-
["@keyword.operator"]= {link="Operator"},-- For new keyword operator
72+
["@keyword.operator"]= {fg=C.mauve,style=O.styles.keywordsor {} },-- For new keyword operator
7373
["@keyword.import"]= {link="Include"},-- For includes: #include in C, use or extern crate in Rust, or require in Lua.
7474
["@keyword.repeat"]= {link="Repeat"},-- For keywords related to loops.
7575
["@keyword.return"]= {fg=C.mauve,style=O.styles.keywordsor {} },
@@ -81,8 +81,9 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
8181

8282
["@keyword.directive"]= {link="PreProc"},-- various preprocessor directives & shebangs
8383
["@keyword.directive.define"]= {link="Define"},-- preprocessor definition directives
84+
["@keyword.directive.css"]= {link="Keyword"},-- CSS at-rules: https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule.
8485
-- JS & derivative
85-
["@keyword.export"]= {fg=C.sky,style=O.styles.keywords },
86+
["@keyword.export"]= {fg=C.mauve,style=O.styles.keywords },
8687

8788
-- Punctuation
8889
["@punctuation.delimiter"]= {link="Delimiter"},-- For delimiters (e.g. `;` / `.` / `,`).
@@ -101,25 +102,26 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
101102

102103
-- Markup
103104
["@markup"]= {fg=C.text },-- For strings considerated text in a markup language.
104-
["@markup.strong"]= {fg=C.maroon,style= {"bold"} },-- bold
105-
["@markup.italic"]= {fg=C.maroon,style= {"italic"} },-- italic
105+
["@markup.strong"]= {fg=C.red,style= {"bold"} },-- bold
106+
["@markup.italic"]= {fg=C.red,style= {"italic"} },-- italic
106107
["@markup.strikethrough"]= {fg=C.text,style= {"strikethrough"} },-- strikethrough text
107108
["@markup.underline"]= {link="Underlined"},-- underlined text
108109

109-
["@markup.heading"]= {fg=C.blue,style= {"bold"} },-- titles like: # Example
110+
["@markup.heading"]= {fg=C.blue },-- titles like: # Example
111+
["@markup.heading.markdown"]= {style= {"bold"} },-- bold headings in markdown, but not in HTML or other markup
110112

111113
["@markup.math"]= {fg=C.blue },-- math environments (e.g. `$ ... $` in LaTeX)
112-
["@markup.quote"]= {fg=C.maroon,style= {"bold"} },-- block quotes
114+
["@markup.quote"]= {fg=C.pink },-- block quotes
113115
["@markup.environment"]= {fg=C.pink },-- text environments of markup languages
114116
["@markup.environment.name"]= {fg=C.blue },-- text indicating the type of an environment
115117

116-
["@markup.link"]= {link="Tag"},-- text references, footnotes, citations, etc.
117-
["@markup.link.label"]= {link="Label"},-- link, reference descriptions
118-
["@markup.link.url"]= {fg=C.rosewater,style= {"italic","underline"} },-- urls, links and emails
118+
["@markup.link"]= {fg=C.lavender },-- text references, footnotes, citations, etc.
119+
["@markup.link.label"]= {fg=C.lavender },-- link, reference descriptions
120+
["@markup.link.url"]= {fg=C.blue,style= {"italic","underline"} },-- urls, links and emails
119121

120-
["@markup.raw"]= {fg=C.teal },-- used for inline code in markdown and for doc in python (""")
122+
["@markup.raw"]= {fg=C.green },-- used for inline code in markdown and for doc in python (""")
121123

122-
["@markup.list"]= {link="Special"},
124+
["@markup.list"]= {fg=C.teal },
123125
["@markup.list.checked"]= {fg=C.green },-- todo notes
124126
["@markup.list.unchecked"]= {fg=C.overlay1 },-- todo notes
125127

@@ -129,9 +131,10 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
129131
["@diff.delta"]= {link="diffChanged"},-- deleted text (for diff files)
130132

131133
-- Tags
132-
["@tag"]= {fg=C.mauve },-- Tags like html tag names.
133-
["@tag.attribute"]= {fg=C.teal,style=O.styles.miscsor {"italic"} },-- Tags like html tag names.
134-
["@tag.delimiter"]= {fg=C.sky },-- Tag delimiter like < > /
134+
["@tag"]= {fg=C.blue },-- Tags like HTML tag names.
135+
["@tag.builtin"]= {fg=C.blue },-- JSX tag names.
136+
["@tag.attribute"]= {fg=C.yellow,style=O.styles.miscsor {"italic"} },-- XML/HTML attributes (foo in foo="bar").
137+
["@tag.delimiter"]= {fg=C.teal },-- Tag delimiter like < > /
135138

136139
-- Misc
137140
["@error"]= {link="Error"},
@@ -152,12 +155,12 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
152155
["@constant.java"]= {fg=C.teal },
153156

154157
-- css
155-
["@property.css"]= {fg=C.lavender },
156-
["@property.id.css"]= {fg=C.blue },
158+
["@property.css"]= {fg=C.blue },
159+
["@property.id.css"]= {fg=C.yellow },
157160
["@property.class.css"]= {fg=C.yellow },
158161
["@type.css"]= {fg=C.lavender },
159-
["@type.tag.css"]= {fg=C.mauve },
160-
["@string.plain.css"]= {fg=C.peach },
162+
["@type.tag.css"]= {fg=C.blue },
163+
["@string.plain.css"]= {fg=C.text },
161164
["@number.css"]= {fg=C.peach },
162165

163166
-- toml
@@ -167,18 +170,11 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
167170
["@label.json"]= {fg=C.blue },-- For labels: label: in C and :label: in Lua.
168171

169172
-- lua
170-
["@constructor.lua"]= {fg=C.flamingo },-- For constructor calls and definitions: = { } in Lua.
171-
172-
-- typescript
173-
["@property.typescript"]= {fg=C.lavender,style=O.styles.propertiesor {} },
174-
["@constructor.typescript"]= {fg=C.lavender },
175-
176-
-- TSX (Typescript React)
177-
["@constructor.tsx"]= {fg=C.lavender },
178-
["@tag.attribute.tsx"]= {fg=C.teal,style=O.styles.miscsor {"italic"} },
173+
["@constructor.lua"]= {link="@punctuation.bracket"},-- For constructor calls and definitions: = { } in Lua.
179174

180175
-- yaml
181176
["@variable.member.yaml"]= {fg=C.blue },-- For fields.
177+
["@variable.member.nix"]= {fg=C.blue },
182178

183179
-- Ruby
184180
["@string.special.symbol.ruby"]= {fg=C.flamingo },
@@ -188,9 +184,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci
188184
["@function.method.call.php"]= {link="Function"},
189185

190186
-- C/CPP
191-
["@type.builtin.c"]= {fg=C.yellow,style= {} },
192187
["@property.cpp"]= {fg=C.text },
193-
["@type.builtin.cpp"]= {fg=C.yellow,style= {} },
194188

195189
-- gitcommit
196190
["@comment.warning.gitcommit"]= {fg=C.yellow },

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp