Fix ANTLR when LU content contains only comments (#6747)

microsoft · Feb 9, 2024 · 23c03d8 · 23c03d8
1 parent e5f7ff6
commit 23c03d8
Show file tree

Hide file tree

Showing 11 changed files with 835 additions and 816 deletions.
diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileLexer.cs b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileLexer.cs
diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileLexer.interp b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileLexer.interp
diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileParser.cs b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileParser.cs
diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileParser.interp b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Generated/LUFileParser.interp
diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/LUFileLexer.g4 b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/LUFileLexer.g4
@@ -54,7 +54,7 @@ MODEL_INFO
   ;
 
 COMMENT
-  : WS* '>' ~('\r'|'\n')*
+  : WS* '>' ~('\r'|'\n')* -> skip
   ;
 
 QNA

diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/LUFileParser.g4 b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/LUFileParser.g4
@@ -3,7 +3,7 @@ parser grammar LUFileParser;
 options { tokenVocab=LUFileLexer; }
 
 file
-	: paragraph+? EOF
+	: (paragraph+? | commentDefinition?) EOF
 	;
 
 paragraph
@@ -16,7 +16,6 @@ paragraph
     | referenceSection
     | qnaSection
     | modelInfoSection
-    | commentDefinition
     ;
 
 // Treat EOF as newline to hanle file end gracefully
@@ -79,7 +78,7 @@ intentBody
 	;
 
 normalIntentBody
-    : WS* ((normalIntentString newline) | errorString | commentDefinition)+
+    : WS* ((normalIntentString newline) | errorString)+
     ;
 
 normalIntentString

diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/LU_Sections_Unix.json b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/LU_Sections_Unix.json
@@ -161,11 +161,11 @@
                     "errorMsgs": [
 
                     ],
-                    "contextText": "    - Please set {deviceTemperature = thermostat to 72}",
+                    "contextText": "- Please set {deviceTemperature = thermostat to 72}",
                     "range": {
                         "Start": {
                             "Line": 17,
-                            "Character": 0
+                            "Character": 4
                         },
                         "End": {
                             "Line": 17,

diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/LU_Sections_Windows.json b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/LU_Sections_Windows.json
diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU131.json b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU131.json
@@ -52,7 +52,7 @@
       "Severity": "ERROR"
     },
     {
-      "Message": "syntax error: extraneous input 'ml' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, COMMENT, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
+      "Message": "syntax error: extraneous input 'ml' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
       "Range": {
         "Start": {
           "Line": 2,

diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU139.json b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU139.json
@@ -52,7 +52,7 @@
       "Severity": "ERROR"
     },
     {
-      "Message": "syntax error: extraneous input 'regex' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, COMMENT, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
+      "Message": "syntax error: extraneous input 'regex' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
       "Range": {
         "Start": {
           "Line": 2,

diff --git a/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU153.json b/tests/Parsers/Microsoft.Bot.Builder.Parsers.LU.Tests/Fixtures/testLU153.json
@@ -37,7 +37,7 @@
       "Severity": "ERROR"
     },
     {
-      "Message": "syntax error: extraneous input 'abc' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, COMMENT, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
+      "Message": "syntax error: extraneous input 'abc' expecting {<EOF>, WS, NEWLINE, QNA_SOURCE_INFO, MODEL_INFO, QNA, HASH, '$', '@', IMPORT, REFERENCE, QNA_ID_MARK}",
       "Range": {
         "Start": {
           "Line": 2,
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ MODEL_INFO @@
       ;
     COMMENT
-      : WS* '>' ~('\r'|'\n')*
+      : WS* '>' ~('\r'|'\n')* -> skip
       ;
     QNA
@@ Expand Down @@