Skip to content

Commit dddf863

Browse files
committed
fix(codegen): ensure multiple line comments are grouped.
1 parent 0d52bde commit dddf863

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

  • code-generation/protocol-base-mspec/src/main

code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,13 +415,21 @@ STRING_CHARACTER
415415
;
416416
417417
LINE_COMMENT
418-
: ('//' ~[\r\n]*)+ -> channel(HIDDEN)
418+
: (('//' ~[\r\n]*)+) -> channel(HIDDEN)
419419
;
420420
421421
BLOCK_COMMENT
422422
: '/*' .*? '*/' -> channel(HIDDEN)
423423
;
424424
425+
EmptyLine
426+
: {getCharPositionInLine() == 0}? [ \t]* '\r'? '\n' -> channel(HIDDEN)
427+
;
428+
429+
NEWLINE
430+
: '\r'? '\n' -> channel(HIDDEN)
431+
;
432+
425433
WS
426-
: [ \t\r\n\u000C]+ -> channel(HIDDEN)
434+
: [ \t\u000C]+ -> channel(HIDDEN)
427435
;

code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private String consumePendingComment(ParserRuleContext ctx) {
103103
List<Token> hiddenToLeft = tokenStream.getHiddenTokensToLeft(tokenIndex);
104104
if (hiddenToLeft != null) {
105105
hiddenToLeft.reversed().stream()
106-
.takeWhile(token -> frontComments.isEmpty() || (token.getType() != MSpecLexer.WS))
106+
.takeWhile(token -> frontComments.isEmpty() || (token.getType() != MSpecLexer.EmptyLine))
107107
.filter(token -> token.getType() == MSpecLexer.LINE_COMMENT || token.getType() == MSpecLexer.BLOCK_COMMENT)
108108
.forEach(frontComments::add);
109109
}

0 commit comments

Comments
 (0)