mirror of https://github.com/XAMPPRocky/tokei
Added better blank detection
This commit is contained in:
Erin Power
parent
0595bd3f94
commit
9974f017e8
|
|
@ -1284,7 +1284,7 @@
|
|||
},
|
||||
"Zig": {
|
||||
"line_comment": ["//"],
|
||||
"quotes": [["\\\"", "\\\""], ["\\\\", "\n"]],
|
||||
"quotes": [["\\\"", "\\\""]],
|
||||
"extensions": ["zig"]
|
||||
},
|
||||
"Zsh": {
|
||||
|
|
|
|||
|
|
@ -84,30 +84,29 @@ impl LanguageType {
|
|||
let lines = LineIter::new(b'\n', skippable_text);
|
||||
let is_fortran = syntax.shared.is_fortran;
|
||||
let comments = syntax.shared.line_comments;
|
||||
let parse_lines = move || self.parse_lines(config, LineIter::new(b'\n', rest), stats, syntax);
|
||||
let simple_parse = move || {
|
||||
lines
|
||||
.par_bridge()
|
||||
.map(|line| {
|
||||
// FORTRAN has a rule where it only counts as a comment if it's the
|
||||
// first character in the column, so removing starting whitespace
|
||||
// could cause a miscount.
|
||||
let line = if is_fortran { line } else { line.trim() };
|
||||
trace!("{}", String::from_utf8_lossy(line));
|
||||
|
||||
let (mut stats, (code, comments, blanks)) = rayon::join(
|
||||
move || self.parse_lines(config, LineIter::new(b'\n', rest), stats, syntax),
|
||||
move || {
|
||||
lines
|
||||
.par_bridge()
|
||||
.map(|line| {
|
||||
// FORTRAN has a rule where it only counts as a comment if it's the
|
||||
// first character in the column, so removing starting whitespace
|
||||
// could cause a miscount.
|
||||
let line = if is_fortran { line } else { line.trim() };
|
||||
trace!("{}", String::from_utf8_lossy(line));
|
||||
if line.trim().is_empty() {
|
||||
(0, 0, 1)
|
||||
} else if comments.iter().any(|c| line.starts_with(c.as_bytes())) {
|
||||
(0, 1, 0)
|
||||
} else {
|
||||
(1, 0, 0)
|
||||
}
|
||||
})
|
||||
.reduce(|| (0, 0, 0), |a, b| (a.0 + b.0, a.1 + b.1, a.2 + b.2))
|
||||
};
|
||||
|
||||
if line.trim().is_empty() {
|
||||
(0, 0, 1)
|
||||
} else if comments.iter().any(|c| line.starts_with(c.as_bytes())) {
|
||||
(0, 1, 0)
|
||||
} else {
|
||||
(1, 0, 0)
|
||||
}
|
||||
})
|
||||
.reduce(|| (0, 0, 0), |a, b| (a.0 + b.0, a.1 + b.1, a.2 + b.2))
|
||||
},
|
||||
);
|
||||
let (mut stats, (code, comments, blanks)) = rayon::join(parse_lines, simple_parse);
|
||||
|
||||
stats.code += code;
|
||||
stats.comments += comments;
|
||||
|
|
@ -138,27 +137,29 @@ impl LanguageType {
|
|||
};
|
||||
trace!("{}", String::from_utf8_lossy(line));
|
||||
|
||||
if line.trim().is_empty() {
|
||||
stats.blanks += 1;
|
||||
trace!("Blank No.{}", stats.blanks);
|
||||
continue;
|
||||
} else if syntax.is_plain_mode() && !syntax.shared.important_syntax.is_match(line) {
|
||||
trace!("^ Skippable");
|
||||
if syntax.is_plain_mode() {
|
||||
if line.trim().is_empty() {
|
||||
stats.blanks += 1;
|
||||
trace!("Blank No.{}", stats.blanks);
|
||||
continue;
|
||||
} else if !syntax.shared.important_syntax.is_match(line) {
|
||||
trace!("^ Skippable");
|
||||
|
||||
if syntax
|
||||
.shared
|
||||
.line_comments
|
||||
.iter()
|
||||
.any(|c| line.starts_with(c.as_bytes()))
|
||||
{
|
||||
stats.comments += 1;
|
||||
trace!("Comment No.{}", stats.comments);
|
||||
} else {
|
||||
stats.code += 1;
|
||||
trace!("Code No.{}", stats.code);
|
||||
if syntax
|
||||
.shared
|
||||
.line_comments
|
||||
.iter()
|
||||
.any(|c| line.starts_with(c.as_bytes()))
|
||||
{
|
||||
stats.comments += 1;
|
||||
trace!("Comment No.{}", stats.comments);
|
||||
} else {
|
||||
stats.code += 1;
|
||||
trace!("Code No.{}", stats.code);
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
let had_multi_line = !syntax.stack.is_empty();
|
||||
|
|
@ -219,7 +220,7 @@ impl LanguageType {
|
|||
// with one.
|
||||
syntax.quote.is_some() ||
|
||||
syntax.shared.doc_quotes.iter().any(|(s, _)| line.starts_with(s.as_bytes()))
|
||||
) &&
|
||||
) &&
|
||||
// `Some(true)` is import in order to respect the current
|
||||
// configuration.
|
||||
config.treat_doc_strings_as_comments == Some(true) &&
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 26 lines 14 code 7 comments 5 blanks
|
||||
// 26 lines 14 code 9 comments 3 blanks
|
||||
namespace Ns
|
||||
{
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
💭 24 lines 9 code 10 comments 5 blanks
|
||||
💭 24 lines 10 code 10 comments 4 blanks
|
||||
|
||||
📘
|
||||
This package is neat.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- 46 lines 23 code 15 comments 8 blanks -->
|
||||
<!-- 46 lines 23 code 19 comments 4 blanks -->
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 33 lines, 14 code, 11 comments, 8 blanks
|
||||
// 33 lines, 14 code, 12 comments, 7 blanks
|
||||
|
||||
/*
|
||||
* /* Nested comment
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Test file for the Logtalk programming language
|
||||
(copied by the author from a Logtalk distribution example)
|
||||
|
||||
65 lines 27 code 17 comments 21 blanks
|
||||
65 lines 27 code 18 comments 20 blanks
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- 41 lines 15 code 14 comments 12 blanks -->
|
||||
<!-- 41 lines 15 code 21 comments 5 blanks -->
|
||||
<script>
|
||||
/*
|
||||
Javascript multi-line
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 33 lines, 19 code, 7 comments, 7 blanks
|
||||
// 33 lines, 20 code, 10 comments, 3 blanks
|
||||
/*
|
||||
|
||||
Multi-line comment with blanks
|
||||
|
|
|
|||
Loading…
Reference in New Issue