Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1697 from zed-industries/css-highlighting-fixes

Browse source 
Highlighting fixes
This commit is contained in:
Max Brunsfeld 2022-10-07 12:56:31 -07:00 • committed by GitHub
commit 00188511cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/zed/src/languages/c/highlights.scm
View file

@ -86,7 +86,7 @@
(identifier) @variable (identifier) @variable
((identifier) @constant ((identifier) @constant
(#match? @constant "^[A-Z][A-Z\\d_]*$")) (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
(call_expression (call_expression
function: (identifier) @function) function: (identifier) @function)

4
crates/zed/src/languages/cpp/highlights.scm
View file

@ -37,11 +37,11 @@
(type_identifier) @type (type_identifier) @type
((identifier) @constant ((identifier) @constant
(#match? @constant "^[A-Z][A-Z\\d_]*$")) (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
(field_identifier) @property (field_identifier) @property
(statement_identifier) @label (statement_identifier) @label
(this) @variable.builtin (this) @variable.special
[ [
"break" "break"

12
crates/zed/src/languages/css/highlights.scm
View file

@ -41,10 +41,13 @@
(function_name) @function (function_name) @function
((property_name) @variable (
(#match? @variable "^--")) [
((plain_value) @variable (property_name)
(#match? @variable "^--")) (plain_value)
] @variable.special
(#match? @variable.special "^--")
)
[ [
"@media" "@media"
@ -70,7 +73,6 @@
(unit) @type (unit) @type
[ [
"#"
"," ","
":" ":"
] @punctuation.delimiter ] @punctuation.delimiter

6
crates/zed/src/languages/javascript/highlights.scm
View file

@ -51,12 +51,12 @@
(shorthand_property_identifier) (shorthand_property_identifier)
(shorthand_property_identifier_pattern) (shorthand_property_identifier_pattern)
] @constant ] @constant
(#match? @constant "^[A-Z_][A-Z\\d_]+$")) (#match? @constant "^_*[A-Z_][A-Z\\d_]*$"))
; Literals ; Literals
(this) @variable.builtin (this) @variable.special
(super) @variable.builtin (super) @variable.special
[ [
(true) (true)

2
crates/zed/src/languages/python/highlights.scm
View file

@ -21,7 +21,7 @@
(#match? @type "^[A-Z]")) (#match? @type "^[A-Z]"))
((identifier) @constant ((identifier) @constant
(#match? @constant "^[A-Z][A-Z_]*$")) (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
; Builtin functions ; Builtin functions

17
crates/zed/src/languages/rust/highlights.scm
View file

@ -1,6 +1,6 @@
(type_identifier) @type (type_identifier) @type
(primitive_type) @type.builtin (primitive_type) @type.builtin
(self) @variable.builtin (self) @variable.special
(field_identifier) @property (field_identifier) @property
(call_expression (call_expression
@ -27,22 +27,13 @@
; Identifier conventions ; Identifier conventions
; Assume uppercase names are enum constructors ; Assume uppercase names are types/enum-constructors
((identifier) @variant ((identifier) @type
(#match? @variant "^[A-Z]"))
; Assume that uppercase names in paths are types
((scoped_identifier
path: (identifier) @type)
(#match? @type "^[A-Z]"))
((scoped_identifier
path: (scoped_identifier
name: (identifier) @type))
(#match? @type "^[A-Z]")) (#match? @type "^[A-Z]"))
; Assume all-caps names are constants ; Assume all-caps names are constants
((identifier) @constant ((identifier) @constant
(#match? @constant "^[A-Z][A-Z\\d_]+$")) (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
[ [
"(" "("

6
crates/zed/src/languages/typescript/highlights.scm
View file

@ -51,12 +51,12 @@
(shorthand_property_identifier) (shorthand_property_identifier)
(shorthand_property_identifier_pattern) (shorthand_property_identifier_pattern)
] @constant ] @constant
(#match? @constant "^[A-Z_][A-Z\\d_]+$")) (#match? @constant "^_*[A-Z_][A-Z\\d_]*$"))
; Literals ; Literals
(this) @variable.builtin (this) @variable.special
(super) @variable.builtin (super) @variable.special
[ [
(true) (true)

12
styles/src/themes/common/base16.ts
View file

@ -185,6 +185,10 @@ export function createTheme(
color: sample(ramps.neutral, 7), color: sample(ramps.neutral, 7),
weight: fontWeights.normal, weight: fontWeights.normal,
}, },
"variable.special": {
color: sample(ramps.blue, 0.80),
weight: fontWeights.normal,
},
comment: { comment: {
color: sample(ramps.neutral, 5), color: sample(ramps.neutral, 5),
weight: fontWeights.normal, weight: fontWeights.normal,
@ -210,15 +214,11 @@ export function createTheme(
weight: fontWeights.normal, weight: fontWeights.normal,
}, },
constructor: { constructor: {
color: sample(ramps.blue, 0.5), color: sample(ramps.cyan, 0.5),
weight: fontWeights.normal,
},
variant: {
color: sample(ramps.blue, 0.5),
weight: fontWeights.normal, weight: fontWeights.normal,
}, },
property: { property: {
color: sample(ramps.blue, 0.5), color: sample(ramps.blue, 0.6),
weight: fontWeights.normal, weight: fontWeights.normal,
}, },
enum: { enum: {

2
styles/src/themes/common/theme.ts
View file

@ -43,7 +43,7 @@ export interface Syntax {
keyword: SyntaxHighlightStyle; keyword: SyntaxHighlightStyle;
function: SyntaxHighlightStyle; function: SyntaxHighlightStyle;
type: SyntaxHighlightStyle; type: SyntaxHighlightStyle;
variant: SyntaxHighlightStyle; constructor: SyntaxHighlightStyle;
property: SyntaxHighlightStyle; property: SyntaxHighlightStyle;
enum: SyntaxHighlightStyle; enum: SyntaxHighlightStyle;
operator: SyntaxHighlightStyle; operator: SyntaxHighlightStyle;