Просмотр исходного кода

Implement suggestions of SonarCloud

Robin Maisch 4 лет назад
Родитель
Сommit
0aa68f9727

+ 5 - 3
jplag.frontend.kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java

@@ -12,12 +12,14 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import de.jplag.AbstractParser;
 import de.jplag.ErrorConsumer;
+import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 import de.jplag.kotlin.grammar.KotlinLexer;
 import de.jplag.kotlin.grammar.KotlinParser;
 
 public class KotlinParserAdapter extends AbstractParser {
 
+    public static final int NOT_SET = -1;
     private String currentFile;
     private TokenList tokens;
 
@@ -41,7 +43,7 @@ public class KotlinParserAdapter extends AbstractParser {
             if (!parseFile(directory, file)) {
                 errors++;
             }
-            tokens.addToken(new KotlinToken(KotlinTokenConstants.FILE_END, file, -1, -1, -1));
+            tokens.addToken(new KotlinToken(TokenConstants.FILE_END, file, NOT_SET, NOT_SET, NOT_SET));
         }
         return tokens;
     }
@@ -52,8 +54,8 @@ public class KotlinParserAdapter extends AbstractParser {
             currentFile = fileName;
 
             KotlinLexer lexer = new KotlinLexer(CharStreams.fromStream(inputStream));
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            KotlinParser parser = new KotlinParser(tokens);
+            CommonTokenStream tokenStream = new CommonTokenStream(lexer);
+            KotlinParser parser = new KotlinParser(tokenStream);
 
             ParserRuleContext entryContext = parser.kotlinFile();
             ParseTreeWalker treeWalker = new ParseTreeWalker();

+ 4 - 4
jplag.frontend.kotlin/src/main/java/de/jplag/kotlin/Language.java

@@ -7,10 +7,10 @@ import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 
-    public static final String NAME = "Kotlin Parser";
-    public static final String SHORT_NAME = "Kotlin";
-    public static final int DEFAULT_MIN_TOKEN_MATCH = 8;
-    public static final String[] FILE_EXTENSIONS = {".kt"};
+    private static final String NAME = "Kotlin Parser";
+    private static final String SHORT_NAME = "Kotlin";
+    private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
+    private static final String[] FILE_EXTENSIONS = {".kt"};
     private final KotlinParserAdapter parserAdapter;
 
     public Language(ErrorConsumer consumer) {

+ 1 - 1
jplag.frontend.kotlin/src/test/java/de/jplag/kotlin/KotlinFrontendTest.java

@@ -23,7 +23,7 @@ import de.jplag.TokenList;
 import de.jplag.TokenPrinter;
 import de.jplag.testutils.TestErrorConsumer;
 
-public class KotlinFrontendTest {
+class KotlinFrontendTest {
 
     /**
      * Test source file that is supposed to produce a complete set of tokens, i.e. all types of tokens.

+ 5 - 5
jplag/src/test/java/de/jplag/special/TokenPrinterTest.java

@@ -28,7 +28,7 @@ public class TokenPrinterTest extends TestBase {
 
     @Disabled
     @Test
-    public void printCPPFiles() {
+    void printCPPFiles() {
         printSubmissions(options -> {
             options.setLanguageOption(LanguageOption.C_CPP);
             options.setMinimumTokenMatch(MIN_TOKEN_MATCH); // for printing also allow small files
@@ -37,7 +37,7 @@ public class TokenPrinterTest extends TestBase {
 
     @Disabled
     @Test
-    public void printJavaFiles() {
+    void printJavaFiles() {
         printSubmissions(options -> {
             options.setMinimumTokenMatch(MIN_TOKEN_MATCH); // for printing also allow small files
         });
@@ -45,16 +45,16 @@ public class TokenPrinterTest extends TestBase {
 
     @Disabled
     @Test
-    public void printRLangFiles() {
+    void printRLangFiles() {
         printSubmissions(options -> {
             options.setLanguageOption(LanguageOption.R_LANG);
             options.setMinimumTokenMatch(MIN_TOKEN_MATCH); // for printing also allow small files
         });
     }
 
-    @Disabled
+    @Disabled("Not a meaningful test, used for designing the token set")
     @Test
-    public void printKotlinFiles() {
+    void printKotlinFiles() {
         printSubmissions(options -> options.setLanguageOption(LanguageOption.KOTLIN));
     }