From 55eabe2de1fdf2fb8b1cedc13c0b19f5ad9eaa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 27 Jan 2023 15:12:14 +0100 Subject: [PATCH] Add back named versions --- .../net/sourceforge/pmd/lang/apex/ApexLanguageModule.java | 5 ++++- .../net/sourceforge/pmd/lang/apex/LanguageVersionTest.java | 4 ++-- .../pmd/lang/ecmascript/EcmascriptLanguageModule.java | 3 ++- .../test/java/net/sourceforge/pmd/LanguageVersionTest.java | 2 +- .../sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java | 5 ++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java index fbc0072418..7b57934bd7 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java @@ -10,13 +10,16 @@ import net.sourceforge.pmd.lang.LanguageProcessor; import net.sourceforge.pmd.lang.LanguagePropertyBundle; import net.sourceforge.pmd.lang.LanguageRegistry; +import apex.jorje.services.Version; + public class ApexLanguageModule extends LanguageModuleBase { public static final String NAME = "Apex"; public static final String TERSE_NAME = "apex"; public ApexLanguageModule() { - super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("cls", "trigger")); + super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("cls", "trigger") + .addDefaultVersion(String.valueOf((int) Version.CURRENT.getExternal()))); } @Override diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java index 7f24d1c4e9..011ef5b8c3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java @@ -20,7 +20,7 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest { @Parameters public static Collection data() { - return Arrays.asList(new Object[][] { { ApexLanguageModule.NAME, ApexLanguageModule.TERSE_NAME, "", - getLanguage("Apex").getVersion(""), }, }); + return Arrays.asList(new Object[][] { { ApexLanguageModule.NAME, ApexLanguageModule.TERSE_NAME, "54", + getLanguage("Apex").getVersion("54"), }, }); } } diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java index ecdae5cfcc..e73a983d37 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java @@ -18,7 +18,8 @@ public class EcmascriptLanguageModule extends SimpleLanguageModuleBase { public static final String TERSE_NAME = "ecmascript"; public EcmascriptLanguageModule() { - super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("js"), + super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("js") + .addDefaultVersion("ES6"), properties -> () -> new EcmascriptParser(properties)); } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java index 83a7f8e484..5786dc0e26 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java @@ -21,7 +21,7 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest { @Parameters public static Collection data() { return Arrays.asList(new Object[][] { { EcmascriptLanguageModule.NAME, EcmascriptLanguageModule.TERSE_NAME, - "", + "ES6", getLanguage(EcmascriptLanguageModule.NAME).getDefaultVersion(), }, }); } } diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java index 5445394640..31e0d209d4 100644 --- a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java +++ b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java @@ -24,6 +24,9 @@ public class KotlinLanguageModule extends SimpleLanguageModuleBase { * Create a new instance of Kotlin Language Module. */ public KotlinLanguageModule() { - super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("kt", "ktm"), new KotlinHandler()); + super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("kt", "ktm") + .addDefaultVersion("1.6-rfc+0.1", "1.6"), + new KotlinHandler()); + } }