Commit Graph

692 Commits

Author SHA1 Message Date
Theo a69e16b225
Specify the --sort option in the configuration files (#550)
* Specify the --sort option in the configuration files

* Let --sort option be case insensitive in configuration files

* style: inline sort variable

* Add an example of using sort to the tokei.example.toml
2020-06-02 14:03:54 +02:00
XAMPPRocky 8e37ba8e64
Update get_config documentation 2020-06-02 13:12:57 +02:00
dependabot-preview[bot] 21fc3e65a3 Bump dashmap from 3.11.2 to 3.11.3
Bumps [dashmap](https://github.com/xacrimon/dashmap) from 3.11.2 to 3.11.3.
- [Release notes](https://github.com/xacrimon/dashmap/releases)
- [Commits](https://github.com/xacrimon/dashmap/compare/v3.11.2...v3.11.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-02 05:06:35 +00:00
dependabot-preview[bot] 608c404743
Bump ignore from 0.4.15 to 0.4.16 (#546)
Bumps [ignore](https://github.com/BurntSushi/ripgrep) from 0.4.15 to 0.4.16.
- [Release notes](https://github.com/BurntSushi/ripgrep/releases)
- [Changelog](https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/ripgrep/compare/ignore-0.4.15...ignore-0.4.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-01 10:03:08 +02:00
dependabot-preview[bot] a4af517ef9 Bump serde from 1.0.110 to 1.0.111
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.110 to 1.0.111.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.110...v1.0.111)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-01 05:28:56 +00:00
Erin Power 9974f017e8 Added better blank detection 2020-05-31 13:55:17 +02:00
Erin Power 0595bd3f94 Re-org syntax.rs 2020-05-30 14:04:28 +02:00
Erin Power 733bc1ff05 Add initial context to json and stats 2020-05-30 14:02:33 +02:00
dependabot-preview[bot] 80f750e796 Bump regex from 1.3.7 to 1.3.9
Bumps [regex](https://github.com/rust-lang/regex) from 1.3.7 to 1.3.9.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/regex-1.3.7...1.3.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-29 09:07:59 +00:00
Erin Power 2342baa0dd Move codegen to use Tera 2020-05-28 09:28:09 +02:00
Erin Power 0b98f310c5 fmt 2020-05-28 08:01:52 +02:00
Erin Power ec8edf27e7 Replace lazy_static with once_cell 2020-05-28 08:01:52 +02:00
Nick Hackman 96b47ab404
Verbatim strings (#535)
* Added CSharp example

Using example from #330, for testing purposes

* Updated Rust test case

Rust test case now has a verbatim string that fails, with current
version of Tokei.

* Added C++ verbatim string to example

C++ Syntax makes this incredibly difficult to parse using the current
infrastructure, `R"PREFIX(    )PREFIX"` where PREFIX can be almost anything.

* Updated F# Test to have verbatim string

* Add support for "verbatim_quotes"

Quotes that neglect the `\"` rule, in the case of python as mentioned
in #330 it produces the correct outcome with Tokei currently.

* Add support for verbatim_quotes in syntax

Properly keeps track of current state and handles escapes properly in
the case of being inside of a verbatim_quote

* Added `verbatim_quotes` to CONTRIBUTING.md
2020-05-28 07:55:14 +02:00
Erin Power b7388e2e5d Bump version 2020-05-28 06:03:26 +02:00
Erin Power abddfafcf8 Update sub-dependencies 2020-05-28 06:02:52 +02:00
Erin Power fd34fd916c Add sponsor message 2020-05-28 06:02:28 +02:00
XAMPPRocky 53e8e0aa12
Update build.bash 2020-05-28 05:45:18 +02:00
XAMPPRocky 48c5ed1582
Update build.bash 2020-05-26 14:10:23 +02:00
XAMPPRocky 5204de76a1
Update CHANGELOG.md 2020-05-26 13:37:31 +02:00
XAMPPRocky 84f58ced02
Update CHANGELOG.md 2020-05-26 13:32:33 +02:00
dependabot-preview[bot] 9561e2784c Bump dashmap from 3.11.1 to 3.11.2
Bumps [dashmap](https://github.com/xacrimon/dashmap) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/xacrimon/dashmap/releases)
- [Commits](https://github.com/xacrimon/dashmap/compare/v3.11.1...v3.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 05:03:16 +00:00
Bruno Michel 156e7b7dc9
Add Alloy language (#541)
Alloy is an open source language and analyzer for software modeling.

Homepage: http://alloytools.org/
2020-05-23 12:11:55 +02:00
Nickolas Schiffer ee19d28195
Fix rust-lang.org link in readme (#540) 2020-05-22 02:48:19 +02:00
Herby Gillot 10494f213f
README.md: add instructions for installing via MacPorts (#539) 2020-05-22 01:49:37 +02:00
XAMPPRocky e0bfe7859b
Remove unneeded checkouts 2020-05-21 03:12:18 +02:00
人造电子小猫咪 223813a43c
Add .csx extension for C# (#538)
`.csx` is used by [dotnet script](https://github.com/filipw/dotnet-script) for C# scripting.
2020-05-20 16:21:25 +02:00
XAMPPRocky 96c2871ec6
Update mean_bean_deploy.yml 2020-05-20 02:33:26 +02:00
XAMPPRocky a9cb9c7776
Update mean_bean_deploy.yml 2020-05-20 01:19:33 +02:00
XAMPPRocky 0f37cfa478
Removed unneeded checkout 2020-05-20 00:24:13 +02:00
Erin Power cd606478e2 Update version and bump dependencies 2020-05-20 00:05:19 +02:00
Erin Power 08e90ae6bd Switch to using dirs for home_dir 2020-05-20 00:04:23 +02:00
Erin Power e982271ae4 Removed deprecated badges 2020-05-19 23:39:15 +02:00
XAMPPRocky b641611449
Change Windows to distribute exes instead of zips. 2020-05-19 23:37:47 +02:00
XAMPPRocky 946f404f3f
Update README.md 2020-05-19 18:15:52 +02:00
XAMPPRocky 850618272d
Update and rename .tokeirc.example to tokei.example.toml 2020-05-19 18:15:20 +02:00
XAMPPRocky 7cc40dee6a
Update .tokeirc.example 2020-05-19 18:14:33 +02:00
XAMPPRocky 6d9a163106
Update README.md 2020-05-19 18:11:18 +02:00
XAMPPRocky a85e5f6619
Update README.md 2020-05-19 18:09:45 +02:00
XAMPPRocky 87b2f725d8
Update README.md 2020-05-19 18:09:09 +02:00
koba cb48ca3c57
Support home directory in from_config_files (#531)
* Support home directory in from_config_files

* Update documentation for configuration of Tokei

On Linux, there're three places Tokei would get configuration from,
`~/.config/`, `./`, `~/`.

* Update API documentation of from_config_files()

Co-authored-by: Koba Ko <koba.ko@canonical.com>
2020-05-19 18:03:49 +02:00
Nick Hackman 765dfb1097
Fixed HTML counting JS and CSS comments (#534)
Previously all lines that were `CSS` or `JavaScript` comments were
counted as code, these are now properly counted as comments.
2020-05-19 17:59:50 +02:00
Nick Hackman 4448dc4ea1
Add language Svelte (#522)
* Added Support for Svelte

* Added Svelte test

* Removed Prettier formatting

* Removed unnecessary name in Svelte

* Added Svelte to README

* Removed README formatting
2020-05-19 17:56:07 +02:00
Alexandru Macovei e88eabe7d9
Add support for Dhall lang (#532) 2020-05-19 17:55:38 +02:00
Nick Hackman 89f1fde9d3
Vue test (#523)
* Fixed bug in Vue Counting Comments

Didn't support Javascript multi line comments or Javascript single line
comments, removed duplicate quotes

* Added Vue Test

* Trigger Rebuild

* Removed Prettier formatting

* Fixed typo, closing ] in multi_line_comments
2020-05-18 18:26:25 +02:00
Alexandru Macovei e554b3cb89
Add shebang and env for crystal scripts (#533) 2020-05-18 09:02:31 +02:00
dependabot-preview[bot] 5816b631d9 Bump clap from 2.33.0 to 2.33.1
Bumps [clap](https://github.com/clap-rs/clap) from 2.33.0 to 2.33.1.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/v2.33.1/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v2.33.0...v2.33.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-12 05:06:29 +00:00
dependabot-preview[bot] 6eac7fa499
Bump ignore from 0.4.14 to 0.4.15 (#526)
Bumps [ignore](https://github.com/BurntSushi/ripgrep) from 0.4.14 to 0.4.15.
- [Release notes](https://github.com/BurntSushi/ripgrep/releases)
- [Changelog](https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/ripgrep/compare/ignore-0.4.14...ignore-0.4.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11 16:36:49 +02:00
dependabot-preview[bot] b57655c267
Bump serde_yaml from 0.8.11 to 0.8.12 (#524)
Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.11 to 0.8.12.
- [Release notes](https://github.com/dtolnay/serde-yaml/releases)
- [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.11...0.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11 16:36:25 +02:00
dependabot-preview[bot] b0aceea1c3 Bump serde_json from 1.0.52 to 1.0.53
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.52 to 1.0.53.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.52...v1.0.53)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 06:17:18 +00:00
dependabot-preview[bot] f557936a3f Bump serde from 1.0.106 to 1.0.110
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.106 to 1.0.110.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.106...v1.0.110)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 05:36:25 +00:00