Merge pull request #51 from Talesoft/dev-master

Lexer makes less noise on spaces
Talesoft · Jan 16, 2016 · 8a03371 · 8a03371
2 parents 2779857 + b7c731a
commit 8a03371
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Lexer.php b/Lexer.php
@@ -876,8 +876,6 @@ protected function scanIndent()
                     $mixed = false;
                 } else {
 
-                    var_dump($this->_indentStyle, $this->_indentWidth, $spaces, $tabs, $mixed);
-
                     $this->throwException(
                         "Mixed indentation style encountered. "
                         ."Dont mix tabs and spaces. Stick to one of both."
@@ -902,9 +900,7 @@ protected function scanIndent()
             $this->_level = intval(round($this->strlen($indent) / $this->_indentWidth));
 
             if ($this->_level > $oldLevel + 1)
-                $this->throwException(
-                    "You should indent in by one level only"
-                );
+                $this->_level = $oldLevel + 1;
         } else
             $this->_level = 0;
 

diff --git a/Test/ConfigTest.php b/Test/ConfigTest.php
@@ -38,7 +38,7 @@ public function testRendererForwardsOptionsToLexer($option, $value)
 
         $renderer = new Renderer(['lexerOptions' => [$option => $value]]);
 
-        $this->assertEquals($value, $renderer->getLexer()->getOption($option));
+        $this->assertEquals($value, $renderer->getCompiler()->getParser()->getLexer()->getOption($option));
     }
 
     public function compilerOptionProvider()