Commit graph

824 commits

Author SHA1 Message Date
Erin Power 28917c4ad3 Add jupyter support 2020-06-21 18:59:17 +02:00
Erin Power 5ce242e012 fmt 2020-06-21 16:55:59 +02:00
Erin Power 3ef29b6e6e Change files print out 2020-06-21 16:55:47 +02:00
Erin Power efde7bdcc7 Refactor important syntax and add support for templates 2020-06-21 16:29:12 +02:00
Erin Power 427299f7c9 Add comment 2020-06-21 15:32:07 +02:00
Erin Power d4ef84320b Refactor context parsing and add initial support for HTML. 2020-06-21 15:15:16 +02:00
Erin Power 0cbb8bc084 fmt 2020-06-19 12:45:19 +02:00
Erin Power 4fbae4984d Refactor print and summarise code 2020-06-19 12:45:02 +02:00
Erin Power c06fa65dd9 Refactor cli_utils into Printer and add Rust context 2020-06-19 08:44:03 +02:00
Erin Power a9fca66a5f Rename hbs file to tera 2020-06-18 20:54:08 +02:00
Erin Power c185490d2d Switch to using LanguageType 2020-06-17 15:27:55 +02:00
Erin Power 1e2adff040 refactor parse_line_comment 2020-06-17 15:08:00 +02:00
dependabot-preview[bot] d8d5e3b423 Bump rayon from 1.3.0 to 1.3.1
Bumps [rayon](https://github.com/rayon-rs/rayon) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/rayon-rs/rayon/releases)
- [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md)
- [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.3.0...v1.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 05:05:08 +00:00
Erin Power 0e4b0b6ad7 fmt 2020-06-16 01:01:59 +02:00
Erin Power 446856c426 Adjust CLI output 2020-06-16 01:01:44 +02:00
Arie van Luttikhuizen bf1bc3b1c6
Remove duplicate keys from languages.json (#561) 2020-06-15 21:08:28 +02:00
dependabot-preview[bot] e12fa02b17 Bump serde from 1.0.111 to 1.0.112
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.111 to 1.0.112.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.111...v1.0.112)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-15 05:05:10 +00:00
Erin Power 9147523b4e fmt 2020-06-14 10:56:47 +02:00
Erin Power 9068a72622 Implement literate languages and context parsing for markdown 2020-06-14 10:46:56 +02:00
Erin Power 85ed72849a Update lock 2020-06-13 12:32:24 +02:00
dependabot-preview[bot] 0209975c64 Bump serde_json from 1.0.54 to 1.0.55
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.54 to 1.0.55.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.54...v1.0.55)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-11 05:27:38 +00:00
yuki yano c9949fe10f
Fixed the language name Vim Script to Vim script (#555) 2020-06-11 04:57:18 +02:00
Erin Power fe6a06a0e3 fmt 2020-06-10 17:04:50 +02:00
Erin Power c6ef1d9988 Refactor parse_lines, add literate support and continue working on contexts 2020-06-10 17:04:34 +02:00
Erin Power 7eee4cbea1 move test file 2020-06-10 17:04:34 +02:00
dependabot-preview[bot] cb5c207fd7 Bump serde_json from 1.0.53 to 1.0.54
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.53 to 1.0.54.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.53...v1.0.54)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-10 06:19:19 +00:00
dependabot-preview[bot] 4fe366d79c Bump tera from 1.3.0 to 1.3.1
Bumps [tera](https://github.com/Keats/tera) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/Keats/tera/releases)
- [Changelog](https://github.com/Keats/tera/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Keats/tera/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-10 05:05:36 +00:00
Erin Power 860b53d63c clean up some code 2020-06-03 11:58:01 +02:00
Erin Power f7867930cd fmt 2020-06-03 11:35:28 +02:00
Erin Power 1283f0a4ce Move parser from using Stats to CodeStats where appropiate 2020-06-03 11:08:57 +02:00
dependabot-preview[bot] 6d042978ee Bump dashmap from 3.11.3 to 3.11.4
Bumps [dashmap](https://github.com/xacrimon/dashmap) from 3.11.3 to 3.11.4.
- [Release notes](https://github.com/xacrimon/dashmap/releases)
- [Commits](https://github.com/xacrimon/dashmap/compare/v3.11.3...v3.11.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-03 05:08:39 +00:00
jmesheridan 82781e3cdb
Add support for q/k languages (#549) 2020-06-02 14:05:14 +02:00
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