mirror of
https://github.com/sharkdp/bat.git
synced 2025-10-08 21:03:56 +01:00
Merge branch 'master' into dmesg_syntax_mapping
This commit is contained in:
Keith Hall
GitHub
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -278,3 +278,6 @@
|
||||
[submodule "assets/syntaxes/02_Extra/hosts"]
|
||||
path = assets/syntaxes/02_Extra/hosts
|
||||
url = https://github.com/tijn/hosts.tmLanguage
|
||||
[submodule "assets/syntaxes/02_Extra/Gomod"]
|
||||
path = assets/syntaxes/02_Extra/Gomod
|
||||
url = https://github.com/mitranim/sublime-gomod
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
- Update hosts syntax #3368 (@keith-hall)
|
||||
- Map `.kshrc` files to Bash syntax #3364 (@ritoban23)
|
||||
- Map `/var/log/dmesg` files to Syslog syntax #3412 (@keith-hall)
|
||||
- Add syntax definition and test file for Go modules(`go.mod` and `go.sum`) highlighting, see #3424 (@DarkMatter-999)
|
||||
|
||||
## Themes
|
||||
|
||||
|
||||
16
Cargo.lock
generated
16
Cargo.lock
generated
@@ -133,8 +133,7 @@ dependencies = [
|
||||
"grep-cli",
|
||||
"home",
|
||||
"indexmap",
|
||||
"itertools 0.13.0",
|
||||
"itertools 0.14.0",
|
||||
"itertools",
|
||||
"minus",
|
||||
"nix",
|
||||
"nu-ansi-term",
|
||||
@@ -900,15 +899,6 @@ version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.14.0"
|
||||
@@ -1867,9 +1857,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||
|
||||
[[package]]
|
||||
name = "wait-timeout"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
|
||||
checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -74,7 +74,7 @@ encoding_rs = "0.8.35"
|
||||
execute = { version = "0.2.13", optional = true }
|
||||
terminal-colorsaurus = "1.0"
|
||||
unicode-segmentation = "1.12.0"
|
||||
itertools = "0.13.0"
|
||||
itertools = "0.14.0"
|
||||
|
||||
[dependencies.git2]
|
||||
version = "0.20"
|
||||
@@ -100,7 +100,7 @@ assert_cmd = "2.0.12"
|
||||
expect-test = "1.5.0"
|
||||
serial_test = { version = "2.0.0", default-features = false }
|
||||
predicates = "3.1.3"
|
||||
wait-timeout = "0.2.0"
|
||||
wait-timeout = "0.2.1"
|
||||
tempfile = "3.16.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
|
||||
1
assets/syntaxes/02_Extra/Gomod
vendored
Submodule
1
assets/syntaxes/02_Extra/Gomod
vendored
Submodule
Submodule assets/syntaxes/02_Extra/Gomod added at e0200f024a
5
tests/syntax-tests/highlighted/Go/go.mod
vendored
Normal file
5
tests/syntax-tests/highlighted/Go/go.mod
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
[38;2;249;38;114mmodule[0m[38;2;248;248;242m [0m[38;2;248;248;242mhugeparam[0m
|
||||
|
||||
[38;2;249;38;114mgo[0m[38;2;248;248;242m [0m[38;2;248;248;242m1.25.1[0m
|
||||
|
||||
[38;2;249;38;114mrequire[0m[38;2;248;248;242m [0m[38;2;248;248;242mgolang.org/x/tools[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.37.0[0m
|
||||
6
tests/syntax-tests/highlighted/Go/go.sum
vendored
Normal file
6
tests/syntax-tests/highlighted/Go/go.sum
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
[38;2;248;248;242mgolang.org/x/mod[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.28.0[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255mgQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=[0m
|
||||
[38;2;248;248;242mgolang.org/x/mod[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.28.0[0m[38;2;248;248;242m/[0m[38;2;248;248;242mgo.mod[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255myfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=[0m
|
||||
[38;2;248;248;242mgolang.org/x/sync[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.17.0[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255ml60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=[0m
|
||||
[38;2;248;248;242mgolang.org/x/sync[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.17.0[0m[38;2;248;248;242m/[0m[38;2;248;248;242mgo.mod[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255m9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=[0m
|
||||
[38;2;248;248;242mgolang.org/x/tools[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.37.0[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255mDVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=[0m
|
||||
[38;2;248;248;242mgolang.org/x/tools[0m[38;2;248;248;242m [0m[38;2;230;219;116mv0.37.0[0m[38;2;248;248;242m/[0m[38;2;248;248;242mgo.mod[0m[38;2;248;248;242m [0m[38;2;166;226;46mh1[0m[38;2;248;248;242m:[0m[38;2;190;132;255mMBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=[0m
|
||||
5
tests/syntax-tests/source/Go/go.mod
vendored
Normal file
5
tests/syntax-tests/source/Go/go.mod
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
module hugeparam
|
||||
|
||||
go 1.25.1
|
||||
|
||||
require golang.org/x/tools v0.37.0
|
||||
6
tests/syntax-tests/source/Go/go.sum
vendored
Normal file
6
tests/syntax-tests/source/Go/go.sum
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
|
||||
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
|
||||
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
|
||||
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
|
||||
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
|
||||
Reference in New Issue
Block a user