From e32b6df6b7c92480461c490a9483452fd3788120 Mon Sep 17 00:00:00 2001
From: Sergey <sergey.gorbaty@salesforce.com>
Date: Mon, 6 Mar 2017 13:31:35 -0800
Subject: [PATCH] Setting the tab size to 4 for VF

---
 .../net/sourceforge/pmd/lang/vf/VfParser.java |  3 +--
 .../pmd/lang/vf/VfSimpleCharStream.java       | 22 +++++++++++++++++++
 .../vf/rule/security/xml/VfUnescapeEl.xml     |  6 ++---
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfSimpleCharStream.java

diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
index 5a18fed0b2..07a973e209 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
@@ -14,7 +14,6 @@ import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.AbstractTokenManager;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.ParseException;
-import net.sourceforge.pmd.lang.ast.SimpleCharStream;
 
 /**
  * Adapter for the VfParser.
@@ -36,7 +35,7 @@ public class VfParser extends AbstractParser {
 
     public Node parse(String fileName, Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
-        return new net.sourceforge.pmd.lang.vf.ast.VfParser(new SimpleCharStream(source)).CompilationUnit();
+        return new net.sourceforge.pmd.lang.vf.ast.VfParser(new VfSimpleCharStream(source)).CompilationUnit();
     }
 
     public Map<Integer, String> getSuppressMap() {
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfSimpleCharStream.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfSimpleCharStream.java
new file mode 100644
index 0000000000..a1dd050cd0
--- /dev/null
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfSimpleCharStream.java
@@ -0,0 +1,22 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.vf;
+
+import java.io.Reader;
+
+import net.sourceforge.pmd.lang.ast.SimpleCharStream;
+
+/**
+ * @author sergey.gorbaty
+ *
+ */
+public class VfSimpleCharStream extends SimpleCharStream {
+
+    public VfSimpleCharStream(Reader dstream) {
+        super(dstream);
+        tabSize = 4;
+    }
+
+}
diff --git a/pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml b/pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml
index e6a45f1ef6..c498d4897f 100644
--- a/pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml
+++ b/pmd-visualforce/src/test/resources/net/sourceforge/pmd/lang/vf/rule/security/xml/VfUnescapeEl.xml
@@ -7,9 +7,9 @@ Has multiple resources but starts with a safe one
      ]]></description>
 		<expected-problems>0</expected-problems>
 		<code><![CDATA[
-<apex:page>
-<link rel="stylesheet" type="text/css" href="{!$Resource.SDEFExtJS}/{!anotherRes}" id="ext-all-css"/>
-</apex:page>
+	<apex:page>
+		<link rel="stylesheet" type="text/css" href="{!$Resource.SDEFExtJS}/{!anotherRes}" id="ext-all-css"/>
+	</apex:page>
 ]]></code>
 		<source-type>vf</source-type>
 	</test-code>