From 53b2b4f2012a06814c1c89eaf73ef5f0d0ed9f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 17 Jan 2020 14:01:20 +0100
Subject: [PATCH] Definitely fix swift impl

---
 pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java | 4 ++--
 .../pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java       | 2 +-
 .../main/antlr4/net/sourceforge/pmd/lang/swift/ast/Swift.g4   | 2 +-
 pmd-swift/src/main/resources/category/swift/bestpractices.xml | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index eba4927ad6..41908ff0d6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -67,7 +67,7 @@ public interface Node {
      */
     @Deprecated
     default void jjtOpen() {
-
+        // do nothing
     }
 
 
@@ -78,7 +78,7 @@ public interface Node {
      */
     @Deprecated
     default void jjtClose() {
-
+        // do nothing
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
index 3cbdf275a9..720d1db0db 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
@@ -27,7 +27,7 @@ public class AntlrRuleChainVisitor extends AbstractRuleChainVisitor {
     @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         for (final Node node : nodes) {
-           indexSubtree(node);
+            indexSubtree(node);
         }
     }
 
diff --git a/pmd-swift/src/main/antlr4/net/sourceforge/pmd/lang/swift/ast/Swift.g4 b/pmd-swift/src/main/antlr4/net/sourceforge/pmd/lang/swift/ast/Swift.g4
index df2f5a3b8b..62747999f4 100644
--- a/pmd-swift/src/main/antlr4/net/sourceforge/pmd/lang/swift/ast/Swift.g4
+++ b/pmd-swift/src/main/antlr4/net/sourceforge/pmd/lang/swift/ast/Swift.g4
@@ -55,7 +55,7 @@ import net.sourceforge.pmd.lang.ast.impl.antlr4.*;
 
 options {
     contextSuperClass = AntlrBaseNode;
-    superClass = PmdBaseAntlrParser;
+    superClass = PmdAntlrParserBase;
 }
 
 topLevel : statements? EOF ;
diff --git a/pmd-swift/src/main/resources/category/swift/bestpractices.xml b/pmd-swift/src/main/resources/category/swift/bestpractices.xml
index 31aa7bd1e7..4dbc5672c5 100644
--- a/pmd-swift/src/main/resources/category/swift/bestpractices.xml
+++ b/pmd-swift/src/main/resources/category/swift/bestpractices.xml
@@ -11,6 +11,7 @@ Rules which enforce generally accepted best practices.
 
     <rule name="ProhibitedInterfaceBuilder"
           since="7.0"
+          language="swift"
           message="Creating views using Interface Builder should be avoided."
           class="net.sourceforge.pmd.lang.swift.rule.bestpractices.ProhibitedInterfaceBuilderRule"
           externalInfoUrl="http://pmd.github.io/pmd/pmd_rules_swift_bestpractices.html#prohibitedinterfacebuilder">
@@ -36,6 +37,7 @@ class ViewController: UIViewController {
 
     <rule name="UnavailableFunction"
           since="7.0"
+          language="swift"
           message="Unimplemented functions should be marked as unavailable."
           class="net.sourceforge.pmd.lang.swift.rule.bestpractices.UnavailableFunctionRule"
           externalInfoUrl="http://pmd.github.io/pmd/pmd_rules_swift_bestpractices.html#unavailablefunction">