Skip to content

Commit 3cd8e14

Browse files
tmillrtmillr
committed
Map spec.syntax to prettylights primitives
1 parent e290572 commit 3cd8e14

9 files changed

+173
-173
lines changed

‎lua/github-theme/palette/github_dark.lua

+22-22
Original file line numberDiff line numberDiff line change
@@ -189,28 +189,28 @@ local function generate_spec(pal)
189189
}
190190

191191
spec.syntax = {
192-
bracket = pal.scale.orange[3], -- Brackets and Punctuation
193-
builtin0 = pal.scale.red[4], -- Builtin variable (Return Keywords, Regex, etc.)
194-
builtin1 = pal.scale.red[4], -- Builtin type
195-
builtin2 = pal.scale.blue[3], -- Builtin const
196-
comment = pal.scale.gray[5], -- Comment
197-
conditional = pal.scale.red[4], -- Conditional and loop
198-
const = pal.scale.blue[3], -- Constants, imports and booleans
199-
dep = pal.scale.red[3], -- Deprecated
200-
field = pl.syntax.constant, -- Field
201-
func = pal.scale.purple[2], -- Functions and Titles
202-
ident = pal.scale.blue[3], -- Identifiers
203-
keyword = pal.scale.red[4], -- Keywords
204-
number = pal.scale.blue[3], -- Numbers
205-
operator = pl.syntax.constant, -- Operators
206-
param = spec.fg1, -- Parameters
207-
preproc = pal.scale.red[4], -- PreProc
208-
regex = pal.scale.blue[3], -- Regex
209-
statement = pal.scale.red[4], -- Statements
210-
string = pal.scale.blue[2], -- Strings
211-
type = pl.syntax.variable, -- Types
212-
tag = pal.scale.green[2], -- Tags
213-
variable = spec.fg1, -- Variables
192+
bracket = spec.fg1, -- Brackets and Punctuation
193+
builtin0 = pl.syntax.keyword, -- Builtin variable
194+
builtin1 = pl.syntax.keyword, -- Builtin type
195+
builtin2 = pl.syntax.constant, -- Builtin const
196+
comment = pl.syntax.comment, -- Comment
197+
conditional = pl.syntax.keyword, -- Conditional and loop
198+
const = pl.syntax.constant, -- Constants, imports and booleans
199+
dep = pal.scale.red[3], -- Deprecated
200+
field = pl.syntax.constant, -- Field
201+
func = pl.syntax.entity, -- Functions and Titles
202+
ident = spec.fg1, -- Identifiers
203+
keyword = pl.syntax.keyword, -- Keywords
204+
number = pl.syntax.constant, -- Numbers
205+
operator = pl.syntax.constant, -- Operators
206+
param = spec.fg1, -- Parameters
207+
preproc = pl.syntax.keyword, -- PreProc
208+
regex = pl.syntax.string, -- Regex
209+
statement = pl.syntax.keyword, -- Statements
210+
string = pl.syntax.string, -- Strings
211+
type = pl.syntax.variable, -- Types
212+
tag = pl.syntax.entityTag, -- Tags
213+
variable = spec.fg1, -- Variables
214214
}
215215

216216
spec.diag = {

‎lua/github-theme/palette/github_dark_colorblind.lua

+22-22
Original file line numberDiff line numberDiff line change
@@ -189,28 +189,28 @@ local function generate_spec(pal)
189189
}
190190

