Optimize LUFileParser.g4 to accelerate parsing of simple intent section with a large number of entities

packages/lu/src/parser/lufile/LUFileParser.g4

@@ -10,8 +10,6 @@ paragraph
     : newline
     | nestedIntentSection
     | simpleIntentSection
-    | entitySection
-    | newEntitySection
     | importSection
     | qnaSection
     | modelInfoSection
@@ -49,7 +47,7 @@ subIntentDefinition
     ;
 
 simpleIntentSection
-    : intentDefinition (entitySection | newEntitySection)*
+    : (intentDefinition? (entitySection | newEntitySection)+) | intentDefinition
     ;
 
 intentDefinition

packages/lu/src/parser/lufile/generated/LUFileParserListener.js

@@ -1,4 +1,4 @@
-// Generated from LUFileParser.g4 by ANTLR 4.7.1
+// Generated from ../LUFileParser.g4 by ANTLR 4.7.2
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
 

packages/lu/src/parser/lufile/generated/LUFileParserVisitor.js

@@ -1,4 +1,4 @@
-// Generated from LUFileParser.g4 by ANTLR 4.7.1
+// Generated from ../LUFileParser.g4 by ANTLR 4.7.2
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
 

packages/lu/src/parser/lufile/luParser.js

@@ -182,7 +182,7 @@ class LUParser {
 
         let simpleIntentSections = fileContext.paragraph()
             .map(x => x.simpleIntentSection())
-            .filter(x => x !== undefined && x !== null);
+            .filter(x => x && x.intentDefinition());
 
         let simpleIntentSectionList = simpleIntentSections.map(x => new SimpleIntentSection(x, content));
 
@@ -199,10 +199,17 @@ class LUParser {
         }
 
         let entitySections = fileContext.paragraph()
-            .map(x => x.entitySection())
-            .filter(x => x !== undefined && x !== null);
+            .map(x => x.simpleIntentSection())
+            .filter(x => x && !x.intentDefinition());
 
-        let entitySectionList = entitySections.map(x => new EntitySection(x));
+        let entitySectionList = [];
+        entitySections.forEach(x => {
+            if (x.entitySection) {
+                for (const entitySection of x.entitySection()) {
+                    entitySectionList.push(new EntitySection(entitySection));
+                }
+            }
+        })
 
         return entitySectionList;
     }
@@ -217,10 +224,17 @@ class LUParser {
         }
 
         let newEntitySections = fileContext.paragraph()
-            .map(x => x.newEntitySection())
-            .filter(x => x !== undefined && x !== null);
+            .map(x => x.simpleIntentSection())
+            .filter(x => x && !x.intentDefinition());
 
-        let newEntitySectionList = newEntitySections.map(x => new NewEntitySection(x));
+        let newEntitySectionList = [];
+        newEntitySections.forEach(x => {
+            if (x.newEntitySection) {
+                for (const newEntitySection of x.newEntitySection()) {
+                    newEntitySectionList.push(new NewEntitySection(newEntitySection));
+                }
+            }
+        })
 
         return newEntitySectionList;
     }