From 63f6e618f93d28187196b083e83107ec47305672 Mon Sep 17 00:00:00 2001
From: Sergey <sergey.gorbaty@salesforce.com>
Date: Wed, 15 Feb 2017 11:53:31 -0800
Subject: [PATCH] Support for mixed merge fields

---
 pmd-visualforce/etc/grammar/VfParser.jjt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-visualforce/etc/grammar/VfParser.jjt b/pmd-visualforce/etc/grammar/VfParser.jjt
index 107e1b5ab0..d6b56daa4f 100644
--- a/pmd-visualforce/etc/grammar/VfParser.jjt
+++ b/pmd-visualforce/etc/grammar/VfParser.jjt
@@ -174,14 +174,14 @@ PARSER_END(VfParser)
 {
 	<ENDING_SINGLE_QUOTE: "'"> : InTagState
 |	<UNPARSED_TEXT_NO_SINGLE_QUOTES:
-		( (~["$", "#", "'"]) | (["$", "#"] ~["{", "'"]) )+ >
+		( (~["{", "'"]) | (["{"] ~["!", "'"]) )+ >
 }
 
 <AttrValueBetweenDoubleQuotesState> TOKEN :
 {
 	<ENDING_DOUBLE_QUOTE: "\""> : InTagState
 |	<UNPARSED_TEXT_NO_DOUBLE_QUOTES:
-		( (~["$", "#", "\""]) | (["$", "#"] ~["{", "\""]) )+ >
+		( (~["{", "\""]) | (["{"] ~["!", "\""]) )+ >
 }
 
 <CommentState> TOKEN :