191191
spec.syntax = {
192-
bracket = pal.scale.orange[3], -- Brackets and Punctuation
193-
builtin0 = pal.scale.red[4], -- Builtin variable (Return Keywords, Regex, etc.)
194-
builtin1 = pal.scale.red[4], -- Builtin type
195-
builtin2 = pal.scale.blue[3], -- Builtin const
196-
comment = pal.scale.gray[5], -- Comment
197-
conditional = pal.scale.red[4], -- Conditional and loop
198-
const = pal.scale.blue[3], -- Constants, imports and booleans
199-
dep = pal.scale.red[3], -- Deprecated
200-
field = pl.syntax.constant, -- Field
201-
func = pal.scale.purple[3], -- Functions and Titles
202-
ident = pal.scale.blue[3], -- Identifiers
203-
keyword = pal.scale.red[4], -- Keywords
204-
number = pal.scale.blue[3], -- Numbers
205-
operator = pl.syntax.constant, -- Operators
206-
param = spec.fg1, -- Parameters
207-
preproc = pal.scale.red[4], -- PreProc
208-
regex = pal.scale.blue[3], -- Regex
209-
statement = pal.scale.red[4], -- Statements
210-
string = pal.scale.blue[2], -- Strings
211-
type = pl.syntax.variable, -- Types
212-
tag = pal.scale.blue[3], -- Tags
213-
variable = spec.fg1, -- Variables
192+
bracket = spec.fg1, -- Brackets and Punctuation
193+
builtin0 = pl.syntax.keyword, -- Builtin variable
194+
builtin1 = pl.syntax.keyword, -- Builtin type
195+
builtin2 = pl.syntax.constant, -- Builtin const
196+
comment = pl.syntax.comment, -- Comment
197+
conditional = pl.syntax.keyword, -- Conditional and loop
198+
const = pl.syntax.constant, -- Constants, imports and booleans
199+
dep = pal.scale.red[3], -- Deprecated
200+
field = pl.syntax.constant, -- Field
201+
func = pl.syntax.entity, -- Functions and Titles
202+
ident = spec.fg1, -- Identifiers
203+
keyword = pl.syntax.keyword, -- Keywords
204+
number = pl.syntax.constant, -- Numbers
205+
operator = pl.syntax.constant, -- Operators
206+
param = spec.fg1, -- Parameters
207+
preproc = pl.syntax.keyword, -- PreProc
208+
regex = pl.syntax.string, -- Regex
209+
statement = pl.syntax.keyword, -- Statements
210+
string = pl.syntax.string, -- Strings
211+
type = pl.syntax.variable, -- Types
212+
tag = pl.syntax.entityTag, -- Tags
213+
variable = spec.fg1, -- Variables
214214
}
215215

216216
spec.diag = {

‎lua/github-theme/palette/github_dark_dimmed.lua

+22-22
Original file line numberDiff line numberDiff line change
@@ -189,28 +189,28 @@ local function generate_spec(pal)
189189
}
190190

191191
spec.syntax = {
192-
bracket = spec.fg1, -- Brackets and Punctuation
193-
builtin0 = pal.scale.red[4], -- Builtin variable (Return Keywords, Regex, etc.)
194-
builtin1 = pal.scale.red[4], -- Builtin type
195-
builtin2 = pal.scale.blue[3], -- Builtin const
196-
comment = pal.scale.gray[5], -- Comment
197-
conditional = pal.scale.red[4], -- Conditional and loop
198-
const = pal.scale.blue[3], -- Constants, imports and booleans
199-
dep = pal.scale.red[3], -- Deprecated
200-
field = pl.syntax.constant, -- Field
201-
func = pal.scale.purple[2], -- Functions and Titles
202-
ident = pal.scale.blue[3], -- Identifiers
203-
keyword = pal.scale.red[4], -- Keywords
204-
number = pal.scale.blue[3], -- Numbers
205-
operator = pl.syntax.constant, -- Operators
206-
param = spec.fg1, -- Parameters
207-
preproc = pal.scale.red[4], -- PreProc
208-
regex = pal.scale.blue[3], -- Regex
209-
statement = pal.scale.red[4], -- Statements
210-
string = pal.scale.blue[2], -- Strings
211-
type = pl.syntax.variable, -- Types
212-
tag = pal.scale.green[2], -- Tags
213-
variable = spec.fg1, -- Variables
192+
bracket = spec.fg1, -- Brackets and Punctuation
193+
builtin0 = pl.syntax.keyword, -- Builtin variable
194+
builtin1 = pl.syntax.keyword, -- Builtin type
195+
builtin2 = pl.syntax.constant, -- Builtin const
196+
comment = pl.syntax.comment, -- Comment
197+
conditional = pl.syntax.keyword, -- Conditional and loop
198+
const = pl.syntax.constant, -- Constants, imports and booleans
199+
dep = pal.scale.red[3], -- Deprecated
200+
field = pl.syntax.constant, -- Field
201+
func = pl.syntax.entity, -- Functions and Titles
202+
ident = spec.fg1, -- Identifiers
203+
keyword = pl.syntax.keyword, -- Keywords
204+
number = pl.syntax.constant, -- Numbers
205+
operator = pl.syntax.constant, -- Operators
206+
param = spec.fg1, -- Parameters
207+
preproc = pl.syntax.keyword, -- PreProc
208+
regex = pl.syntax.string, -- Regex
209+
statement = pl.syntax.keyword, -- Statements
210+
string = pl.syntax.string, -- Strings
211+
type = pl.syntax.variable, -- Types
212+
tag = pl.syntax.entityTag, -- Tags
213+
variable = spec.fg1, -- Variables
214214
}
215215

