fix region after trivia start

Author: CppCXY

crates/emmylua_parser/src/grammar/doc/mod.rs

@@ -57,15 +57,20 @@ fn parse_docs(p: &mut LuaDocParser) {
                 p.bump();
                 parse_continue_or(p);
             }
+            LuaTokenKind::TKDocTriviaStart => {
+                p.bump();
+            }
             _ => {
                 p.bump();
             }
         }
 
         if let Some(reader) = &p.lexer.reader {
             if !reader.is_eof()
-                && p.current_token() != LuaTokenKind::TkDocStart
-                && p.current_token() != LuaTokenKind::TkDocLongStart
+                && !matches!(
+                    p.current_token(),
+                    LuaTokenKind::TkDocStart | LuaTokenKind::TkDocLongStart
+                )
             {
                 p.bump_to_end();
                 continue;

crates/emmylua_parser/src/grammar/doc/test.rs

@@ -1895,4 +1895,40 @@ Syntax(Chunk)@0..90
 
         assert_ast_eq!(code, result);
     }
+
+    #[test]
+    fn test_region_with_comment() {
+        let code = r#"
+        -----------
+        --region hhhh
+        --comment
+        --endregion
+        "#;
+
+        let result = r#"
+Syntax(Chunk)@0..89
+  Syntax(Block)@0..89
+    Token(TkEndOfLine)@0..1 "\n"
+    Token(TkWhitespace)@1..9 "        "
+    Syntax(Comment)@9..80
+      Token(TKDocTriviaStart)@9..20 "-----------"
+      Token(TkEndOfLine)@20..21 "\n"
+      Token(TkWhitespace)@21..29 "        "
+      Token(TkDocTrivia)@29..31 "--"
+      Token(TkDocTrivia)@31..42 "region hhhh"
+      Token(TkEndOfLine)@42..43 "\n"
+      Token(TkWhitespace)@43..51 "        "
+      Token(TkNormalStart)@51..53 "--"
+      Syntax(DocDescription)@53..71
+        Token(TkDocDetail)@53..60 "comment"
+        Token(TkEndOfLine)@60..61 "\n"
+        Token(TkWhitespace)@61..69 "        "
+        Token(TkNormalStart)@69..71 "--"
+      Token(TkDocEndRegion)@71..80 "endregion"
+    Token(TkEndOfLine)@80..81 "\n"
+    Token(TkWhitespace)@81..89 "        "
+        "#;
+
+        assert_ast_eq!(code, result);
+    }
 }

crates/emmylua_parser/src/kind/lua_token_kind.rs

@@ -82,6 +82,7 @@ pub enum LuaTokenKind {
     TkLongCommentStart, // --[[
     TkDocLongStart,     // --[[@
     TkDocStart,         // ---@
+    TKDocTriviaStart,   // --------------
     TkDocTrivia,        // other can not parsed
     TkLongCommentEnd,   // ]] or ]===]
 

crates/emmylua_parser/src/lexer/lua_doc_lexer.rs

@@ -123,7 +123,7 @@ impl LuaDocLexer<'_> {
                     }
                     _ => {
                         reader.eat_while(|_| true);
-                        LuaTokenKind::TkDocTrivia
+                        LuaTokenKind::TKDocTriviaStart
                     }
                 }
             }

crates/emmylua_parser/src/parser/lua_doc_parser.rs

@@ -98,6 +98,14 @@ impl LuaDocParser<'_, '_> {
                     self.eat_current_and_lex_next();
                 }
             }
+            LuaDocLexerState::Init => {
+                while matches!(
+                    self.current_token,
+                    LuaTokenKind::TkEndOfLine | LuaTokenKind::TkWhitespace
+                ) {
+                    self.eat_current_and_lex_next();
+                }
+            }
             _ => {}
         }
     }