refactor

runtime-testsuite/test/org/antlr/v4/runtime/TestSuggestionHelper.java

@@ -54,7 +54,7 @@ void matchesExpectation(Path expectations) throws Exception {
 		lexer.setTokenFactory(CommonTokenWithStatesFactory.DEFAULT);
 		TokenStream stream = new CommonTokenStream(lexer);
 		JavaParser parser = new JavaParser(stream);
-		parser.setStateListener(new TokenStateRecorder(stream));
+		parser.setStateListener(new TokenStatesRecorder(stream));
 		RuleContext context = parser.compilationUnit();
 		Pair<RuleContext, IntervalSet> contextsAndIntervals = parser.getExpectedTokensAt(context, expectation.line, expectation.column);
 		Set<String> actual = contextsAndIntervals.b.toSet().stream()

runtime/Java/src/org/antlr/v4/runtime/TokenStateRecorder.java → runtime/Java/src/org/antlr/v4/runtime/TokenStatesRecorder.java

@@ -6,10 +6,10 @@
 /* we take advantage of the fact that each successful match is followed by a setState(int state) */
 /* however there may be numerous setState following a match, so we only register the first state change */
 
-public class TokenStateRecorder implements StateListener {
+public class TokenStatesRecorder implements StateListener {
 
 	final TokenStream _tokenStream;
-	public TokenStateRecorder(TokenStream tokenStream) {
+	public TokenStatesRecorder(TokenStream tokenStream) {
 		this._tokenStream = tokenStream;
 	}