216216
spec.diag = {

‎lua/github-theme/palette/github_dark_high_contrast.lua

+22-22
Original file line numberDiff line numberDiff line change
@@ -189,28 +189,28 @@ local function generate_spec(pal)
189189
}
190190

191191
spec.syntax = {
192-
bracket = pal.scale.orange[3], -- Brackets and Punctuation
193-
builtin0 = pal.scale.red[4], -- Builtin variable (Return Keywords, Regex, etc.)
194-
builtin1 = pal.scale.red[4], -- Builtin type
195-
builtin2 = pal.scale.blue[3], -- Builtin const
196-
comment = pal.scale.gray[5], -- Comment
197-
conditional = pal.scale.red[4], -- Conditional and loop
198-
const = pal.scale.blue[3], -- Constants, imports and booleans
199-
dep = pal.scale.red[3], -- Deprecated
200-
field = pl.syntax.constant, -- Field
201-
func = pal.scale.purple[2], -- Functions and Titles
202-
ident = pal.scale.blue[3], -- Identifiers
203-
keyword = pal.scale.red[4], -- Keywords
204-
number = pal.scale.blue[3], -- Numbers
205-
operator = pl.syntax.constant, -- Operators
206-
param = spec.fg1, -- Parameters
207-
preproc = pal.scale.red[4], -- PreProc
208-
regex = pal.scale.blue[3], -- Regex
209-
statement = pal.scale.red[4], -- Statements
210-
string = pal.scale.blue[2], -- Strings
211-
type = pl.syntax.variable, -- Types
212-
tag = pal.scale.green[2], -- Tags
213-
variable = spec.fg1, -- Variables
192+
bracket = spec.fg1, -- Brackets and Punctuation
193+
builtin0 = pl.syntax.keyword, -- Builtin variable
194+
builtin1 = pl.syntax.keyword, -- Builtin type
195+
builtin2 = pl.syntax.constant, -- Builtin const
196+
comment = pl.syntax.comment, -- Comment
197+
conditional = pl.syntax.keyword, -- Conditional and loop
198+
const = pl.syntax.constant, -- Constants, imports and booleans
199+
dep = pal.scale.red[3], -- Deprecated
200+
field = pl.syntax.constant, -- Field
201+
func = pl.syntax.entity, -- Functions and Titles
202+
ident = spec.fg1, -- Identifiers
203+
keyword = pl.syntax.keyword, -- Keywords
204+
number = pl.syntax.constant, -- Numbers
205+
operator = pl.syntax.constant, -- Operators
206+
param = spec.fg1, -- Parameters
207+
preproc = pl.syntax.keyword, -- PreProc
208+
regex = pl.syntax.string, -- Regex
209+
statement = pl.syntax.keyword, -- Statements
210+
string = pl.syntax.string, -- Strings
211+
type = pl.syntax.variable, -- Types
212+
tag = pl.syntax.entityTag, -- Tags
213+
variable = spec.fg1, -- Variables
214214
}
215215

216216
spec.diag = {

‎lua/github-theme/palette/github_dark_tritanopia.lua

+22-22
Original file line numberDiff line numberDiff line change
@@ -189,28 +189,28 @@ local function generate_spec(pal)
189189
}
190190

