Merge pull request #42 from 1c-syntax/fix/stringTailquote

#41 STRINGPART double quote
1c-syntax · Aug 21, 2019 · 70d8448 · 70d8448
2 parents 8b04d29 + 9dbbac2
commit 70d8448
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/antlr/BSLLexer.g4 b/src/main/antlr/BSLLexer.g4
@@ -154,7 +154,7 @@ FLOAT : DIGIT+ '.' DIGIT*;
 STRING: '"' (~[\r\n"] | '""')* '"';
 STRINGSTART: '"' (~["\n\r]| '""')*;
 STRINGTAIL: BAR (~["\n\r] | '""')* '"';
-STRINGPART: BAR ~["\n\r]*;
+STRINGPART: BAR (~[\r\n"] | '""')*;
 
 // keywords
 PROCEDURE_KEYWORD

diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -152,7 +152,13 @@ void testString() {
     assertMatch("\"\"\"\"", BSLLexer.STRING);
     assertMatch("|СПЕЦСИМВОЛ \"\"~\"\"\"", BSLLexer.STRINGTAIL);
     assertMatch("\"Минимальная версия платформы \"\"1С:Предприятие 8\"\" указана выше рекомендуемой.", BSLLexer.STRINGSTART);
-
+    assertMatch("А = \" \n | А \"\"\"\" + А \n  |\";",
+            BSLLexer.IDENTIFIER,
+            BSLLexer.ASSIGN,
+            BSLLexer.STRINGSTART,
+            BSLLexer.STRINGPART,
+            BSLLexer.STRINGTAIL,
+            BSLLexer.SEMICOLON);
   }
 
   @Test