diff options
| author | Kyle Criddle <criddle.kyle@gmail.com> | 2020-03-24 19:08:43 -0600 |
|---|---|---|
| committer | Kyle Criddle <criddle.kyle@gmail.com> | 2020-03-24 19:08:43 -0600 |
| commit | 38178fedf463cb704509b772d5e274461086d368 (patch) | |
| tree | 287e8fc25a94da48f5147d788d313d0e5a644dfd | |
| parent | 59f2e2d58d3dc8ca31b74b9bad5899c4521baf0c (diff) | |
| parent | 8d3136eb6f94a1a4dffd9cf6a88d083c693d1616 (diff) | |
Merge branch 'master' into fix_654_stdin_filename
| -rw-r--r-- | .github/FUNDING.yml | 3 | ||||
| -rw-r--r-- | .gitmodules | 94 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Cargo.lock | 816 | ||||
| -rw-r--r-- | Cargo.toml | 7 | ||||
| -rw-r--r-- | README.md | 14 | ||||
| -rw-r--r-- | assets/JavaDoc.sublime-syntax.patch | 6 | ||||
| -rwxr-xr-x | assets/create.sh | 2 | ||||
| -rw-r--r-- | assets/manual/bat.1.in | 145 | ||||
| -rw-r--r-- | assets/syntaxes.bin | bin | 575090 -> 630826 bytes | |||
| m--------- | assets/syntaxes/01_Packages (renamed from assets/syntaxes/Packages) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/AWK (renamed from assets/syntaxes/AWK) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/AsciiDoc (renamed from assets/syntaxes/AsciiDoc) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax (renamed from assets/syntaxes/AsciiDoc.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Assembly (ARM) (renamed from assets/syntaxes/Assembly (ARM)) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Assembly (ARM).sublime-syntax (renamed from assets/syntaxes/Assembly (ARM).sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Assembly (x86_64).sublime-syntax (renamed from assets/syntaxes/Assembly (x86_64).sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/CMake (renamed from assets/syntaxes/CMake) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/CSV (renamed from assets/syntaxes/CSV) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/CSV.sublime-syntax (renamed from assets/syntaxes/CSV.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Cabal (renamed from assets/syntaxes/Cabal) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Cabal.sublime-syntax (renamed from assets/syntaxes/Cabal.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/CoffeeScript (renamed from assets/syntaxes/CoffeeScript) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax (renamed from assets/syntaxes/CoffeeScript.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/CpuInfo.sublime-syntax (renamed from assets/syntaxes/CpuInfo.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Crystal (renamed from assets/syntaxes/Crystal) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Crystal.sublime-syntax (renamed from assets/syntaxes/Crystal.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Dart (renamed from assets/syntaxes/Dart) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Dart.sublime-syntax (renamed from assets/syntaxes/Dart.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Docker (renamed from assets/syntaxes/Docker) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/DotENV (renamed from assets/syntaxes/DotENV) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/DotENV.sublime-syntax (renamed from assets/syntaxes/DotENV.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Elixir (renamed from assets/syntaxes/Elixir) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Elm (renamed from assets/syntaxes/Elm) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/FSharp (renamed from assets/syntaxes/FSharp) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Fish (renamed from assets/syntaxes/Fish) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Fstab.sublime-syntax (renamed from assets/syntaxes/Fstab.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/GraphQL (renamed from assets/syntaxes/GraphQL) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Group.sublime-syntax (renamed from assets/syntaxes/Group.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/HTML (Twig) (renamed from assets/syntaxes/HTML (Twig)) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/HTML (Twig).sublime-syntax (renamed from assets/syntaxes/HTML (Twig).sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Hosts.sublime-syntax (renamed from assets/syntaxes/Hosts.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/INI (renamed from assets/syntaxes/INI) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/INI.sublime-syntax (renamed from assets/syntaxes/INI.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/JavaScript (Babel) (renamed from assets/syntaxes/JavaScript (Babel)) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax (renamed from assets/syntaxes/JavaScript (Babel).sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Jinja2 (renamed from assets/syntaxes/Jinja2) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Jsonnet (renamed from assets/syntaxes/Jsonnet) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Julia (renamed from assets/syntaxes/Julia) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Kotlin (renamed from assets/syntaxes/Kotlin) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Kotlin.sublime-syntax (renamed from assets/syntaxes/Kotlin.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/LESS (renamed from assets/syntaxes/LESS) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Manpage.sublime-syntax (renamed from assets/syntaxes/Manpage.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/MemInfo.sublime-syntax (renamed from assets/syntaxes/MemInfo.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Nim.sublime-syntax (renamed from assets/syntaxes/Nim.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Nix (renamed from assets/syntaxes/Nix) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Nix.sublime-syntax (renamed from assets/syntaxes/Nix.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Org mode (renamed from assets/syntaxes/Org mode) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Org mode.sublime-syntax (renamed from assets/syntaxes/Org mode.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Passwd.sublime-syntax (renamed from assets/syntaxes/Passwd.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/PowerShell (renamed from assets/syntaxes/PowerShell) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/PowerShell.sublime-syntax (renamed from assets/syntaxes/PowerShell.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Protobuf (renamed from assets/syntaxes/Protobuf) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Puppet (renamed from assets/syntaxes/Puppet) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/PureScript (renamed from assets/syntaxes/PureScript) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Resolv.sublime-syntax (renamed from assets/syntaxes/Resolv.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Robot (renamed from assets/syntaxes/Robot) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Robot.sublime-syntax (renamed from assets/syntaxes/Robot.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/SCSS_Sass (renamed from assets/syntaxes/SCSS_Sass) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/SLS (renamed from assets/syntaxes/SLS) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Strace (renamed from assets/syntaxes/Strace) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Swift (renamed from assets/syntaxes/Swift) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Swift.sublime-syntax (renamed from assets/syntaxes/Swift.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Syslog (renamed from assets/syntaxes/Syslog) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/TOML (renamed from assets/syntaxes/TOML) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Terraform (renamed from assets/syntaxes/Terraform) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/TypeScript (renamed from assets/syntaxes/TypeScript) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/TypeScript.sublime-syntax (renamed from assets/syntaxes/TypeScript.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax (renamed from assets/syntaxes/TypsecriptReact.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Verilog (renamed from assets/syntaxes/Verilog) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/Verilog.sublime-syntax (renamed from assets/syntaxes/Verilog.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/VimL (renamed from assets/syntaxes/VimL) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/VimL.sublime-syntax (renamed from assets/syntaxes/VimL.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/Vue (renamed from assets/syntaxes/Vue) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/hosts (renamed from assets/syntaxes/hosts) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/requirementstxt (renamed from assets/syntaxes/requirementstxt) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/requirementstxt.sublime-syntax (renamed from assets/syntaxes/requirementstxt.sublime-syntax) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax (renamed from assets/syntaxes/show-nonprintable.sublime-syntax) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/ssh-config (renamed from assets/syntaxes/ssh-config) | 0 | ||||
| m--------- | assets/syntaxes/02_Extra/varlink (renamed from assets/syntaxes/varlink) | 0 | ||||
| -rw-r--r-- | assets/syntaxes/FSharp.sublime-syntax | 672 | ||||
| -rw-r--r-- | assets/themes.bin | bin | 10247 -> 16785 bytes | |||
| -rw-r--r-- | build.rs | 48 | ||||
| -rwxr-xr-x | ci/before_deploy.bash | 11 | ||||
| -rw-r--r-- | doc/README-ja.md | 12 | ||||
| -rw-r--r-- | doc/README-ko.md | 560 | ||||
| -rw-r--r-- | examples/cat.rs | 33 | ||||
| -rw-r--r-- | examples/simple.rs | 29 | ||||
| -rw-r--r-- | src/assets.rs | 234 | ||||
| -rw-r--r-- | src/bin/bat/app.rs | 76 | ||||
| -rw-r--r-- | src/bin/bat/assets.rs | 38 | ||||
| -rw-r--r-- | src/bin/bat/clap_app.rs | 14 | ||||
| -rw-r--r-- | src/bin/bat/config.rs | 2 | ||||
| -rw-r--r-- | src/bin/bat/directories.rs (renamed from src/dirs.rs) | 40 | ||||
| -rw-r--r-- | src/bin/bat/main.rs | 46 | ||||
| -rw-r--r-- | src/config.rs | 96 | ||||
| -rw-r--r-- | src/controller.rs | 12 | ||||
| -rw-r--r-- | src/errors.rs | 25 | ||||
| -rw-r--r-- | src/inputfile.rs | 8 | ||||
| -rw-r--r-- | src/lib.rs | 127 | ||||
| -rw-r--r-- | src/line_range.rs | 74 | ||||
| -rw-r--r-- | src/output.rs | 2 | ||||
| -rw-r--r-- | src/printer.rs | 26 | ||||
| -rw-r--r-- | src/style.rs | 86 | ||||
| -rw-r--r-- | src/syntax_mapping.rs | 112 | ||||
| -rw-r--r-- | src/wrap.rs | 11 | ||||
| -rw-r--r-- | tests/no_duplicate_extensions.rs | 35 | ||||
| -rw-r--r-- | tests/syntax_detection.rs | 78 |
118 files changed, 1837 insertions, 1763 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index d0f4090f..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -github: sharkdp diff --git a/.gitmodules b/.gitmodules index cac62a7d..62a3e51d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,32 +1,32 @@ [submodule "assets/syntaxes/Elixir"] - path = assets/syntaxes/Elixir + path = assets/syntaxes/02_Extra/Elixir url = https://github.com/princemaple/elixir-sublime-syntax/ [submodule "assets/syntaxes/Packages"] - path = assets/syntaxes/Packages + path = assets/syntaxes/01_Packages url = https://github.com/sublimehq/Packages/ [submodule "assets/syntaxes/TOML"] - path = assets/syntaxes/TOML + path = assets/syntaxes/02_Extra/TOML url = https://github.com/jasonwilliams/sublime_toml_highlighting [submodule "assets/syntaxes/Julia"] - path = assets/syntaxes/Julia + path = assets/syntaxes/02_Extra/Julia url = https://github.com/JuliaEditorSupport/Julia-sublime [submodule "assets/themes/sublime-monokai-extended"] path = assets/themes/sublime-monokai-extended url = https://github.com/jonschlinkert/sublime-monokai-extended [submodule "assets/syntaxes/Docker"] - path = assets/syntaxes/Docker + path = assets/syntaxes/02_Extra/Docker url = https://github.com/asbjornenge/Docker.tmbundle [submodule "assets/syntaxes/VimL"] - path = assets/syntaxes/VimL + path = assets/syntaxes/02_Extra/VimL url = https://github.com/SalGnt/Sublime-VimL [submodule "assets/syntaxes/INI"] - path = assets/syntaxes/INI + path = assets/syntaxes/02_Extra/INI url = https://github.com/clintberry/sublime-text-2-ini [submodule "assets/syntaxes/CMake"] - path = assets/syntaxes/CMake + path = assets/syntaxes/02_Extra/CMake url = https://github.com/zyxar/Sublime-CMakeLists [submodule "assets/syntaxes/LESS"] - path = assets/syntaxes/LESS + path = assets/syntaxes/02_Extra/LESS url = https://github.com/danro/LESS-sublime [submodule "assets/themes/DarkNeon"] path = assets/themes/DarkNeon @@ -41,127 +41,127 @@ |