191191
spec.syntax = {
192-
bracket = pal.scale.orange[3], -- Brackets and Punctuation
193-
builtin0 = pal.scale.red[4], -- Builtin variable (Return Keywords, Regex, etc.)
194-
builtin1 = pal.scale.red[4], -- Builtin type
195-
builtin2 = pal.scale.blue[3], -- Builtin const
196-
comment = pal.scale.gray[5], -- Comment
197-
conditional = pal.scale.red[4], -- Conditional and loop
198-
const = pal.scale.blue[3], -- Constants, imports and booleans
199-
dep = pal.scale.red[3], -- Deprecated
200-
field = pl.syntax.constant, -- Field
201-
func = pal.scale.purple[3], -- Functions and Titles
202-
ident = pal.scale.blue[3], -- Identifiers
203-
keyword = pal.scale.red[4], -- Keywords
204-
number = pal.scale.blue[3], -- Numbers
205-
operator = pl.syntax.constant, -- Operators
206-
param = spec.fg1, -- Parameters
207-
preproc = pal.scale.red[4], -- PreProc
208-
regex = pal.scale.blue[3], -- Regex
209-
statement = pal.scale.red[4], -- Statements
210-
string = pal.scale.blue[2], -- Strings
211-
type = pl.syntax.variable, -- Types
212-
tag = pal.scale.blue[3], -- Tags
213-
variable = spec.fg1, -- Variables
192+
bracket = spec.fg1, -- Brackets and Punctuation
193+
builtin0 = pl.syntax.keyword, -- Builtin variable
194+
builtin1 = pl.syntax.keyword, -- Builtin type
195+
builtin2 = pl.syntax.constant, -- Builtin const
196+
comment = pl.syntax.comment, -- Comment
197+
conditional = pl.syntax.keyword, -- Conditional and loop
198+
const = pl.syntax.constant, -- Constants, imports and booleans
199+
dep = pal.scale.red[3], -- Deprecated
200+
field = pl.syntax.constant, -- Field
201+
func = pl.syntax.entity, -- Functions and Titles
202+
ident = spec.fg1, -- Identifiers
203+
keyword = pl.syntax.keyword, -- Keywords
204+
number = pl.syntax.constant, -- Numbers
205+
operator = pl.syntax.constant, -- Operators
206+
param = spec.fg1, -- Parameters
207+
preproc = pl.syntax.keyword, -- PreProc
208+
regex = pl.syntax.string, -- Regex
209+
statement = pl.syntax.keyword, -- Statements
210+
string = pl.syntax.string, -- Strings
211+
type = pl.syntax.variable, -- Types
212+
tag = pl.syntax.entityTag, -- Tags
213+
variable = spec.fg1, -- Variables
214214
}
215215

216216
spec.diag = {

‎lua/github-theme/palette/github_light.lua

+15-15
Original file line numberDiff line numberDiff line change
@@ -191,26 +191,26 @@ local function generate_spec(pal)
191191

192192
spec.syntax = {
193193
bracket = spec.fg1, -- Brackets and Punctuation
194-
builtin0 = pal.scale.red[6], -- Builtin variable
195-
builtin1 = pal.scale.red[6], -- Builtin type
196-
builtin2 = pal.scale.blue[7], -- Builtin const
197-
comment = pal.scale.gray[6], -- Comment
198-
conditional = pal.scale.red[6], -- Conditional and loop
199-
const = pal.scale.blue[6], -- Constants, imports and booleans
194+
builtin0 = pl.syntax.keyword, -- Builtin variable
195+
builtin1 = pl.syntax.keyword, -- Builtin type
196+
builtin2 = pl.syntax.constant, -- Builtin const
197+
comment = pl.syntax.comment, -- Comment
198+
conditional = pl.syntax.keyword, -- Conditional and loop
199+
const = pl.syntax.constant, -- Constants, imports and booleans
200200
dep = pal.scale.red[8], -- Deprecated
201201
field = pl.syntax.constant, -- Field
202-
func = pal.scale.purple[6], -- Functions and Titles
203-
ident = pal.scale.blue[9], -- Identifiers
204-
keyword = pal.scale.red[6], -- Keywords
205-
number = pal.scale.blue[7], -- Numbers
202+
func = pl.syntax.entity, -- Functions and Titles
203+
ident = spec.fg1, -- Identifiers
204+
keyword = pl.syntax.keyword, -- Keywords
205+
number = pl.syntax.constant, -- Numbers
206206
operator = pl.syntax.constant, -- Operators
207207
param = spec.fg1, -- Parameters
208-
preproc = pal.scale.red[6], -- PreProc
209-
regex = pal.scale.blue[9], -- Regex
210-
statement = pal.scale.red[6], -- Statements
211-
string = pal.scale.blue[8], -- Strings
208+
preproc = pl.syntax.keyword, -- PreProc
209+
regex = pl.syntax.string, -- Regex
210+
statement = pl.syntax.keyword, -- Statements
211+
string = pl.syntax.string, -- Strings
212212
type = pl.syntax.variable, -- Types
213-
tag = pal.scale.green[6], -- Tags
213+
tag = pl.syntax.entityTag, -- Tags
214214
variable = spec.fg1, -- Variables
215215
}
216216

0 commit comments

Comments
 (0)