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

Merge pull request #668 from jplag/clean-up-imports

Clean-up import declarations
Timur Sağlam 4 лет назад
Родитель
Сommit
03a867cb52

+ 2 - 1
cli/src/test/java/de/jplag/cli/MinTokenMatchTest.java

@@ -1,7 +1,8 @@
 package de.jplag.cli;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.catchSystemExit;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 

+ 10 - 2
core/src/main/java/de/jplag/strategy/ParallelComparisonStrategy.java

@@ -3,14 +3,22 @@ package de.jplag.strategy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.jplag.*;
+import de.jplag.GreedyStringTiling;
+import de.jplag.JPlagComparison;
+import de.jplag.JPlagResult;
+import de.jplag.Submission;
+import de.jplag.SubmissionSet;
 import de.jplag.options.JPlagOptions;
 
 /**

+ 3 - 1
core/src/test/java/de/jplag/InvalidSubmissionTest.java

@@ -1,6 +1,8 @@
 package de.jplag;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.nio.file.Path;

+ 1 - 1
core/src/test/java/de/jplag/reporting/reportobject/mapper/MetricMapperTest.java

@@ -1,6 +1,6 @@
 package de.jplag.reporting.reportobject.mapper;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 

+ 7 - 1
language-api/src/main/java/de/jplag/LanguageLoader.java

@@ -1,6 +1,12 @@
 package de.jplag;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 62 - 1
languages/csharp/src/main/java/de/jplag/csharp/CSharpListener.java

@@ -1,6 +1,67 @@
 package de.jplag.csharp;
 
-import static de.jplag.csharp.CSharpTokenType.*;
+import static de.jplag.csharp.CSharpTokenType.ACCESSORS_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.ACCESSORS_END;
+import static de.jplag.csharp.CSharpTokenType.ACCESSOR_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.ACCESSOR_END;
+import static de.jplag.csharp.CSharpTokenType.ARRAY_CREATION;
+import static de.jplag.csharp.CSharpTokenType.ASSIGNMENT;
+import static de.jplag.csharp.CSharpTokenType.ATTRIBUTE;
+import static de.jplag.csharp.CSharpTokenType.BREAK;
+import static de.jplag.csharp.CSharpTokenType.CASE;
+import static de.jplag.csharp.CSharpTokenType.CATCH;
+import static de.jplag.csharp.CSharpTokenType.CHECKED;
+import static de.jplag.csharp.CSharpTokenType.CLASS;
+import static de.jplag.csharp.CSharpTokenType.CLASS_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.CLASS_END;
+import static de.jplag.csharp.CSharpTokenType.CONSTANT;
+import static de.jplag.csharp.CSharpTokenType.CONSTRUCTOR;
+import static de.jplag.csharp.CSharpTokenType.CONTINUE;
+import static de.jplag.csharp.CSharpTokenType.DELEGATE;
+import static de.jplag.csharp.CSharpTokenType.DESTRUCTOR;
+import static de.jplag.csharp.CSharpTokenType.DO;
+import static de.jplag.csharp.CSharpTokenType.ENUM;
+import static de.jplag.csharp.CSharpTokenType.ENUMERAL;
+import static de.jplag.csharp.CSharpTokenType.ENUM_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.ENUM_END;
+import static de.jplag.csharp.CSharpTokenType.EVENT;
+import static de.jplag.csharp.CSharpTokenType.FIELD;
+import static de.jplag.csharp.CSharpTokenType.FINALLY;
+import static de.jplag.csharp.CSharpTokenType.FIXED;
+import static de.jplag.csharp.CSharpTokenType.FOR;
+import static de.jplag.csharp.CSharpTokenType.FOREACH;
+import static de.jplag.csharp.CSharpTokenType.GOTO;
+import static de.jplag.csharp.CSharpTokenType.IF;
+import static de.jplag.csharp.CSharpTokenType.IF_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.IF_END;
+import static de.jplag.csharp.CSharpTokenType.INDEXER;
+import static de.jplag.csharp.CSharpTokenType.INTERFACE;
+import static de.jplag.csharp.CSharpTokenType.INTERFACE_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.INTERFACE_END;
+import static de.jplag.csharp.CSharpTokenType.INVOCATION;
+import static de.jplag.csharp.CSharpTokenType.LOCAL_VARIABLE;
+import static de.jplag.csharp.CSharpTokenType.LOCK;
+import static de.jplag.csharp.CSharpTokenType.METHOD;
+import static de.jplag.csharp.CSharpTokenType.METHOD_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.METHOD_END;
+import static de.jplag.csharp.CSharpTokenType.NAMESPACE_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.NAMESPACE_END;
+import static de.jplag.csharp.CSharpTokenType.OBJECT_CREATION;
+import static de.jplag.csharp.CSharpTokenType.OPERATOR;
+import static de.jplag.csharp.CSharpTokenType.PROPERTY;
+import static de.jplag.csharp.CSharpTokenType.RETURN;
+import static de.jplag.csharp.CSharpTokenType.STRUCT;
+import static de.jplag.csharp.CSharpTokenType.STRUCT_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.STRUCT_END;
+import static de.jplag.csharp.CSharpTokenType.SWITCH_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.SWITCH_END;
+import static de.jplag.csharp.CSharpTokenType.THROW;
+import static de.jplag.csharp.CSharpTokenType.TRY;
+import static de.jplag.csharp.CSharpTokenType.UNCHECKED;
+import static de.jplag.csharp.CSharpTokenType.UNSAFE;
+import static de.jplag.csharp.CSharpTokenType.USING;
+import static de.jplag.csharp.CSharpTokenType.USING_DIRECTIVE;
+import static de.jplag.csharp.CSharpTokenType.WHILE;
 
 import org.antlr.v4.runtime.Token;
 

+ 20 - 1
languages/csharp/src/test/java/de/jplag/csharp/MinimalCSharpTest.java

@@ -1,6 +1,25 @@
 package de.jplag.csharp;
 
-import static de.jplag.csharp.CSharpTokenType.*;
+import static de.jplag.csharp.CSharpTokenType.ACCESSORS_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.ACCESSORS_END;
+import static de.jplag.csharp.CSharpTokenType.ACCESSOR_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.ACCESSOR_END;
+import static de.jplag.csharp.CSharpTokenType.ASSIGNMENT;
+import static de.jplag.csharp.CSharpTokenType.CLASS;
+import static de.jplag.csharp.CSharpTokenType.CLASS_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.CLASS_END;
+import static de.jplag.csharp.CSharpTokenType.CONSTRUCTOR;
+import static de.jplag.csharp.CSharpTokenType.FIELD;
+import static de.jplag.csharp.CSharpTokenType.IF;
+import static de.jplag.csharp.CSharpTokenType.IF_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.IF_END;
+import static de.jplag.csharp.CSharpTokenType.INVOCATION;
+import static de.jplag.csharp.CSharpTokenType.LOCAL_VARIABLE;
+import static de.jplag.csharp.CSharpTokenType.METHOD;
+import static de.jplag.csharp.CSharpTokenType.METHOD_BEGIN;
+import static de.jplag.csharp.CSharpTokenType.METHOD_END;
+import static de.jplag.csharp.CSharpTokenType.PROPERTY;
+import static de.jplag.csharp.CSharpTokenType.RETURN;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

+ 19 - 1
languages/emf-metamodel/src/main/java/de/jplag/emf/parser/MetamodelTokenGenerator.java

@@ -1,6 +1,24 @@
 package de.jplag.emf.parser;
 
-import static de.jplag.emf.MetamodelTokenType.*;
+import static de.jplag.emf.MetamodelTokenType.ABSTRACT_CLASS;
+import static de.jplag.emf.MetamodelTokenType.ANNOTATION;
+import static de.jplag.emf.MetamodelTokenType.ATTRIBUTE;
+import static de.jplag.emf.MetamodelTokenType.BOUND;
+import static de.jplag.emf.MetamodelTokenType.CLASS;
+import static de.jplag.emf.MetamodelTokenType.CONTAINMENT;
+import static de.jplag.emf.MetamodelTokenType.DATATYPE;
+import static de.jplag.emf.MetamodelTokenType.ENUM;
+import static de.jplag.emf.MetamodelTokenType.ENUM_LITERAL;
+import static de.jplag.emf.MetamodelTokenType.ID_ATTRIBUTE;
+import static de.jplag.emf.MetamodelTokenType.INTERFACE;
+import static de.jplag.emf.MetamodelTokenType.OPERATION;
+import static de.jplag.emf.MetamodelTokenType.PACKAGE;
+import static de.jplag.emf.MetamodelTokenType.PARAMETER;
+import static de.jplag.emf.MetamodelTokenType.REFERENCE;
+import static de.jplag.emf.MetamodelTokenType.RETURN_TYPE;
+import static de.jplag.emf.MetamodelTokenType.SUPER_TYPE;
+import static de.jplag.emf.MetamodelTokenType.THROWS_DECLARATION;
+import static de.jplag.emf.MetamodelTokenType.TYPE_PARAMETER;
 
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EAttribute;

+ 54 - 1
languages/kotlin/src/main/java/de/jplag/kotlin/JPlagKotlinListener.java

@@ -1,6 +1,59 @@
 package de.jplag.kotlin;
 
-import static de.jplag.kotlin.KotlinTokenType.*;
+import static de.jplag.kotlin.KotlinTokenType.ASSIGNMENT;
+import static de.jplag.kotlin.KotlinTokenType.BREAK;
+import static de.jplag.kotlin.KotlinTokenType.CATCH;
+import static de.jplag.kotlin.KotlinTokenType.CATCH_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.CATCH_BODY_START;
+import static de.jplag.kotlin.KotlinTokenType.CLASS_BODY_BEGIN;
+import static de.jplag.kotlin.KotlinTokenType.CLASS_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.CLASS_DECLARATION;
+import static de.jplag.kotlin.KotlinTokenType.COMPANION_DECLARATION;
+import static de.jplag.kotlin.KotlinTokenType.CONSTRUCTOR;
+import static de.jplag.kotlin.KotlinTokenType.CONTINUE;
+import static de.jplag.kotlin.KotlinTokenType.CONTROL_STRUCTURE_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.CONTROL_STRUCTURE_BODY_START;
+import static de.jplag.kotlin.KotlinTokenType.CREATE_OBJECT;
+import static de.jplag.kotlin.KotlinTokenType.DO_WHILE_EXPRESSION_END;
+import static de.jplag.kotlin.KotlinTokenType.DO_WHILE_EXPRESSION_START;
+import static de.jplag.kotlin.KotlinTokenType.ENUM_CLASS_BODY_BEGIN;
+import static de.jplag.kotlin.KotlinTokenType.ENUM_CLASS_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.ENUM_ENTRY;
+import static de.jplag.kotlin.KotlinTokenType.FINALLY;
+import static de.jplag.kotlin.KotlinTokenType.FINALLY_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.FINALLY_BODY_START;
+import static de.jplag.kotlin.KotlinTokenType.FOR_EXPRESSION_BEGIN;
+import static de.jplag.kotlin.KotlinTokenType.FOR_EXPRESSION_END;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_BODY_BEGIN;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_INVOCATION;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_LITERAL_BEGIN;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_LITERAL_END;
+import static de.jplag.kotlin.KotlinTokenType.FUNCTION_PARAMETER;
+import static de.jplag.kotlin.KotlinTokenType.GETTER;
+import static de.jplag.kotlin.KotlinTokenType.IF_EXPRESSION_END;
+import static de.jplag.kotlin.KotlinTokenType.IF_EXPRESSION_START;
+import static de.jplag.kotlin.KotlinTokenType.IMPORT;
+import static de.jplag.kotlin.KotlinTokenType.INITIALIZER;
+import static de.jplag.kotlin.KotlinTokenType.INITIALIZER_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.INITIALIZER_BODY_START;
+import static de.jplag.kotlin.KotlinTokenType.OBJECT_DECLARATION;
+import static de.jplag.kotlin.KotlinTokenType.PACKAGE;
+import static de.jplag.kotlin.KotlinTokenType.PROPERTY_DECLARATION;
+import static de.jplag.kotlin.KotlinTokenType.RETURN;
+import static de.jplag.kotlin.KotlinTokenType.SETTER;
+import static de.jplag.kotlin.KotlinTokenType.THROW;
+import static de.jplag.kotlin.KotlinTokenType.TRY_BODY_END;
+import static de.jplag.kotlin.KotlinTokenType.TRY_BODY_START;
+import static de.jplag.kotlin.KotlinTokenType.TRY_EXPRESSION;
+import static de.jplag.kotlin.KotlinTokenType.TYPE_PARAMETER;
+import static de.jplag.kotlin.KotlinTokenType.VARIABLE_DECLARATION;
+import static de.jplag.kotlin.KotlinTokenType.WHEN_CONDITION;
+import static de.jplag.kotlin.KotlinTokenType.WHEN_EXPRESSION_END;
+import static de.jplag.kotlin.KotlinTokenType.WHEN_EXPRESSION_START;
+import static de.jplag.kotlin.KotlinTokenType.WHILE_EXPRESSION_END;
+import static de.jplag.kotlin.KotlinTokenType.WHILE_EXPRESSION_START;
 
 import java.util.Optional;
 

+ 30 - 1
languages/python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java

@@ -1,6 +1,35 @@
 package de.jplag.python3;
 
-import static de.jplag.python3.Python3TokenType.*;
+import static de.jplag.python3.Python3TokenType.APPLY;
+import static de.jplag.python3.Python3TokenType.ARRAY;
+import static de.jplag.python3.Python3TokenType.ASSERT;
+import static de.jplag.python3.Python3TokenType.ASSIGN;
+import static de.jplag.python3.Python3TokenType.BREAK;
+import static de.jplag.python3.Python3TokenType.CLASS_BEGIN;
+import static de.jplag.python3.Python3TokenType.CLASS_END;
+import static de.jplag.python3.Python3TokenType.CONTINUE;
+import static de.jplag.python3.Python3TokenType.DEC_BEGIN;
+import static de.jplag.python3.Python3TokenType.DEC_END;
+import static de.jplag.python3.Python3TokenType.DEL;
+import static de.jplag.python3.Python3TokenType.EXCEPT_BEGIN;
+import static de.jplag.python3.Python3TokenType.EXCEPT_END;
+import static de.jplag.python3.Python3TokenType.FINALLY;
+import static de.jplag.python3.Python3TokenType.FOR_BEGIN;
+import static de.jplag.python3.Python3TokenType.FOR_END;
+import static de.jplag.python3.Python3TokenType.IF_BEGIN;
+import static de.jplag.python3.Python3TokenType.IF_END;
+import static de.jplag.python3.Python3TokenType.IMPORT;
+import static de.jplag.python3.Python3TokenType.LAMBDA;
+import static de.jplag.python3.Python3TokenType.METHOD_BEGIN;
+import static de.jplag.python3.Python3TokenType.METHOD_END;
+import static de.jplag.python3.Python3TokenType.RAISE;
+import static de.jplag.python3.Python3TokenType.RETURN;
+import static de.jplag.python3.Python3TokenType.TRY_BEGIN;
+import static de.jplag.python3.Python3TokenType.WHILE_BEGIN;
+import static de.jplag.python3.Python3TokenType.WHILE_END;
+import static de.jplag.python3.Python3TokenType.WITH_BEGIN;
+import static de.jplag.python3.Python3TokenType.WITH_END;
+import static de.jplag.python3.Python3TokenType.YIELD;
 
 import org.antlr.v4.runtime.tree.TerminalNode;
 

+ 25 - 2
languages/rlang/src/main/java/de/jplag/rlang/JPlagRListener.java

@@ -1,10 +1,33 @@
 package de.jplag.rlang;
 
-import static de.jplag.rlang.RTokenType.*;
+import static de.jplag.rlang.RTokenType.ASSIGN;
+import static de.jplag.rlang.RTokenType.ASSIGN_FUNC;
+import static de.jplag.rlang.RTokenType.ASSIGN_LIST;
+import static de.jplag.rlang.RTokenType.BEGIN_FUNCTION;
+import static de.jplag.rlang.RTokenType.BOOL;
+import static de.jplag.rlang.RTokenType.BREAK;
+import static de.jplag.rlang.RTokenType.COMPOUND_BEGIN;
+import static de.jplag.rlang.RTokenType.COMPOUND_END;
+import static de.jplag.rlang.RTokenType.END_FUNCTION;
+import static de.jplag.rlang.RTokenType.FOR_BEGIN;
+import static de.jplag.rlang.RTokenType.FOR_END;
+import static de.jplag.rlang.RTokenType.FUNCTION_CALL;
+import static de.jplag.rlang.RTokenType.HELP;
+import static de.jplag.rlang.RTokenType.IF_BEGIN;
+import static de.jplag.rlang.RTokenType.IF_END;
+import static de.jplag.rlang.RTokenType.INDEX;
+import static de.jplag.rlang.RTokenType.NEXT;
+import static de.jplag.rlang.RTokenType.NUMBER;
+import static de.jplag.rlang.RTokenType.PACKAGE;
+import static de.jplag.rlang.RTokenType.REPEAT_BEGIN;
+import static de.jplag.rlang.RTokenType.REPEAT_END;
+import static de.jplag.rlang.RTokenType.STRING;
+import static de.jplag.rlang.RTokenType.WHILE_BEGIN;
+import static de.jplag.rlang.RTokenType.WHILE_END;
 
 import org.antlr.v4.runtime.Token;
 
-import de.jplag.rlang.grammar.*;
+import de.jplag.rlang.grammar.RParser;
 
 /**
  * Listener class for visiting the R ANTLR parse tree. Transforms the visited ANTLR token into JPlag tokens. Based on an

+ 4 - 1
languages/rlang/src/main/java/de/jplag/rlang/RCombinedBaseListener.java

@@ -4,7 +4,10 @@ import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import de.jplag.rlang.grammar.*;
+import de.jplag.rlang.grammar.RFilter;
+import de.jplag.rlang.grammar.RFilterListener;
+import de.jplag.rlang.grammar.RListener;
+import de.jplag.rlang.grammar.RParser;
 
 /**
  * Empty base implementation for {@link RListener} and {@link RFilterListener}.

+ 2 - 1
languages/rlang/src/test/java/de/jplag/rlang/RLanguageTest.java

@@ -4,7 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;

+ 86 - 2
languages/rust/src/main/java/de/jplag/rust/JPlagRustListener.java

@@ -1,6 +1,87 @@
 package de.jplag.rust;
 
-import static de.jplag.rust.RustTokenType.*;
+import static de.jplag.rust.RustTokenType.APPLY;
+import static de.jplag.rust.RustTokenType.ARGUMENT;
+import static de.jplag.rust.RustTokenType.ARRAY_BODY_END;
+import static de.jplag.rust.RustTokenType.ARRAY_BODY_START;
+import static de.jplag.rust.RustTokenType.ARRAY_ELEMENT;
+import static de.jplag.rust.RustTokenType.ASSIGNMENT;
+import static de.jplag.rust.RustTokenType.BREAK;
+import static de.jplag.rust.RustTokenType.CLOSURE;
+import static de.jplag.rust.RustTokenType.CLOSURE_BODY_END;
+import static de.jplag.rust.RustTokenType.CLOSURE_BODY_START;
+import static de.jplag.rust.RustTokenType.ELSE_BODY_END;
+import static de.jplag.rust.RustTokenType.ELSE_BODY_START;
+import static de.jplag.rust.RustTokenType.ELSE_STATEMENT;
+import static de.jplag.rust.RustTokenType.ENUM;
+import static de.jplag.rust.RustTokenType.ENUM_BODY_END;
+import static de.jplag.rust.RustTokenType.ENUM_BODY_START;
+import static de.jplag.rust.RustTokenType.ENUM_ITEM;
+import static de.jplag.rust.RustTokenType.EXTERN_BLOCK;
+import static de.jplag.rust.RustTokenType.EXTERN_BLOCK_END;
+import static de.jplag.rust.RustTokenType.EXTERN_BLOCK_START;
+import static de.jplag.rust.RustTokenType.EXTERN_CRATE;
+import static de.jplag.rust.RustTokenType.FOR_BODY_END;
+import static de.jplag.rust.RustTokenType.FOR_BODY_START;
+import static de.jplag.rust.RustTokenType.FOR_STATEMENT;
+import static de.jplag.rust.RustTokenType.FUNCTION;
+import static de.jplag.rust.RustTokenType.FUNCTION_BODY_END;
+import static de.jplag.rust.RustTokenType.FUNCTION_BODY_START;
+import static de.jplag.rust.RustTokenType.FUNCTION_PARAMETER;
+import static de.jplag.rust.RustTokenType.IF_BODY_END;
+import static de.jplag.rust.RustTokenType.IF_BODY_START;
+import static de.jplag.rust.RustTokenType.IF_STATEMENT;
+import static de.jplag.rust.RustTokenType.IMPLEMENTATION;
+import static de.jplag.rust.RustTokenType.IMPLEMENTATION_BODY_END;
+import static de.jplag.rust.RustTokenType.IMPLEMENTATION_BODY_START;
+import static de.jplag.rust.RustTokenType.INNER_ATTRIBUTE;
+import static de.jplag.rust.RustTokenType.INNER_BLOCK_END;
+import static de.jplag.rust.RustTokenType.INNER_BLOCK_START;
+import static de.jplag.rust.RustTokenType.LABEL;
+import static de.jplag.rust.RustTokenType.LOOP_BODY_END;
+import static de.jplag.rust.RustTokenType.LOOP_BODY_START;
+import static de.jplag.rust.RustTokenType.LOOP_STATEMENT;
+import static de.jplag.rust.RustTokenType.MACRO_INVOCATION;
+import static de.jplag.rust.RustTokenType.MACRO_INVOCATION_BODY_END;
+import static de.jplag.rust.RustTokenType.MACRO_INVOCATION_BODY_START;
+import static de.jplag.rust.RustTokenType.MACRO_RULE;
+import static de.jplag.rust.RustTokenType.MACRO_RULES_DEFINITION;
+import static de.jplag.rust.RustTokenType.MACRO_RULES_DEFINITION_BODY_END;
+import static de.jplag.rust.RustTokenType.MACRO_RULES_DEFINITION_BODY_START;
+import static de.jplag.rust.RustTokenType.MACRO_RULE_BODY_END;
+import static de.jplag.rust.RustTokenType.MACRO_RULE_BODY_START;
+import static de.jplag.rust.RustTokenType.MATCH_BODY_END;
+import static de.jplag.rust.RustTokenType.MATCH_BODY_START;
+import static de.jplag.rust.RustTokenType.MATCH_CASE;
+import static de.jplag.rust.RustTokenType.MATCH_EXPRESSION;
+import static de.jplag.rust.RustTokenType.MATCH_GUARD;
+import static de.jplag.rust.RustTokenType.MODULE;
+import static de.jplag.rust.RustTokenType.MODULE_END;
+import static de.jplag.rust.RustTokenType.MODULE_START;
+import static de.jplag.rust.RustTokenType.OUTER_ATTRIBUTE;
+import static de.jplag.rust.RustTokenType.RETURN;
+import static de.jplag.rust.RustTokenType.STATIC_ITEM;
+import static de.jplag.rust.RustTokenType.STRUCT;
+import static de.jplag.rust.RustTokenType.STRUCT_BODY_END;
+import static de.jplag.rust.RustTokenType.STRUCT_BODY_START;
+import static de.jplag.rust.RustTokenType.STRUCT_FIELD;
+import static de.jplag.rust.RustTokenType.STRUCT_INITIALISATION;
+import static de.jplag.rust.RustTokenType.TRAIT;
+import static de.jplag.rust.RustTokenType.TRAIT_BODY_END;
+import static de.jplag.rust.RustTokenType.TRAIT_BODY_START;
+import static de.jplag.rust.RustTokenType.TUPLE;
+import static de.jplag.rust.RustTokenType.TUPLE_ELEMENT;
+import static de.jplag.rust.RustTokenType.TUPLE_END;
+import static de.jplag.rust.RustTokenType.TUPLE_START;
+import static de.jplag.rust.RustTokenType.TYPE_ALIAS;
+import static de.jplag.rust.RustTokenType.TYPE_ARGUMENT;
+import static de.jplag.rust.RustTokenType.TYPE_PARAMETER;
+import static de.jplag.rust.RustTokenType.UNION;
+import static de.jplag.rust.RustTokenType.UNION_BODY_END;
+import static de.jplag.rust.RustTokenType.UNION_BODY_START;
+import static de.jplag.rust.RustTokenType.USE_DECLARATION;
+import static de.jplag.rust.RustTokenType.USE_ITEM;
+import static de.jplag.rust.RustTokenType.VARIABLE_DECLARATION;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -8,7 +89,10 @@ import java.util.Optional;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
 import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.*;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.antlr.v4.runtime.tree.TerminalNodeImpl;
 
 import de.jplag.rust.grammar.RustParser;
 import de.jplag.rust.grammar.RustParserBaseListener;

+ 4 - 1
languages/rust/src/main/java/de/jplag/rust/grammar/RustLexerBase.java

@@ -3,7 +3,10 @@ package de.jplag.rust.grammar;
 import java.util.Arrays;
 import java.util.List;
 
-import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.IntStream;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Token;
 
 public abstract class RustLexerBase extends Lexer {
     private Token currentToken;

+ 2 - 1
languages/rust/src/main/java/de/jplag/rust/grammar/RustParserBase.java

@@ -1,6 +1,7 @@
 package de.jplag.rust.grammar;
 
-import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.TokenStream;
 
 public abstract class RustParserBase extends Parser {
     protected RustParserBase(TokenStream input) {