mirror of
https://github.com/sharkdp/bat.git
synced 2025-05-02 15:34:28 +02:00
Merge eed1699f2e into fc7dff50b0
This commit is contained in:
Sorin Sbarnea
GitHub
commit
a35126e998
@ -12,6 +12,8 @@
|
|||||||
## Other
|
## Other
|
||||||
|
|
||||||
- Work around build failures when building `bat` from vendored sources #3179 (@dtolnay)
|
- Work around build failures when building `bat` from vendored sources #3179 (@dtolnay)
|
||||||
|
- Fixed some typos #3244 (@ssbarnea)
|
||||||
|
|
||||||
|
|
||||||
## Syntaxes
|
## Syntaxes
|
||||||
|
|
||||||
|
|||||||
@ -2021,7 +2021,7 @@
|
|||||||
[35m[Ktests/syntax-tests/highlighted/Manpage/bat-0.16.man[m[K[36m[K:[m[K[32m[K243[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;166;226;46m[1;33m[KBAT[m[K[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m
|
[35m[Ktests/syntax-tests/highlighted/Manpage/bat-0.16.man[m[K[36m[K:[m[K[32m[K243[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;166;226;46m[1;33m[KBAT[m[K[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/Svelte/App.svelte[m[K[36m[K:[m[K[32m[K30[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;246;170;17m// This block is a regression test for a [1;33m[Kbat[m[K panic when a LiveScript syntax definition is missing[0m
|
[35m[Ktests/syntax-tests/highlighted/Svelte/App.svelte[m[K[36m[K:[m[K[32m[K30[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;246;170;17m// This block is a regression test for a [1;33m[Kbat[m[K panic when a LiveScript syntax definition is missing[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/VimL/source.vim[m[K[36m[K:[m[K[32m[K77[m[K[36m[K:[m[K[38;2;117;113;94m" Error case from issue #1604 (https://github.com/sharkdp/[1;33m[Kbat[m[K/issues/1064)[0m
|
[35m[Ktests/syntax-tests/highlighted/VimL/source.vim[m[K[36m[K:[m[K[32m[K77[m[K[36m[K:[m[K[38;2;117;113;94m" Error case from issue #1604 (https://github.com/sharkdp/[1;33m[Kbat[m[K/issues/1064)[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/Java/test.java[m[K[36m[K:[m[K[32m[K3[m[K[36m[K:[m[K[38;2;117;113;94m/*[0m[38;2;117;113;94m This Java program was submiited to help [1;33m[Kbat[m[K[0m
|
[35m[Ktests/syntax-tests/highlighted/Java/test.java[m[K[36m[K:[m[K[32m[K3[m[K[36m[K:[m[K[38;2;117;113;94m/*[0m[38;2;117;113;94m This Java program was submitted to help [1;33m[Kbat[m[K[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/Sass/example.sass[m[K[36m[K:[m[K[32m[K46[m[K[36m[K:[m[K[38;2;248;248;242m [0m[3;38;2;102;217;239mbackground-image[0m[38;2;255;255;255m:[0m[38;2;248;248;242m [0m[38;2;102;217;239murl[0m[38;2;255;255;255m([0m[38;2;230;219;116m"[0m[38;2;230;219;116mhttps://github.com/sharkdp/[1;33m[Kbat[m[K/raw/master/doc/logo-header.svg[0m[38;2;230;219;116m"[0m[38;2;255;255;255m)[0m
|
[35m[Ktests/syntax-tests/highlighted/Sass/example.sass[m[K[36m[K:[m[K[32m[K46[m[K[36m[K:[m[K[38;2;248;248;242m [0m[3;38;2;102;217;239mbackground-image[0m[38;2;255;255;255m:[0m[38;2;248;248;242m [0m[38;2;102;217;239murl[0m[38;2;255;255;255m([0m[38;2;230;219;116m"[0m[38;2;230;219;116mhttps://github.com/sharkdp/[1;33m[Kbat[m[K/raw/master/doc/logo-header.svg[0m[38;2;230;219;116m"[0m[38;2;255;255;255m)[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/HTML/test.html[m[K[36m[K:[m[K[32m[K5[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;255;255;255m<[0m[38;2;249;38;114mtitle[0m[38;2;255;255;255m>[0m[38;2;248;248;242m[1;33m[KBat[m[K Syntax Test[0m[38;2;255;255;255m</[0m[38;2;249;38;114mtitle[0m[38;2;255;255;255m>[0m
|
[35m[Ktests/syntax-tests/highlighted/HTML/test.html[m[K[36m[K:[m[K[32m[K5[m[K[36m[K:[m[K[38;2;248;248;242m [0m[38;2;255;255;255m<[0m[38;2;249;38;114mtitle[0m[38;2;255;255;255m>[0m[38;2;248;248;242m[1;33m[KBat[m[K Syntax Test[0m[38;2;255;255;255m</[0m[38;2;249;38;114mtitle[0m[38;2;255;255;255m>[0m
|
||||||
[35m[Ktests/syntax-tests/highlighted/Cpp/test.cpp[m[K[36m[K:[m[K[32m[K6[m[K[36m[K:[m[K[38;2;117;113;94m/*[0m[38;2;117;113;94m This C program was submitted to help [1;33m[Kbat[m[K[0m
|
[35m[Ktests/syntax-tests/highlighted/Cpp/test.cpp[m[K[36m[K:[m[K[32m[K6[m[K[36m[K:[m[K[38;2;117;113;94m/*[0m[38;2;117;113;94m This C program was submitted to help [1;33m[Kbat[m[K[0m
|
||||||
@ -2119,7 +2119,7 @@
|
|||||||
[35m[Ktests/syntax-tests/source/Svelte/App.svelte[m[K[36m[K:[m[K[32m[K30[m[K[36m[K:[m[K // This block is a regression test for a [1;33m[Kbat[m[K panic when a LiveScript syntax definition is missing
|
[35m[Ktests/syntax-tests/source/Svelte/App.svelte[m[K[36m[K:[m[K[32m[K30[m[K[36m[K:[m[K // This block is a regression test for a [1;33m[Kbat[m[K panic when a LiveScript syntax definition is missing
|
||||||
[35m[Ktests/syntax-tests/source/VimL/source.vim[m[K[36m[K:[m[K[32m[K77[m[K[36m[K:[m[K" Error case from issue #1604 (https://github.com/sharkdp/[1;33m[Kbat[m[K/issues/1064)
|
[35m[Ktests/syntax-tests/source/VimL/source.vim[m[K[36m[K:[m[K[32m[K77[m[K[36m[K:[m[K" Error case from issue #1604 (https://github.com/sharkdp/[1;33m[Kbat[m[K/issues/1064)
|
||||||
[35m[Ktests/syntax-tests/source/Git Config/LICENSE.md[m[K[36m[K:[m[K[32m[K1[m[K[36m[K:[m[KThe `test.gitconfig` file has been added from https://github.com/sharkdp/[1;33m[Kbat[m[K/pull/1336#issuecomment-715905807. Its "free to use".
|
[35m[Ktests/syntax-tests/source/Git Config/LICENSE.md[m[K[36m[K:[m[K[32m[K1[m[K[36m[K:[m[KThe `test.gitconfig` file has been added from https://github.com/sharkdp/[1;33m[Kbat[m[K/pull/1336#issuecomment-715905807. Its "free to use".
|
||||||
[35m[Ktests/syntax-tests/source/Java/test.java[m[K[36m[K:[m[K[32m[K3[m[K[36m[K:[m[K/* This Java program was submiited to help [1;33m[Kbat[m[K
|
[35m[Ktests/syntax-tests/source/Java/test.java[m[K[36m[K:[m[K[32m[K3[m[K[36m[K:[m[K/* This Java program was submitted to help [1;33m[Kbat[m[K
|
||||||
[35m[Ktests/syntax-tests/source/Sass/example.sass[m[K[36m[K:[m[K[32m[K46[m[K[36m[K:[m[K background-image: url("https://github.com/sharkdp/[1;33m[Kbat[m[K/raw/master/doc/logo-header.svg")
|
[35m[Ktests/syntax-tests/source/Sass/example.sass[m[K[36m[K:[m[K[32m[K46[m[K[36m[K:[m[K background-image: url("https://github.com/sharkdp/[1;33m[Kbat[m[K/raw/master/doc/logo-header.svg")
|
||||||
[35m[Ktests/syntax-tests/source/HTML/test.html[m[K[36m[K:[m[K[32m[K5[m[K[36m[K:[m[K <title>[1;33m[KBat[m[K Syntax Test</title>
|
[35m[Ktests/syntax-tests/source/HTML/test.html[m[K[36m[K:[m[K[32m[K5[m[K[36m[K:[m[K <title>[1;33m[KBat[m[K Syntax Test</title>
|
||||||
[35m[Ktests/syntax-tests/source/Cpp/test.cpp[m[K[36m[K:[m[K[32m[K6[m[K[36m[K:[m[K/* This C program was submitted to help [1;33m[Kbat[m[K
|
[35m[Ktests/syntax-tests/source/Cpp/test.cpp[m[K[36m[K:[m[K[32m[K6[m[K[36m[K:[m[K/* This C program was submitted to help [1;33m[Kbat[m[K
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[38;2;249;38;114mimport[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mjava[0m[38;2;248;248;242m.[0m[3;38;2;166;226;46mutil[0m[38;2;248;248;242m.[0m[3;38;2;166;226;46mScanner[0m[38;2;248;248;242m;[0m
|
[38;2;249;38;114mimport[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mjava[0m[38;2;248;248;242m.[0m[3;38;2;166;226;46mutil[0m[38;2;248;248;242m.[0m[3;38;2;166;226;46mScanner[0m[38;2;248;248;242m;[0m
|
||||||
|
|
||||||
[38;2;117;113;94m/*[0m[38;2;117;113;94m This Java program was submiited to help bat[0m
|
[38;2;117;113;94m/*[0m[38;2;117;113;94m This Java program was submitted to help bat[0m
|
||||||
[38;2;117;113;94m * with its syntax highlighting tests[0m
|
[38;2;117;113;94m * with its syntax highlighting tests[0m
|
||||||
[38;2;117;113;94m [0m[38;2;117;113;94m*/[0m
|
[38;2;117;113;94m [0m[38;2;117;113;94m*/[0m
|
||||||
|
|
||||||
|
|||||||
2
tests/syntax-tests/source/Java/test.java
vendored
2
tests/syntax-tests/source/Java/test.java
vendored
@ -1,6 +1,6 @@
|
|||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
/* This Java program was submiited to help bat
|
/* This Java program was submitted to help bat
|
||||||
* with its syntax highlighting tests
|
* with its syntax highlighting tests
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user