Merge "Less_Tree_Rule: Add source to "Operation on an invalid type" e…

…rror"

lib/Less/Tree/Rule.php

@@ -97,6 +97,7 @@ public function compile( $env ) {
 			if ( !is_numeric( $e->index ) ) {
 				$e->index = $this->index;
 				$e->currentFile = $this->currentFileInfo;
+				$e->genMessage();
 			}
 			throw $e;
 		}

test/phpunit/FunctionTest.php

@@ -22,14 +22,10 @@ public static function reverse( $arg ) {
 	}
 
 	public function testException() {
-		$lessCode = '
-		.foo {
-			content: number("x");
-		}
-		';
+		$lessFile = __DIR__ . '/data/exception/f1.less';
 
 		$parser = new Less_Parser();
-		$parser->parse( $lessCode );
+		$parser->parseFile( $lessFile );
 
 		try {
 			$parser->getCss();

test/phpunit/ParserTest.php

@@ -57,4 +57,44 @@ public function testAllParsedFiles() {
 			$files
 		);
 	}
+
+	public function testOperationException() {
+		$lessFile = __DIR__ . '/data/exception/f2.less';
+
+		$parser = new Less_Parser();
+		$parser->parseFile( $lessFile );
+
+		try {
+			$parser->getCss();
+		} catch ( Exception $e ) {
+			$this->assertInstanceOf( Less_Exception_Parser::class, $e );
+			$this->assertEquals(
+"Operation on an invalid type in f2.less on line 4, column 2
+2| @bar: 'world';
+3| div {
+4|  content: (@foo) * @bar;
+5| }",
+								$e->getMessage()
+							);
+		}
+
+		$lessFile = __DIR__ . '/data/exception/f3.less';
+
+		$parser = new Less_Parser();
+		$parser->parseFile( $lessFile );
+
+		try {
+			$parser->getCss();
+		} catch ( Exception $e ) {
+			$this->assertInstanceOf( Less_Exception_Parser::class, $e );
+			$this->assertEquals(
+"Operation on an invalid type in f3.less on line 5, column 2
+3| 
+4| div {
+5|  content: @foo * @bar;
+6| }",
+				$e->getMessage()
+			);
+		}
+	}
 }

test/phpunit/data/exception/f1.less

@@ -0,0 +1,3 @@
+.foo {
+	content: number("x");
+}

test/phpunit/data/exception/f2.less

@@ -0,0 +1,5 @@
+@foo: 'hello';
+@bar: 'world';
+div {
+ content: (@foo) * @bar;
+}

test/phpunit/data/exception/f3.less

@@ -0,0 +1,6 @@
+@foo: 'hello';
+@bar: 'world';
+
+div {
+ content: @foo * @bar;
+}