From 70faa3379897f29f83fe71554c5423b90a1ffe8c Mon Sep 17 00:00:00 2001 From: volodya-lombrozo Date: Fri, 10 Jan 2025 16:20:25 +0300 Subject: [PATCH] feat(#3744): fix some code offences --- .../java/org/eolang/parser/XeEoListener.java | 25 +++++++++++-------- .../java/org/eolang/parser/EoSyntaxTest.java | 1 - 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java b/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java index 65a472e84b..4df4fdc00b 100644 --- a/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java +++ b/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java @@ -1268,7 +1268,7 @@ private static String trimMargin(final String text, final int indent) { * Create parsing exception from given context. * @param ctx Context * @param msg Error message - * @return Parsing exception from current context + * @return Parsing exception from the current context */ private static ParsingException error(final ParserRuleContext ctx, final String msg) { return new ParsingException( @@ -1286,23 +1286,28 @@ private static ParsingException error(final ParserRuleContext ctx, final String ); } - private static ParsingException error(final TerminalNode ctx, final String msg) { + /** + * Create parsing exception from given terminal node. + * @param terminal Terminal node + * @param msg Error message + * @return Parsing exception from the current terminal node + */ + private static ParsingException error(final TerminalNode terminal, final String msg) { return new ParsingException( - ctx.getSymbol().getLine(), + terminal.getSymbol().getLine(), new MsgLocated( - ctx.getSymbol().getLine(), - ctx.getSymbol().getCharPositionInLine(), + terminal.getSymbol().getLine(), + terminal.getSymbol().getCharPositionInLine(), msg ).formatted(), new MsgUnderlined( - XeEoListener.line(ctx.getSymbol()), - ctx.getSymbol().getCharPositionInLine(), - ctx.getText().length() + XeEoListener.line(terminal.getSymbol()), + terminal.getSymbol().getCharPositionInLine(), + terminal.getText().length() ).formatted() ); } - /** * Get line from context. * @param ctx Context @@ -1313,7 +1318,7 @@ private static String line(final ParserRuleContext ctx) { } /** - * Get line from context. + * Get line from token. * @param token Token * @return Line */ diff --git a/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java b/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java index 6a89ea0258..9d5288501c 100644 --- a/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java +++ b/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Set; -import java.util.stream.Collectors; import org.cactoos.io.InputOf; import org.cactoos.io.ResourceOf; import org.cactoos.iterable.Mapped;