From: Quentin <quentin@open-to-repair.fr>
Date: Mon, 18 Apr 2016 17:31:42 +0000 (+0200)
Subject: Changed tab to space conversion
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cafdb31692aea6a5a8792d99720acdd4746a19fb;p=gitblit.git

Changed tab to space conversion

Tabs are not always 4 spaces large. It completes the line to the 4th
character.
---

diff --git a/src/main/java/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java
index 442acbbf..7c4eef8b 100644
--- a/src/main/java/com/gitblit/utils/StringUtils.java
+++ b/src/main/java/com/gitblit/utils/StringUtils.java
@@ -105,6 +105,8 @@ public class StringUtils {
 	public static String escapeForHtml(String inStr, boolean changeSpace, int tabLength) {
 		StringBuilder retStr = new StringBuilder();
 		int i = 0;
+		int l = 0;
+		
 		while (i < inStr.length()) {
 			if (inStr.charAt(i) == '&') {
 				retStr.append("&amp;");
@@ -117,12 +119,17 @@ public class StringUtils {
 			} else if (changeSpace && inStr.charAt(i) == ' ') {
 				retStr.append("&nbsp;");
 			} else if (changeSpace && inStr.charAt(i) == '\t') {
-				for (int j = 0; j < tabLength; j++) {
+				for (int j = 0; j < tabLength - l; j++) {
 					retStr.append("&nbsp;");
 				}
+				l = -1;
 			} else {
 				retStr.append(inStr.charAt(i));
 			}
+			
+			l = (l + 1) % tabLength;
+			if (inStr.charAt(i) == '\n')
+				l = 0;
 			i++;
 		}
 		return retStr.toString();