#2744 implemented manual __END__ block capture method

Fixes #2744
Camelcade · Aug 27, 2023 · 6733998 · 6733998
1 parent 0a98bde
commit 6733998
Show file tree

Hide file tree

Showing 3 changed files with 10,824 additions and 10,803 deletions.
diff --git a/plugin/core/grammar/Perl.flex b/plugin/core/grammar/Perl.flex
@@ -36,7 +36,6 @@ import com.intellij.psi.tree.IElementType;
 /*
 // Char classes
 */
-NEW_LINE = \R
 WHITE_SPACE = [ \t\f]
 ANY_SPACE = [ \t\f\n\r]
 LINE_COMMENT = "#" .*
@@ -123,7 +122,6 @@ UNQUOTED_HEREDOC_MARKER = [a-zA-Z_] \d* {IDENTIFIER}?
 
 END_BLOCK = "__END__"
 DATA_BLOCK = "__DATA__"
-LINE_TO_END = .+ {NEW_LINE}?
 
 SUB_PROTOTYPE = [\[\$\@\%\&\*\]\;\+\\_]+
 SUB_PROTOTYPE_WITH_SPACES = ({WHITE_SPACE} | {SUB_PROTOTYPE})+
@@ -749,9 +747,8 @@ POSIX_CHARGROUP_ANY = {POSIX_CHARGROUP}|{POSIX_CHARGROUP_DOUBLE}
 }
 
 <END_BLOCK>{
-  "=" \w {LINE_TO_END}  {return capturePod(true);}
-  {LINE_TO_END}         {return COMMENT_BLOCK;}
-  [^] 		        {return COMMENT_BLOCK;}
+  "=" \w     {return capturePod(true);}
+  [^]        {return captureEndBlock();}
 }
 
 /////////////////////////////////  subs, anon subs, methods, etc //////////////////////////////////////////////////////////