queries: use comment hightlights for line and block

nix: lock stable nixpkgs
This commit is contained in:
Dmitriy Pleshevskiy 2023-06-16 07:34:32 +03:00
parent 8aac147e8e
commit e67c50d7cb
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
6 changed files with 31 additions and 23 deletions

View file

@ -32,16 +32,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686737040, "lastModified": 1686736559,
"narHash": "sha256-R+JicNaI9mcxodtHkci894txjt4IMsfOnlAarA/r0xQ=", "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d1d80a232a355a65dc4d3bfea1f108e8dac1340", "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
tools.url = "git+https://git.pleshevski.ru/mynix/tools"; tools.url = "git+https://git.pleshevski.ru/mynix/tools";
}; };

View file

@ -27,9 +27,11 @@
; Comments ; Comments
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
(language) @comment [
(line_comment) @comment.line (language)
(block_comment) @comment.block (line_comment)
(block_comment)
] @comment
; Punctiation ; Punctiation
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------

View file

@ -2080,7 +2080,20 @@
"type": "PATTERN", "type": "PATTERN",
"value": "[0-9]+\\.[0-9]+" "value": "[0-9]+\\.[0-9]+"
}, },
"line_comment": { "comment": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_line_comment"
},
{
"type": "SYMBOL",
"name": "_block_comment"
}
]
},
"_line_comment": {
"type": "TOKEN", "type": "TOKEN",
"content": { "content": {
"type": "PREC", "type": "PREC",
@ -2137,11 +2150,7 @@
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "line_comment" "name": "comment"
},
{
"type": "SYMBOL",
"name": "block_comment"
} }
], ],
"conflicts": [ "conflicts": [
@ -2187,7 +2196,7 @@
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "block_comment" "name": "_block_comment"
} }
], ],
"inline": [], "inline": [],

View file

@ -232,6 +232,11 @@
] ]
} }
}, },
{
"type": "comment",
"named": true,
"fields": {}
},
{ {
"type": "connection", "type": "connection",
"named": true, "named": true,
@ -508,10 +513,6 @@
"type": "arrow", "type": "arrow",
"named": true "named": true
}, },
{
"type": "block_comment",
"named": true
},
{ {
"type": "bold", "type": "bold",
"named": false "named": false
@ -620,10 +621,6 @@
"type": "language", "type": "language",
"named": true "named": true
}, },
{
"type": "line_comment",
"named": true
},
{ {
"type": "link", "type": "link",
"named": false "named": false

Binary file not shown.