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

Merge branch 'master' into pmd/7.0.x

Browse Source
This commit is contained in:
Andreas Dangel
2020-09-13 11:39:37 +02:00
parent 9cfe485888 7a1e3caba0
commit 3caa6dd0ba
8 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/_plugins/javadoc_tag.rb
View File

@ -239,7 +239,8 @@ class JavadocTag < Liquid::Tag
src_dirs = [
File.join(artifact_dir, "src", "main", "java"),
File.join(artifact_dir, "target", "generated-sources", "javacc")
File.join(artifact_dir, "target", "generated-sources", "javacc"),
File.join(artifact_dir, "target", "generated-sources", "antlr4")
].select {|dir| File.exist?(dir)}
targets = src_dirs

6
docs/_plugins/jdoc_namespace_tag.rb
View File

@ -99,8 +99,10 @@ class JDocNamespaceDeclaration < Liquid::Tag
private
JDOC_NAMESPACE_MAP = "jdoc_nspaces"
RESERVED_NSPACES = ['apex', 'core', 'cpp', 'cs', 'dist', 'doc', 'fortran', 'go', 'groovy', 'java', 'javascript', 'jsp',
'kotlin', 'matlab', 'objectivec', 'perl', 'php', 'plsql', 'python', 'ruby', 'scala', 'swift', 'test', 'ui',
RESERVED_NSPACES = ['apex', 'core', 'cpp', 'cs', 'dart', 'dist', 'doc', 'fortran', 'go', 'groovy', 'java',
'javascript', 'jsp',
'kotlin', 'lua', 'matlab', 'objectivec', 'perl', 'php', 'plsql', 'python', 'ruby', 'scala', 'swift',
'test', 'ui',
'modelica', 'visualforce', 'vm', 'xml'].flat_map {|m| [m, "pmd-" + m]}
def self.make_base_namespaces

10
docs/pages/release_notes.md
View File

@ -55,6 +55,16 @@ AbstractTokenizer and the custom tokenizers of Fortran, Perl and Ruby are deprec
* {% jdoc !!ruby::cpd.RubyTokenizer %}. Was replaced by an {% jdoc core::cpd.AnyTokenizer %}. Use {% jdoc !!ruby::cpd.RubyLanguage#getTokenizer() %} anyway.
* {% jdoc !!core::lang.rule.RuleReference#getOverriddenLanguage() %} and
{% jdoc !!core::lang.rule.RuleReference#setLanguage(net.sourceforge.pmd.lang.Language) %}
* Antlr4 generated lexers:
* {% jdoc !!cs::lang.cs.antlr4.CSharpLexer %} will be moved to package `net.sourceforge.pmd.lang.cs.ast` with PMD 7.
* {% jdoc !!dart::lang.dart.antlr4.Dart2Lexer %} will be renamed to `DartLexer` and moved to package
`net.sourceforge.pmd.lang.dart.ast` with PMD 7. All other classes in the old package will be removed.
* {% jdoc !!go::lang.go.antlr4.GolangLexer %} will be moved to package
`net.sourceforge.pmd.lang.go.ast` with PMD 7. All other classes in the old package will be removed.
* {% jdoc !!kotlin::lang.kotlin.antlr4.Kotlin %} will be renamed to `KotlinLexer` and moved to package
`net.sourceforge.pmd.lang.kotlin.ast` with PMD 7.
* {% jdoc !!lua::lang.lua.antlr4.LuaLexer %} will be moved to package
`net.sourceforge.pmd.lang.lua.ast` with PMD 7. All other classes in the old package will be removed.
### External Contributions

9
pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java Normal file
View File

@ -0,0 +1,9 @@
/*
* 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;

11
pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java Normal file
View File

@ -0,0 +1,11 @@
/*
* 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.
*
* <p>All other classes will be removed.
*/
package net.sourceforge.pmd.lang.dart.antlr4;

11
pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java Normal file
View File

@ -0,0 +1,11 @@
/*
* 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.
*
* <p>All other classes will be removed.
*/
package net.sourceforge.pmd.lang.go.antlr4;

9
pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java Normal file
View File

@ -0,0 +1,9 @@
/*
* 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;

11
pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java Normal file
View File

@ -0,0 +1,11 @@
/*
* 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.
*
* <p>All other classes will be removed.
*/
package net.sourceforge.pmd.lang.lua.antlr4;