Single line comments can end in newline or EOF. Fixes opensearch-proj…

…ect#11815
camerondurham · Jan 9, 2024 · c8b63c4 · c8b63c4
1 parent 0b30f30
commit c8b63c4
Show file tree

Hide file tree

Showing 7 changed files with 6,338 additions and 8,103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -211,6 +211,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix template setting override for replication type ([#11417](https://github.com/opensearch-project/OpenSearch/pull/11417))
 - Fix Automatic addition of protocol broken in #11512 ([#11609](https://github.com/opensearch-project/OpenSearch/pull/11609))
 - Fix issue when calling Delete PIT endpoint and no PITs exist ([#11711](https://github.com/opensearch-project/OpenSearch/pull/11711))
+- Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
 
 ### Security
 

diff --git a/modules/lang-painless/src/main/antlr/PainlessLexer.g4 b/modules/lang-painless/src/main/antlr/PainlessLexer.g4
@@ -25,7 +25,7 @@ protected abstract boolean isSlashRegex();
 }
 
 WS: [ \t\n\r]+ -> skip;
-COMMENT: ( '//' .*? [\n\r] | '/*' .*? '*/' ) -> skip;
+COMMENT: ( '//' .*? ([\n\r] | EOF) | '/*' .*? '*/' ) -> skip;
 
 LBRACK:    '{';
 RBRACK:    '}';