Merge branch 'master' into pmd/7.0.x

pmd-kotlin/src/test/java/net/sourceforge/pmd/cpd/KotlinTokenizerTest.java

@@ -40,4 +40,9 @@ public class KotlinTokenizerTest extends CpdTextComparisonTest {
     public void testImportsIgnored() {
         doTest("imports");
     }
+
+    @Test
+    public void testTabWidth() {
+        doTest("tabWidth");
+    }
 }

pmd-kotlin/src/test/resources/net/sourceforge/pmd/lang/kotlin/cpd/testdata/tabWidth.kt

@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+var x = 0
+
+fun increment() {
+// CHECKSTYLE:OFF  - the tab character is the test...
+	x += 1
+// CHECKSTYLE:ON
+}

pmd-kotlin/src/test/resources/net/sourceforge/pmd/lang/kotlin/cpd/testdata/tabWidth.txt

@@ -0,0 +1,19 @@
+    [Image] or [Truncated image[            Bcol      Ecol
+L5
+    [var]                                   1         3
+    [x]                                     5         5
+    [=]                                     7         7
+    [0]                                     9         9
+L7
+    [fun]                                   1         3
+    [increment]                             5         13
+    [(]                                     14        14
+    [)]                                     15        15
+    [{]                                     17        17
+L9
+    [x]                                     2         2
+    [+=]                                    4         5
+    [1]                                     7         7
+L11
+    [}]                                     1         1
+EOF