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 063461feba..054dab26e5 100644 --- a/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java +++ b/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java @@ -58,7 +58,8 @@ "PMD.TooManyMethods", "PMD.AvoidDuplicateLiterals", "PMD.ExcessivePublicCount", - "PMD.ExcessiveClassLength" + "PMD.ExcessiveClassLength", + "PMD.GodClass" }) public final class XeEoListener implements EoListener, Iterable { /** @@ -184,7 +185,7 @@ public void enterMetas(final EoParser.MetasContext ctx) { for (final TerminalNode node : ctx.META()) { final String[] pair = node.getText().split(" ", 2); final String head = pair[0].substring(1); - if (head.equals(XeEoListener.TESTS_META)) { + if (XeEoListener.TESTS_META.equals(head)) { this.tests = true; } this.dirs.add("meta") @@ -241,49 +242,50 @@ public void exitCommentOptional(final EoParser.CommentOptionalContext ctx) { @Override public void enterCommentMandatory(final EoParser.CommentMandatoryContext ctx) { - if (!this.tests) { - final String comment = String.join( - "", - ctx.comment().COMMENTARY().getText().substring(1).trim(), - ctx.commentOptional().comment().stream().map( - context -> context.COMMENTARY().getText().substring(1).trim() - ).collect(Collectors.joining("")) - ); - final String length = String.format( - "Comment must be at least %d characters long", - XeEoListener.MIN_COMMENT_LENGTH - ); - final String warning = "warning"; - if (comment.isEmpty()) { + if(this.tests) { + return; + } + final String comment = String.join( + "", + ctx.comment().COMMENTARY().getText().substring(1).trim(), + ctx.commentOptional().comment().stream().map( + context -> context.COMMENTARY().getText().substring(1).trim() + ).collect(Collectors.joining("")) + ); + final String length = String.format( + "Comment must be at least %d characters long", + XeEoListener.MIN_COMMENT_LENGTH + ); + final String warning = "warning"; + if (comment.isEmpty()) { + this.addError(ctx, "comment-length-check", warning, length); + } else { + if (comment.length() < XeEoListener.MIN_COMMENT_LENGTH) { this.addError(ctx, "comment-length-check", warning, length); - } else { - if (comment.length() < XeEoListener.MIN_COMMENT_LENGTH) { - this.addError(ctx, "comment-length-check", warning, length); - } - if (comment.chars().anyMatch(chr -> chr < 32 || chr > 127)) { - this.addError( - ctx, - "comment-content-check", - warning, - "Comment must contain only ASCII printable characters: 0x20-0x7f" - ); - } - if (!Character.isUpperCase(comment.charAt(0))) { - this.addError( - ctx, - "comment-start-character-check", - warning, - "Comment must start with capital letter" - ); - } - if (comment.charAt(comment.length() - 1) != '.') { - this.addError( - ctx, - "comment-ending-check", - warning, - "Comment must end with dot" - ); - } + } + if (comment.chars().anyMatch(chr -> chr < 32 || chr > 127)) { + this.addError( + ctx, + "comment-content-check", + warning, + "Comment must contain only ASCII printable characters: 0x20-0x7f" + ); + } + if (!Character.isUpperCase(comment.charAt(0))) { + this.addError( + ctx, + "comment-start-character-check", + warning, + "Comment must start with capital letter" + ); + } + if (comment.charAt(comment.length() - 1) != '.') { + this.addError( + ctx, + "comment-ending-check", + warning, + "Comment must end with dot" + ); } } } diff --git a/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java b/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java index cb576abcac..97e998664b 100644 --- a/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java +++ b/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java @@ -53,7 +53,8 @@ "PMD.TooManyMethods", "PMD.AvoidDuplicateLiterals", "PMD.ExcessivePublicCount", - "PMD.ExcessiveClassLength" + "PMD.ExcessiveClassLength", + "PMD.GodClass" }) public final class XePhiListener implements PhiListener, Iterable { /** @@ -324,7 +325,7 @@ public void enterDeltaBidning(final PhiParser.DeltaBidningContext ctx) { .start() .prop("data", "bytes") .prop("base", "org.eolang.bytes"); - if (!ctx.BYTES().getText().equals("--")) { + if (!"--".equals(ctx.BYTES().getText())) { this.objects().data(ctx.BYTES().getText().replaceAll("-", " ").trim()); } this.objects().leave(); @@ -337,7 +338,7 @@ public void exitDeltaBidning(final PhiParser.DeltaBidningContext ctx) { @Override public void enterLambdaBidning(final PhiParser.LambdaBidningContext ctx) { - if (!ctx.FUNCTION().getText().equals(XePhiListener.LAMBDA_PACKAGE)) { + if (!XePhiListener.LAMBDA_PACKAGE.equals(ctx.FUNCTION().getText())) { this.objects().prop("atom"); } } 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 d735b73ac5..c63d944782 100644 --- a/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java +++ b/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java @@ -289,7 +289,7 @@ void storesAsBytes(final String code) throws IOException { @ParameterizedTest @ClasspathSource(value = "org/eolang/parser/typos/", glob = "**.yaml") - void checksTypoPacks(final String yml) throws IOException, NumberFormatException { + void checksTypoPacks(final String yml) throws IOException { final Yaml yaml = new Yaml(); final Map map = yaml.load(yml); Assumptions.assumeTrue(map.get("skip") == null); diff --git a/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java b/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java index 729af488c5..61831e625d 100644 --- a/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java +++ b/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java @@ -39,7 +39,7 @@ final class StUnhexTest { * Empty message for JUnit Assertions. */ private static final String EMPTY_MSG = "EMPTY MESSAGE"; - + @Test void convertsIntFromHexToEo() { MatcherAssert.assertThat(