33917: Make lookahead for NL also match CR

tiobe · Apr 3, 2024 · 86bed09 · 86bed09
1 parent 55837f3
commit 86bed09
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pmd-powershell/src/main/antlr4/net/sourceforge/pmd/lang/powershell/antlr4/PowershellLexer.g4 b/pmd-powershell/src/main/antlr4/net/sourceforge/pmd/lang/powershell/antlr4/PowershellLexer.g4
@@ -307,7 +307,7 @@ EXPANDABLE_STRING_START
    ;
 
 EXPANDABLE_HERE_STRING_END
-   : DOUBLE_QUOTE '@' { _input.LA(-3) == '\n' }?
+   : DOUBLE_QUOTE '@' { _input.LA(-3) == '\n' || _input.LA(-3) == '\r' }?
    ;
 
 VERBATIM_HERE_STRING_START
@@ -577,7 +577,7 @@ VERBATIM_HERE_STRING_SECTION
    ;
 
 VERBATIM_HERE_STRING_END
-   : SINGLE_QUOTE '@' { _input.LA(-3) == '\n' }?
+   : SINGLE_QUOTE '@' { _input.LA(-3) == '\n' || _input.LA(-3) == '\r' }?
    -> popMode
    ;