diff options
| author | David Corbett <corbett.dav@husky.neu.edu> | 2014-05-19 18:21:20 -0400 |
|---|---|---|
| committer | David Corbett <corbett.dav@husky.neu.edu> | 2014-05-19 18:21:20 -0400 |
| commit | dc0fc3f80bb3e160c009303208d6d69e0bfa351d (patch) | |
| tree | b9cd4c6a4b287b60805d903580fbd2cdcf2b64be | |
| parent | 8e4acf008bbe4233bd075d2f25c7fbafd861f710 (diff) | |
| download | pygments-dc0fc3f80bb3e160c009303208d6d69e0bfa351d.tar.gz | |
Fix nested comments in ColdFusion
| -rw-r--r-- | pygments/lexers/templates.py | 7 | ||||
| -rw-r--r-- | tests/examplefiles/demo.cfm | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index 89d29f0f..f1f879a5 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -1559,10 +1559,9 @@ class ColdfusionMarkupLexer(RegexLexer): (r'#', Other), ], 'cfcomment': [ - (r'(?s)(.*?)(<!---)', - bygroups(Comment.Multiline, Comment.Multiline), '#push'), - (r'(?s)(.*?)(--->)', - bygroups(Comment.Multiline, Comment.Multiline), '#pop'), + (r'<!---', Comment.Multiline, '#push'), + (r'--->', Comment.Multiline, '#pop'), + (r'([^<-]|<(?!!---)|-(?!-->))+', Comment.Multiline), ], } diff --git a/tests/examplefiles/demo.cfm b/tests/examplefiles/demo.cfm index 49690484..78098c05 100644 --- a/tests/examplefiles/demo.cfm +++ b/tests/examplefiles/demo.cfm @@ -47,4 +47,4 @@ cfcomment <cfset c = a * b> <cfset c = a + b> <cfset c = a - b> - +<!--- <!-- another <!--- nested --> ---> comment ---> |