Merge branch '7.0.x' into port-properties

This commit is contained in:
Clément Fournier
2023-03-14 21:07:35 +01:00
137 changed files with 3266 additions and 1563 deletions

View File

@ -6,22 +6,15 @@ package net.sourceforge.pmd.cpd;
import java.util.Properties;
import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule;
/**
*
* @author Stuart Turton sturton@users.sourceforge.net
*/
public class PLSQLLanguage extends AbstractLanguage {
public PLSQLLanguage() {
super("PL/SQL", "plsql", new PLSQLTokenizer(),
".sql",
".trg", // Triggers
".prc", ".fnc", // Standalone Procedures and Functions
".pld", // Oracle*Forms
".pls", ".plh", ".plb", // Packages
".pck", ".pks", ".pkh", ".pkb", // Packages
".typ", ".tyb", // Object Types
".tps", ".tpb" // Object Types
);
super(PLSQLLanguageModule.NAME, PLSQLLanguageModule.TERSE_NAME, new PLSQLTokenizer(), PLSQLLanguageModule.EXTENSIONS);
}
@Override

View File

@ -4,6 +4,11 @@
package net.sourceforge.pmd.lang.plsql;
import static net.sourceforge.pmd.util.CollectionUtil.listOf;
import java.util.List;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
/**
@ -13,21 +18,29 @@ public class PLSQLLanguageModule extends SimpleLanguageModuleBase {
public static final String NAME = "PLSQL";
public static final String TERSE_NAME = "plsql";
@InternalApi
public static final List<String> EXTENSIONS = listOf(
"sql",
"trg", // Triggers
"prc", "fnc", // Standalone Procedures and Functions
"pld", // Oracle*Forms
"pls", "plh", "plb", // Packages
"pck", "pks", "pkh", "pkb", // Packages
"typ", "tyb", // Object Types
"tps", "tpb" // Object Types
);
public PLSQLLanguageModule() {
super(
LanguageMetadata.withId(TERSE_NAME)
.name(NAME)
.extensions(
"sql",
"trg", // Triggers
"prc", "fnc", // Standalone Procedures and Functions
"pld", // Oracle*Forms
"pls", "plh", "plb", // Packages
"pck", "pks", "pkh", "pkb", // Packages
"typ", "tyb", // Object Types
"tps", "tpb" // Object Types
),
.extensions(EXTENSIONS)
.addVersion("11g")
.addVersion("12c_Release_1", "12.1")
.addVersion("12c_Release_2", "12.2")
.addVersion("18c")
.addVersion("19c")
.addDefaultVersion("21c"),
new PLSQLHandler()
);
}

View File

@ -12,7 +12,7 @@ import net.sourceforge.pmd.AbstractLanguageVersionTest;
class LanguageVersionTest extends AbstractLanguageVersionTest {
static Collection<TestDescriptor> data() {
return Arrays.asList(new TestDescriptor(PLSQLLanguageModule.NAME, PLSQLLanguageModule.TERSE_NAME, "",
return Arrays.asList(new TestDescriptor(PLSQLLanguageModule.NAME, PLSQLLanguageModule.TERSE_NAME, "21c",
getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion()));
}
}