phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure CPD uses tab width of 1 for tabs consistently

Browse Source 
The columns that are reported by CPD were inconsistent across languages
before. A language like Java (using a JavaCC-based tokenizer) would use
a width of 8 for tabs, whereas a language like C# (using an Antlr-based
tokenizer) would use 1 instead.

This includes unit tests for most languages to ensure a tab character is
counted as 1. The configuration for JavaCC has been adjusted to respect
this as well.
This commit is contained in:
Maikel Steneker
2020-07-20 10:42:21 +02:00
parent 25405eb870
commit 6fb5ac59b9
45 changed files with 724 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
View File

@ -63,4 +63,9 @@ public class EcmascriptTokenizerTest extends CpdTextComparisonTest {
public void testTemplateStrings() {
doTest("templateStrings");
}
@Test
public void testTabWidth() {
doTest("tabWidth");
}
}

7
pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/cpd/testdata/tabWidth.js vendored Normal file
View File

@ -0,0 +1,7 @@
function switchToRealPassword() {
var real = $('realPass')
var prompt = $('promptPass')
real.style.display = 'inline'
prompt.style.display = 'none'
real.focus()
}

48
pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/cpd/testdata/tabWidth.txt vendored Normal file
View File

@ -0,0 +1,48 @@
[Image] or [Truncated image[ Bcol Ecol
L1
[function] 1 8
[switchToRealPassword] 10 29
[(] 30 30
[)] 31 31
[{] 33 33
L2
[var] 2 4
[real] 6 9
[=] 11 11
[$] 13 13
[(] 14 14
['realPass'] 15 24
[)] 25 25
L3
[var] 2 4
[prompt] 6 11
[=] 13 13
[$] 15 15
[(] 16 16
['promptPass'] 17 28
[)] 29 29
L4
[real] 2 5
[.] 6 6
[style] 7 11
[.] 12 12
[display] 13 19
[=] 21 21
['inline'] 23 30
L5
[prompt] 2 7
[.] 8 8
[style] 9 13
[.] 14 14
[display] 15 21
[=] 23 23
['none'] 25 30
L6
[real] 2 5
[.] 6 6
[focus] 7 11
[(] 12 12
[)] 13 13
L7
[}] 1 1
EOF