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

[scala] Cleanup InternalApi methods

Browse Source 
Refs #4348
This commit is contained in:
Andreas Dangel 2024-02-01 10:37:11 +01:00
parent 8285d70fe5
commit d1c3212ea7
No known key found for this signature in database
GPG Key ID: 93450DF2DF9A3FA3
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/pages/release_notes.md
View File

@ -211,6 +211,9 @@ package or made (package) private and are not accessible anymore.
* {%jdoc modelica::resolver.internal.Watchdog %} (note: not previously marked as internal api)
* pmd-plsql
* {%jdoc plsql::rule.design.AbstractNcssCountRule (now package private)
* pmd-scala
* {%jdoc scala::ScalaLanguageModule %}
* The method `dialectOf(LanguageVersion)` has been removed
**Newly internal classes, interfaces and methods**

4
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
View File

@ -11,7 +11,7 @@ import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.document.TextDocument;
import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
import net.sourceforge.pmd.lang.scala.internal.ScalaDialect;
import scala.collection.Iterator;
import scala.meta.Dialect;
@ -33,7 +33,7 @@ public class ScalaTokenizer implements Tokenizer {
*/
public ScalaTokenizer(LanguagePropertyBundle bundle) {
LanguageVersion langVer = bundle.getLanguageVersion();
dialect = ScalaLanguageModule.dialectOf(langVer);
dialect = ScalaDialect.dialectOf(langVer);
}
@Override

18
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java
View File

@ -4,18 +4,12 @@
package net.sourceforge.pmd.lang.scala;
import org.checkerframework.checker.nullness.qual.NonNull;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.cpd.ScalaTokenizer;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
import scala.meta.Dialect;
/**
* Language Module for Scala.
*/
@ -39,18 +33,6 @@ public class ScalaLanguageModule extends SimpleLanguageModuleBase {
return (ScalaLanguageModule) LanguageRegistry.PMD.getLanguageById(ID);
}
@InternalApi
public static @NonNull Dialect dialectOf(LanguageVersion v) {
switch (v.getVersion()) {
case "2.10": return scala.meta.dialects.package$.MODULE$.Scala210();
case "2.11": return scala.meta.dialects.package$.MODULE$.Scala211();
case "2.12": return scala.meta.dialects.package$.MODULE$.Scala212();
case "2.13": return scala.meta.dialects.package$.MODULE$.Scala213();
default:
throw new IllegalArgumentException(v.getVersion());
}
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new ScalaTokenizer(bundle);

4
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParser.java
View File

@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.scala.ast;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.ast.Parser;
import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
import net.sourceforge.pmd.lang.scala.internal.ScalaDialect;
import scala.meta.Dialect;
import scala.meta.Source;
@ -23,7 +23,7 @@ public final class ScalaParser implements Parser {
@Override
public ASTSource parse(ParserTask task) throws ParseException {
Input.VirtualFile virtualFile = new Input.VirtualFile(task.getFileId().getAbsolutePath(), task.getSourceText());
Dialect dialect = ScalaLanguageModule.dialectOf(task.getLanguageVersion());
Dialect dialect = ScalaDialect.dialectOf(task.getLanguageVersion());
Source src = new ScalametaParser(virtualFile, dialect).parseSource();
ASTSource root = (ASTSource) new ScalaTreeBuilder().build(src);
root.addTaskInfo(task);

26
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/internal/ScalaDialect.java Normal file
View File

@ -0,0 +1,26 @@
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.scala.internal;
import org.checkerframework.checker.nullness.qual.NonNull;
import net.sourceforge.pmd.lang.LanguageVersion;
import scala.meta.Dialect;
public final class ScalaDialect {
private ScalaDialect() {}
public static @NonNull Dialect dialectOf(LanguageVersion v) {
switch (v.getVersion()) {
case "2.10": return scala.meta.dialects.package$.MODULE$.Scala210();
case "2.11": return scala.meta.dialects.package$.MODULE$.Scala211();
case "2.12": return scala.meta.dialects.package$.MODULE$.Scala212();
case "2.13": return scala.meta.dialects.package$.MODULE$.Scala213();
default:
throw new IllegalArgumentException(v.getVersion());
}
}
}