From 9a62a662c1948b37017d7ac147b61a18e6eb0a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 19 Mar 2020 17:57:30 +0100
Subject: [PATCH] Remove track-tokens for vf, jsp

---
 javacc-wrapper.xml                 | 6 +++++-
 pmd-jsp/etc/grammar/Jsp.jjt        | 1 -
 pmd-visualforce/etc/grammar/Vf.jjt | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/javacc-wrapper.xml b/javacc-wrapper.xml
index 265fa8e391..03153746f1 100644
--- a/javacc-wrapper.xml
+++ b/javacc-wrapper.xml
@@ -108,7 +108,11 @@
 
 
     <target name="jjtree" unless="jjtreeBuildNotRequired" description="Runs JJTree">
-        <!-- Token-tracking behavior is reimplemented -->
+
+        <!--
+             Token-tracking behavior is implemented in the JJTree builder,
+             so the grammar should have TRACK_TOKEN=false; (this is the default value)
+        -->
         <jjtree target="etc/grammar/${lang-name}.jjt"
                 outputdirectory="${target-package-dir}"
                 nodeusesparser="false"
diff --git a/pmd-jsp/etc/grammar/Jsp.jjt b/pmd-jsp/etc/grammar/Jsp.jjt
index f286783d96..c5400e8b6c 100644
--- a/pmd-jsp/etc/grammar/Jsp.jjt
+++ b/pmd-jsp/etc/grammar/Jsp.jjt
@@ -25,7 +25,6 @@ options {
 
 	MULTI=true;
 	VISITOR=true;
-	TRACK_TOKENS = true;
 }
 
 PARSER_BEGIN(JspParserImpl)
diff --git a/pmd-visualforce/etc/grammar/Vf.jjt b/pmd-visualforce/etc/grammar/Vf.jjt
index efdd76d50b..8edfcc2612 100644
--- a/pmd-visualforce/etc/grammar/Vf.jjt
+++ b/pmd-visualforce/etc/grammar/Vf.jjt
@@ -8,7 +8,6 @@ options {
 
 	MULTI=true;
 	VISITOR=true;
-	TRACK_TOKENS = true;
 }
 
 PARSER_BEGIN(VfParserImpl)