jborgers · jborgers · Jan 20, 2022 · Jan 20, 2022 · Sep 7, 2021 · Sep 8, 2021
diff --git a/.ci/build.sh b/.ci/build.sh
@@ -87,7 +87,7 @@ function build() {
     pmd_ci_log_group_end
 
     if pmd_ci_maven_isSnapshotBuild; then
-    if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" != "7.0.0-SNAPSHOT" ]; then
+    if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" != "7.0.0-kotlin-SNAPSHOT" ]; then
         pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}"
             ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false
             sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml

diff --git a/antlr4-wrapper.xml b/antlr4-wrapper.xml
@@ -31,9 +31,45 @@
     <property name="base-visitor-name" value="${lang-name}BaseVisitor"/>
     <property name="base-visitor-file" value="${target-package-dir}/${base-visitor-name}.java"/>
 
+    <property name="listener-name" value="${lang-name}Listener"/>
+    <property name="listener-file" value="${target-package-dir}/${visitor-name}.java"/>
+
+    <property name="base-listener-name" value="${lang-name}BaseListener"/>
+    <property name="base-listener-file" value="${target-package-dir}/${base-visitor-name}.java"/>
+
     <property name="node-itf-name" value="${lang-name}Node"/>
     <property name="base-class-name" value="Abstract${lang-name}Node"/>
 
+    <condition property="rename-parser">
+        <and>
+            <not>
+                <available file="${parser-file}"/>
+            </not>
+            <available file="${target-package-dir}/${lang-name}.java"/>
+        </and>
+    </condition>
+
+    <target name="rename-parser" description="Rename the parser to our conventional name if needed"
+            if="rename-parser">
+        <replace file="${target-package-dir}/${lang-name}.java">
+            <replacefilter token="class ${lang-name} "
+                           value="class ${parser-name} "/>
+            <replacefilter token="public ${lang-name}(TokenStream input)"
+                           value="public ${parser-name}(TokenStream input)"/>
+        </replace>
+        <replace dir="${target-package-dir}">
+            <include name="${lang-name}.java"/>
+            <include name="${visitor-name}.java"/>
+            <include name="${base-visitor-name}.java"/>
+            <include name="${listener-name}.java"/>
+            <include name="${base-listener-name}.java"/>
+            <replacefilter token="${lang-name}." value="${parser-name}."/>
+        </replace>
+
+        <move file="${target-package-dir}/${lang-name}.java"
+              tofile="${parser-file}"/>
+    </target>
+
     <target name="cpd-language" description="Adapt Antlr sources for CPD-only languages">
         <!-- We only need the Lexer file. -->
         <delete file="${parser-file}"/>
@@ -45,7 +81,7 @@
         </delete>
     </target>
 
-    <target name="pmd-language" description="Adapt Antlr sources for PMD languages">
+    <target name="pmd-language" description="Adapt Antlr sources for PMD languages" depends="rename-parser">
 
         <!-- Adapt parser. -->
         <replace file="${parser-file}">

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,8 +1,8 @@
 repository: pmd/pmd
 
 pmd:
-    version: 7.0.0-SNAPSHOT
-    previous_version: 6.42.0
+    version: 7.0.0-kotlin-SNAPSHOT
+    previous_version: 6.41.0
     date: ??-?????-2022
     release_type: major
 

diff --git a/docs/_data/xpath_funs.yml b/docs/_data/xpath_funs.yml
@@ -172,3 +172,32 @@ langs:
             outcome: "Matches calls to any method with 2 `int` parameters (!= argument)"
           - code: '//ConstructorCall[pmd-java:matchesSig("java.util.ArrayList#new(int)")]'
             outcome: "Matches constructors calls of ArrayList with a single int parameter"
+
+  - name: "Kotlin"
+    ns: "pmd-kotlin"
+    funs:
+      - name: hasChildren
+        returnType: "xs:boolean"
+        shortDescription: "Tests if a node has children"
+        description: "Returns true if the Node has children. This is for test purposes only."
+        parameters:
+          - name: "count"
+            type: "xs:decimal"
+            description: "The number of children."
+        examples:
+          - code: '//Identifier[pmd-kotlin:hasChildren(3)]'
+            outcome: "true or false"
+
+      - name: hasImport
+        returnType: "xs:boolean"
+        shortDescription: "Test for an import header"
+        description: "Returns true if the document has the specified package in the import header"
+        parameters:
+          - name: "package"
+            type: "xs:string"
+            description: "The fully qualified package name"
+        examples:
+          - code: '/KotlinFile[pmd-kotlin:hasImport('javax.xml.xpath')]'
+            outcome: "true or false"
+          - code: '//FunctionBody//T-Identifier[@Text='newXPath' and pmd-kotlin:hasImport('javax.xml.xpath')]'
+            outcome: "true or false"
diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.0-kotlin-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrInnerNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrInnerNode.java
@@ -88,6 +88,12 @@ protected TerminalNode getToken(int kind, int idx) {
         return pmdWrapper != null ? pmdWrapper.asAntlrNode() : null;
     }
 
+    protected List<TerminalNode> getTokens(int kind) {
+        return children(BaseAntlrTerminalNode.class)
+            .filter(it -> it.getTokenKind() == kind)
+            .toList(BaseAntlrTerminalNode::asAntlrNode);
+    }
+
     protected void copyFrom(BaseAntlrInnerNode<N> other) {
         asAntlrNode().copyFrom(other.asAntlrNode());
     }

diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
@@ -7,15 +7,29 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.0.0-kotlin-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
+    <properties>
+        <antlr4.visitor>true</antlr4.visitor>
+    </properties>
+
     <build>
+        <!-- needed for pmd sonar plugin -->
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
+                <configuration combine.self="override">
+                    <libDirectory>src/main/antlr4/net/sourceforge/pmd/lang/kotlin/ast</libDirectory>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -29,9 +43,11 @@
                         </goals>
                         <configuration>
                             <target>
-                                <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
+                                <ant antfile="${antlr4.ant.wrapper}" target="pmd-language">
                                     <property name="lang-name" value="Kotlin" />
                                     <property name="lang-terse-name" value="kotlin" />
+                                    <property name="root-node-name" value="File" />
+                                    <property name="node-prefix" value="Kt" />
                                 </ant>
                             </target>
                         </configuration>