From 40443326d3a6657efdb5b4bd6e168bf95fc78d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 18:50:01 +0200 Subject: [PATCH 1/7] Add cleanup phase for antlr CPD languages This removes the parser and other things we don't need in the API Currently only pmd-dart has been adapted --- antlr4-wrapper.xml | 13 +++++++++++- pmd-dart/pom.xml | 21 +++++++++++++++++++ .../dart/{antlr4/Dart2.g4 => ast/Dart.g4} | 2 +- .../sourceforge/pmd/cpd/DartTokenizer.java | 12 +++++------ pmd-swift/pom.xml | 2 +- 5 files changed, 41 insertions(+), 9 deletions(-) rename pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/{antlr4/Dart2.g4 => ast/Dart.g4} (99%) diff --git a/antlr4-wrapper.xml b/antlr4-wrapper.xml index f6a221708b..410ef976e4 100644 --- a/antlr4-wrapper.xml +++ b/antlr4-wrapper.xml @@ -34,7 +34,18 @@ - + + + + + + + + + + + + diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index 16f7c1e41d..3a75d27a4a 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -17,6 +17,27 @@ org.antlr antlr4-maven-plugin + + org.apache.maven.plugins + maven-antrun-plugin + + + antlr-cleanup + generate-sources + + run + + + + + + + + + + + + maven-resources-plugin diff --git a/pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/antlr4/Dart2.g4 b/pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/ast/Dart.g4 similarity index 99% rename from pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/antlr4/Dart2.g4 rename to pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/ast/Dart.g4 index 03f3ed0169..be3d39ee05 100644 --- a/pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/antlr4/Dart2.g4 +++ b/pmd-dart/src/main/antlr4/net/sourceforge/pmd/lang/dart/ast/Dart.g4 @@ -26,7 +26,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -grammar Dart2; +grammar Dart; compilationUnit: libraryDefinition | partDeclaration; diff --git a/pmd-dart/src/main/java/net/sourceforge/pmd/cpd/DartTokenizer.java b/pmd-dart/src/main/java/net/sourceforge/pmd/cpd/DartTokenizer.java index a4c17dce43..751c853b4e 100644 --- a/pmd-dart/src/main/java/net/sourceforge/pmd/cpd/DartTokenizer.java +++ b/pmd-dart/src/main/java/net/sourceforge/pmd/cpd/DartTokenizer.java @@ -10,7 +10,7 @@ import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; -import net.sourceforge.pmd.lang.dart.antlr4.Dart2Lexer; +import net.sourceforge.pmd.lang.dart.ast.DartLexer; /** * The Dart Tokenizer @@ -20,7 +20,7 @@ public class DartTokenizer extends AntlrTokenizer { @Override protected AntlrTokenManager getLexerForSource(SourceCode sourceCode) { CharStream charStream = AntlrTokenizer.getCharStreamFromSourceCode(sourceCode); - return new AntlrTokenManager(new Dart2Lexer(charStream), sourceCode.getFileName()); + return new AntlrTokenManager(new DartLexer(charStream), sourceCode.getFileName()); } @Override @@ -54,19 +54,19 @@ public class DartTokenizer extends AntlrTokenizer { private void skipLibraryAndImport(final AntlrToken currentToken) { final int type = currentToken.getKind(); - if (type == Dart2Lexer.LIBRARY || type == Dart2Lexer.IMPORT) { + if (type == DartLexer.LIBRARY || type == DartLexer.IMPORT) { discardingLibraryAndImport = true; - } else if (discardingLibraryAndImport && (type == Dart2Lexer.SEMICOLON || type == Dart2Lexer.NEWLINE)) { + } else if (discardingLibraryAndImport && (type == DartLexer.SEMICOLON || type == DartLexer.NEWLINE)) { discardingLibraryAndImport = false; } } private void skipNewLines(final AntlrToken currentToken) { - discardingNL = currentToken.getKind() == Dart2Lexer.NEWLINE; + discardingNL = currentToken.getKind() == DartLexer.NEWLINE; } private void skipSemicolons(final AntlrToken currentToken) { - discardingSemicolon = currentToken.getKind() == Dart2Lexer.SEMICOLON; + discardingSemicolon = currentToken.getKind() == DartLexer.SEMICOLON; } @Override diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml index 8cd98a476d..378ed67bef 100644 --- a/pmd-swift/pom.xml +++ b/pmd-swift/pom.xml @@ -35,7 +35,7 @@ - + From 8620080b92e74759cc90115399cfe04591cdc204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 18:52:47 +0200 Subject: [PATCH 2/7] Same for Golang --- pmd-go/pom.xml | 21 +++++++++++++++++++ .../pmd/lang/go/{antlr4 => ast}/Golang.g4 | 0 .../net/sourceforge/pmd/cpd/GoTokenizer.java | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) rename pmd-go/src/main/antlr4/net/sourceforge/pmd/lang/go/{antlr4 => ast}/Golang.g4 (100%) diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml index af86f401ca..c0ce17de4e 100644 --- a/pmd-go/pom.xml +++ b/pmd-go/pom.xml @@ -17,6 +17,27 @@ org.antlr antlr4-maven-plugin + + org.apache.maven.plugins + maven-antrun-plugin + + + antlr-cleanup + generate-sources + + run + + + + + + + + + + + + maven-resources-plugin diff --git a/pmd-go/src/main/antlr4/net/sourceforge/pmd/lang/go/antlr4/Golang.g4 b/pmd-go/src/main/antlr4/net/sourceforge/pmd/lang/go/ast/Golang.g4 similarity index 100% rename from pmd-go/src/main/antlr4/net/sourceforge/pmd/lang/go/antlr4/Golang.g4 rename to pmd-go/src/main/antlr4/net/sourceforge/pmd/lang/go/ast/Golang.g4 diff --git a/pmd-go/src/main/java/net/sourceforge/pmd/cpd/GoTokenizer.java b/pmd-go/src/main/java/net/sourceforge/pmd/cpd/GoTokenizer.java index 1369c28a5e..138fe8ab6c 100644 --- a/pmd-go/src/main/java/net/sourceforge/pmd/cpd/GoTokenizer.java +++ b/pmd-go/src/main/java/net/sourceforge/pmd/cpd/GoTokenizer.java @@ -8,7 +8,7 @@ import org.antlr.v4.runtime.CharStream; import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; -import net.sourceforge.pmd.lang.go.antlr4.GolangLexer; +import net.sourceforge.pmd.lang.go.ast.GolangLexer; public class GoTokenizer extends AntlrTokenizer { From 1474ed6e7905f1aa17dfcab7e40ef93f1d8e9221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 18:54:42 +0200 Subject: [PATCH 3/7] Same for C# --- pmd-cs/pom.xml | 22 +++++++++++++++++++ .../lang/cs/{antlr4 => ast}/CSharpLexer.g4 | 0 .../net/sourceforge/pmd/cpd/CsTokenizer.java | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) rename pmd-cs/src/main/antlr4/net/sourceforge/pmd/lang/cs/{antlr4 => ast}/CSharpLexer.g4 (100%) diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml index 71710138f3..35e9ba91c2 100644 --- a/pmd-cs/pom.xml +++ b/pmd-cs/pom.xml @@ -17,6 +17,28 @@ org.antlr antlr4-maven-plugin + + org.apache.maven.plugins + maven-antrun-plugin + + + antlr-cleanup + generate-sources + + run + + + + + + + + + + + + + maven-resources-plugin diff --git a/pmd-cs/src/main/antlr4/net/sourceforge/pmd/lang/cs/antlr4/CSharpLexer.g4 b/pmd-cs/src/main/antlr4/net/sourceforge/pmd/lang/cs/ast/CSharpLexer.g4 similarity index 100% rename from pmd-cs/src/main/antlr4/net/sourceforge/pmd/lang/cs/antlr4/CSharpLexer.g4 rename to pmd-cs/src/main/antlr4/net/sourceforge/pmd/lang/cs/ast/CSharpLexer.g4 diff --git a/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java b/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java index f355d73502..ad86733beb 100644 --- a/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java +++ b/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java @@ -12,7 +12,7 @@ import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; -import net.sourceforge.pmd.lang.cs.antlr4.CSharpLexer; +import net.sourceforge.pmd.lang.cs.ast.CSharpLexer; /** * The C# tokenizer. From 9ef8c151e282eff3003f5b4a142bd6d106700ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 18:59:48 +0200 Subject: [PATCH 4/7] Same for kotlin --- pmd-kotlin/pom.xml | 21 +++++++++++++++++++ .../{antlr4/Kotlin.g4 => ast/KotlinLexer.g4} | 2 +- .../sourceforge/pmd/cpd/KotlinTokenizer.java | 10 ++++----- 3 files changed, 27 insertions(+), 6 deletions(-) rename pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/{antlr4/Kotlin.g4 => ast/KotlinLexer.g4} (99%) diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml index b1929c8c22..cc2edc2f2b 100644 --- a/pmd-kotlin/pom.xml +++ b/pmd-kotlin/pom.xml @@ -17,6 +17,27 @@ org.antlr antlr4-maven-plugin + + org.apache.maven.plugins + maven-antrun-plugin + + + antlr-cleanup + generate-sources + + run + + + + + + + + + + + + maven-resources-plugin diff --git a/pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/antlr4/Kotlin.g4 b/pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/ast/KotlinLexer.g4 similarity index 99% rename from pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/antlr4/Kotlin.g4 rename to pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/ast/KotlinLexer.g4 index dce0380786..c790e314f1 100644 --- a/pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/antlr4/Kotlin.g4 +++ b/pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/ast/KotlinLexer.g4 @@ -10,7 +10,7 @@ * https://github.com/JetBrains/kotlin/tree/master/compiler/testData/psi */ -lexer grammar Kotlin; +lexer grammar KotlinLexer; /** * Taken from http://www.antlr3.org/grammar/1345144569663/AntlrUnicode.txt diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/cpd/KotlinTokenizer.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/cpd/KotlinTokenizer.java index d44a5908fa..58a845701c 100644 --- a/pmd-kotlin/src/main/java/net/sourceforge/pmd/cpd/KotlinTokenizer.java +++ b/pmd-kotlin/src/main/java/net/sourceforge/pmd/cpd/KotlinTokenizer.java @@ -10,7 +10,7 @@ import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; -import net.sourceforge.pmd.lang.kotlin.antlr4.Kotlin; +import net.sourceforge.pmd.lang.kotlin.ast.KotlinLexer; /** * The Kotlin Tokenizer @@ -20,7 +20,7 @@ public class KotlinTokenizer extends AntlrTokenizer { @Override protected AntlrTokenManager getLexerForSource(SourceCode sourceCode) { CharStream charStream = AntlrTokenizer.getCharStreamFromSourceCode(sourceCode); - return new AntlrTokenManager(new Kotlin(charStream), sourceCode.getFileName()); + return new AntlrTokenManager(new KotlinLexer(charStream), sourceCode.getFileName()); } @Override @@ -52,15 +52,15 @@ public class KotlinTokenizer extends AntlrTokenizer { private void skipPackageAndImport(final AntlrToken currentToken) { final int type = currentToken.getKind(); - if (type == Kotlin.PACKAGE || type == Kotlin.IMPORT) { + if (type == KotlinLexer.PACKAGE || type == KotlinLexer.IMPORT) { discardingPackageAndImport = true; - } else if (discardingPackageAndImport && (type == Kotlin.SEMICOLON || type == Kotlin.NL)) { + } else if (discardingPackageAndImport && (type == KotlinLexer.SEMICOLON || type == KotlinLexer.NL)) { discardingPackageAndImport = false; } } private void skipNewLines(final AntlrToken currentToken) { - discardingNL = currentToken.getKind() == Kotlin.NL; + discardingNL = currentToken.getKind() == KotlinLexer.NL; } @Override From 50d39b39e699d5583ef45868e17b252b5d85bdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 19:01:07 +0200 Subject: [PATCH 5/7] Same for Lua --- pmd-lua/pom.xml | 21 +++++++++++++++++++ .../pmd/lang/lua/{antlr4 => ast}/Lua.g4 | 0 .../net/sourceforge/pmd/cpd/LuaTokenizer.java | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) rename pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/{antlr4 => ast}/Lua.g4 (100%) diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml index 638b019c50..921cd6335b 100644 --- a/pmd-lua/pom.xml +++ b/pmd-lua/pom.xml @@ -17,6 +17,27 @@ org.antlr antlr4-maven-plugin + + org.apache.maven.plugins + maven-antrun-plugin + + + antlr-cleanup + generate-sources + + run + + + + + + + + + + + + maven-resources-plugin diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/ast/Lua.g4 similarity index 100% rename from pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 rename to pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/ast/Lua.g4 diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java index effae4f797..0c18e5d6da 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java @@ -9,7 +9,7 @@ import org.antlr.v4.runtime.CharStream; import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; -import net.sourceforge.pmd.lang.lua.antlr4.LuaLexer; +import net.sourceforge.pmd.lang.lua.ast.LuaLexer; /** * The Lua Tokenizer From cbc81229ceb361c2fd88f74aec71ed364434c271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 30 Aug 2020 19:53:52 +0200 Subject: [PATCH 6/7] Update doc --- .../devdocs/major_contributions/adding_new_cpd_language.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/pages/pmd/devdocs/major_contributions/adding_new_cpd_language.md b/docs/pages/pmd/devdocs/major_contributions/adding_new_cpd_language.md index 4d518453ba..6dfaff6610 100644 --- a/docs/pages/pmd/devdocs/major_contributions/adding_new_cpd_language.md +++ b/docs/pages/pmd/devdocs/major_contributions/adding_new_cpd_language.md @@ -16,7 +16,7 @@ Happily for you, to add CPD support for a new language is now easier than ever! All you need to do is follow this few steps: -1. Create a new module for your language, you can take [GO as an example](https://github.com/pmd/pmd/tree/master/pmd-go) +1. Create a new module for your language, you can take [the Golang module](https://github.com/pmd/pmd/tree/master/pmd-go) as an example 2. Create a Tokenizer - For Antlr grammars you can take the grammar from [here](https://github.com/antlr/grammars-v4) and extend [AntlrTokenizer](https://github.com/pmd/pmd/blob/master/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java) taking Go as an example @@ -35,6 +35,8 @@ All you need to do is follow this few steps: - For JavaCC grammars you should subclass [JavaCCTokenizer](https://github.com/pmd/pmd/blob/master/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java) wich has many examples you could follow, you should also take the [Python implementation](https://github.com/pmd/pmd/blob/master/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java) as reference - For any other scenario you can use [AnyTokenizer](https://github.com/pmd/pmd/blob/master/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java) + If you're using Antlr or JavaCC, update the pom.xml of your submodule to use the appropriate ant wrapper. See `pmd-go/pom.xml` and `pmd-python/pom.xml` for examples. + 3. Create your [Language](https://github.com/pmd/pmd/blob/master/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java) class ```java @@ -132,4 +134,4 @@ public class DartTokenizerTest extends CpdTextComparisonTest { } } -``` \ No newline at end of file +``` From 47ab1f34a47265f786973c382efd1a7e04bd1020 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 13 Sep 2020 11:41:26 +0200 Subject: [PATCH 7/7] Delete old antlr4 package-infos --- .../sourceforge/pmd/lang/cs/antlr4/package-info.java | 9 --------- .../pmd/lang/dart/antlr4/package-info.java | 11 ----------- .../sourceforge/pmd/lang/go/antlr4/package-info.java | 11 ----------- .../pmd/lang/kotlin/antlr4/package-info.java | 9 --------- .../sourceforge/pmd/lang/lua/antlr4/package-info.java | 11 ----------- 5 files changed, 51 deletions(-) delete mode 100644 pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java delete mode 100644 pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java delete mode 100644 pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java delete mode 100644 pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java delete mode 100644 pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java diff --git a/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java b/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java deleted file mode 100644 index 8a31e36593..0000000000 --- a/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -/** - * The class {@link net.sourceforge.pmd.lang.cs.antlr4.CSharpLexer} will be moved to package - * {@code net.sourceforge.pmd.lang.cs.ast} with PMD 7. - */ -package net.sourceforge.pmd.lang.cs.antlr4; diff --git a/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java b/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java deleted file mode 100644 index a8f221ec2b..0000000000 --- a/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -/** - * The class {@link net.sourceforge.pmd.lang.dart.antlr4.Dart2Lexer} will be renamed to {@code DartLexter} and - * be moved to package {@code net.sourceforge.pmd.lang.dart.ast} with PMD 7. - * - *

All other classes will be removed. - */ -package net.sourceforge.pmd.lang.dart.antlr4; diff --git a/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java b/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java deleted file mode 100644 index cbadf9a799..0000000000 --- a/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -/** - * The class {@link net.sourceforge.pmd.lang.go.antlr4.GolangLexer} will be moved to - * package {@code net.sourceforge.pmd.lang.go.ast} with PMD 7. - * - *

All other classes will be removed. - */ -package net.sourceforge.pmd.lang.go.antlr4; diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java deleted file mode 100644 index 46869b9211..0000000000 --- a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -/** - * The class {@link net.sourceforge.pmd.lang.kotlin.antlr4.Kotlin} will be renamed to {@code KotlinLexer} and - * be moved to package {@code net.sourceforge.pmd.lang.kotlin.ast} with PMD 7. - */ -package net.sourceforge.pmd.lang.kotlin.antlr4; diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java b/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java deleted file mode 100644 index 54205d4814..0000000000 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -/** - * The class {@link net.sourceforge.pmd.lang.lua.antlr4.LuaLexer} will be moved to - * package {@code net.sourceforge.pmd.lang.lua.ast} with PMD 7. - * - *

All other classes will be removed. - */ -package net.sourceforge.pmd.lang.lua.antlr4;