Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue#2561

This commit is contained in:
John DeBoard 2024-01-04 10:04:36 -05:00 committed by GitHub
parent 1f3e3e0d71 cd81c7fa6b
commit e5858e27d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@
## Syntaxes ## Syntaxes
- `cmd-help`: scope subcommands followed by other terms, and other misc improvements, see #2819 (@victor-gp) - `cmd-help`: scope subcommands followed by other terms, and other misc improvements, see #2819 (@victor-gp)
- Upgrade JQ syntax, see #2820 (@dependabot[bot])
## Themes ## Themes

2
assets/syntaxes/02_Extra/SublimeJQ vendored

@ -1 +1 @@
Subproject commit 687058289c1a888e0895378432d66b41609a84d8 Subproject commit b7e53e5d86814f04a48d2e441bcf5f9fdf07e9c1

32
tests/syntax-tests/highlighted/JQ/sample.jq vendored
View File

@ -1,31 +1,31 @@
import "../imported-file" ; import "../imported-file" ;
# With Comments ! # With Comments !
def weird($a; $b; $c): def weird($a; $b; $c):
 [ $a, $b, $c ] | transpose | reduce .[][] as $item (  [ $a, $b, $c ] | transpose | reduce .[][] as $item (
 [];  [];
 . + $item.property  . + $item.property
 )  )
; ;
. | weird (.a; .b; .c) | . | weird (.a; .b; .c) |
( (
if (. | contains("never") ) then if (. | contains("never") ) then
 "Why yes"  "Why yes"
else else
 12.23  12.23
end end
) as $never | ) as $never |
{ {
 hello,  hello,
 why: "because",  why: "because",
 hello: ( weird | ascii_upcase ),  hello: ( weird | ascii_upcase ),
 format_eg: ( . | @json "My json string \( . | this | part | just | white | ascii_upcase | transpose)" ),  format_eg: ( . | @json "My json string \( . | this | part | just | white | ascii_upcase | transpose)" ),
 never: $never,  never: $never,
 "literal_key": literal_value,  "literal_key": literal_value,
 "this": 12.1e12,  "this": 12.1e12,
 "part": "almost"  "part": "almost"
@ -38,8 +38,8 @@
 similar: "but not quite"  similar: "but not quite"
 }  }
 }  }
 ],  ],
} | ( } | (
   
 # And with very basic brace matching  # And with very basic brace matching
   
@ -47,13 +47,13 @@
 ]   ] 
   
 # Other invalid ends  # Other invalid ends
 ( [ } ] )  ( [ } ] )
 # A "valid" sequence  # A "valid" sequence
 ( [ { key: () , other_key:( [ [] [[]] ] ), gaga } ] )  ( [ { key: () , other_key:( [ [] [[]] ] ), gaga } ] )
 # A "invalid" sequence  # A "invalid" sequence
 ( [ { key: () , other_key:( [ [] [[] ] ), gaga } ] )  ( [ { key: () , other_key:( [ [] [[] ] ), gaga } ] )
 "A string\n whith escaped characters \" because we can"  "A string\n whith escaped characters \" because we can"
) )