Merge pull request #7 from maximal/patch-1

everzet · everzet · commit 4c7bd74183f2 · 2016-04-07T13:27:08.000+01:00
Add ability not to expand tabs
diff --git a/lib/Diff/Renderer/Html/Array.php b/lib/Diff/Renderer/Html/Array.php
@@ -174,7 +174,9 @@ private function getChangeExtent($fromLine, $toLine)
 	 */
 	private function formatLines($lines)
 	{
-		$lines = array_map(array($this, 'ExpandTabs'), $lines);
+		if ($this->options['tabSize'] !== false) {
+			$lines = array_map(array($this, 'ExpandTabs'), $lines);
+		}
 		$lines = array_map(array($this, 'HtmlSafe'), $lines);
 		foreach($lines as &$line) {
 			$line = preg_replace_callback('# ( +)|^ #', __CLASS__."::fixSpaces", $line);
@@ -222,4 +224,4 @@ private function htmlSafe($string)
 	{
 		return htmlspecialchars($string, ENT_NOQUOTES, 'UTF-8');
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,9 @@ private function getChangeExtent($fromLine, $toLine)`
`174`	`174`	`*/`
`175`	`175`	`private function formatLines($lines)`
`176`	`176`	`{`
`177`		`- $lines = array_map(array($this, 'ExpandTabs'), $lines);`
	`177`	`+ if ($this->options['tabSize'] !== false) {`
	`178`	`+ $lines = array_map(array($this, 'ExpandTabs'), $lines);`
	`179`	`+ }`
`178`	`180`	`$lines = array_map(array($this, 'HtmlSafe'), $lines);`
`179`	`181`	`foreach($lines as &$line) {`
`180`	`182`	`$line = preg_replace_callback('# ( +)\|^ #', __CLASS__."::fixSpaces", $line);`
`@@ -222,4 +224,4 @@ private function htmlSafe($string)`
`222`	`224`	`{`
`223`	`225`	`return htmlspecialchars($string, ENT_NOQUOTES, 'UTF-8');`
`224`	`226`	`}`
`225`		`-}`
	`227`	`+}`