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

Lint

Browse Source
This commit is contained in:
Clément Fournier
2023-04-29 19:45:09 +02:00
parent b297538721
commit 72740a8151
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java
View File

@ -65,9 +65,9 @@ public final class LanguageRegistry implements Iterable<Language> {
*/ */
public LanguageRegistry(Set<? extends Language> languages) { public LanguageRegistry(Set<? extends Language> languages) {
this.languages = languages.stream() this.languages = languages.stream()
.sorted(Comparator.comparing(Language::getTerseName, String::compareToIgnoreCase)) .sorted(Comparator.comparing(Language::getId, String::compareToIgnoreCase))
.collect(CollectionUtil.toUnmodifiableSet()); .collect(CollectionUtil.toUnmodifiableSet());
this.languagesById = CollectionUtil.associateBy(languages, Language::getTerseName); this.languagesById = CollectionUtil.associateBy(languages, Language::getId);
this.languagesByFullName = CollectionUtil.associateBy(languages, Language::getName); this.languagesByFullName = CollectionUtil.associateBy(languages, Language::getName);
} }
@ -129,7 +129,7 @@ public final class LanguageRegistry implements Iterable<Language> {
public static @NonNull LanguageRegistry loadLanguages(ClassLoader classLoader) { public static @NonNull LanguageRegistry loadLanguages(ClassLoader classLoader) {
// sort languages by terse name. Avoiding differences in the order of languages // sort languages by terse name. Avoiding differences in the order of languages
// across JVM versions / OS. // across JVM versions / OS.
Set<Language> languages = new TreeSet<>(Comparator.comparing(Language::getTerseName, String::compareToIgnoreCase)); Set<Language> languages = new TreeSet<>(Comparator.comparing(Language::getId, String::compareToIgnoreCase));
ServiceLoader<Language> languageLoader = ServiceLoader.load(Language.class, classLoader); ServiceLoader<Language> languageLoader = ServiceLoader.load(Language.class, classLoader);
Iterator<Language> iterator = languageLoader.iterator(); Iterator<Language> iterator = languageLoader.iterator();
while (true) { while (true) {

1
pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
View File

@ -13,7 +13,6 @@ import net.sourceforge.pmd.lang.LanguageProcessor;
import net.sourceforge.pmd.lang.LanguageProcessorRegistry; import net.sourceforge.pmd.lang.LanguageProcessorRegistry;
import net.sourceforge.pmd.lang.ast.Parser.ParserTask; import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
import net.sourceforge.pmd.lang.ast.SemanticErrorReporter; import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
import net.sourceforge.pmd.lang.document.FileId;
import net.sourceforge.pmd.lang.document.TextDocument; import net.sourceforge.pmd.lang.document.TextDocument;
import net.sourceforge.pmd.lang.html.HtmlLanguageModule; import net.sourceforge.pmd.lang.html.HtmlLanguageModule;

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

@ -10,9 +10,7 @@ import net.sourceforge.pmd.cpd.token.internal.BaseTokenFilter;
import net.sourceforge.pmd.lang.LanguagePropertyBundle; import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
import net.sourceforge.pmd.lang.document.TextDocument; import net.sourceforge.pmd.lang.document.TextDocument;
import net.sourceforge.pmd.lang.document.TextFile;
import net.sourceforge.pmd.lang.scala.ScalaLanguageModule; import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
import scala.collection.Iterator; import scala.collection.Iterator;