Removed 'files', 'libraries', 'cb_personal_libraries' paths from compilation output and added info texts, indicating where the error came from

Author: fpapadopou

Symfony/src/Codebender/CompilerBundle/Handler/CompilerHandler.php

@@ -1401,20 +1401,26 @@ private function cleanUpClangOutput($clang_output, $compiler_config, $option)
 	private function pathRemover($output, $compiler_config)
 	{
 
-		// Remove any instance of "compiler.RANDOM/files/" folder name from the text
-		$modified = str_replace($compiler_config["compiler_dir"]."/files/", '', $output);
+		// Remove any instance of "compiler.RANDOM/files/" folder name from the text, add (sketch file) info text
+		$modified = str_replace($compiler_config["compiler_dir"]."/files/", '(sketch file) ', $output);
 
 		// Remove any remaining instance of "compiler.RANDOM/" folder name from the text.
 		$modified = str_replace($compiler_config["compiler_dir"]."/", '', $modified);
 
-		// Remove any instance of codebender arduino core files folder name from the text
-		$modified = str_replace($compiler_config["arduino_cores_dir"]."/v105/", '', $modified);
+        // Replace userId_cb_personal_lib prefix from personal libraries errors with a (personal library file) info text.
+        $modified = preg_replace('/libraries\/\d+_cb_personal_lib_/', '(personal library file) ', $modified);
 
-		// Remove any instance of codebender external core file folder name from the text
+        // Replace libraries/ prefix from personal libraries errors with a (personal library file) info text.
+        $modified = str_replace('libraries/', '(library file) ', $modified);
+
+		// Remove any instance of codebender arduino core files folder name from the text, add (arduino core file) info text
+		$modified = str_replace($compiler_config["arduino_cores_dir"]."/v105/", '(arduino core file) ', $modified);
+
+		// Remove any instance of codebender external core file folder name from the text, , add (arduino core file) info text
 		if (isset($compiler_config["external_core_files"]) && $compiler_config["external_core_files"] != "")
 		{
-			$modified = str_replace($compiler_config["external_core_files"], '', $modified);
-			$modified = str_replace("/override_cores/", '', $modified);
+			$modified = str_replace($compiler_config["external_core_files"], '(arduino core file) ', $modified);
+			$modified = str_replace("/override_cores/", '(arduino core file) ', $modified);
 		}
 
 		return $modified;

Symfony/src/Codebender/CompilerBundle/Tests/Controller/DefaultControllerFunctionalTest.php

@@ -249,6 +249,52 @@ public function testCleanedUpLinkerError()
         $this->assertEquals($expectedLinkerError, $response['message']);
     }
 
+    public function testEthernetCompileErrorRemovedLibraryPaths()
+    {
+        $files = array(array("filename" => "Blink.ino", "content" => "#include <Ethernet.h>\nvoid setup() {\n}\nvoid loop() {\n}\n"));
+        $format = "binary";
+        $version = "105";
+        $libraries = array('PseudoEthernet' => array('files' => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
+        $build = array("mcu" => "atmega328p", "f_cpu" => "16000000", "core" => "arduino", "variant" => "standard");
+
+        $data = json_encode(array("files" => $files, "format" => $format, "version" => $version, "libraries" => $libraries, "build" => $build));
+
+        $client = static::createClient();
+
+        $authorizationKey = $client->getContainer()->getParameter("authorizationKey");
+
+        $client->request('POST', '/' . $authorizationKey . '/v1', array(), array(), array(), $data);
+
+        $response = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertEquals($response["success"], false);
+        $this->assertEquals($response["step"], 4);
+        $this->assertContains('(library file) PseudoEthernet/Ethernet.h:1:10: </b><b><font style="color: red">fatal error: </font></b><b>\'SPI.h\' file not found', $response['message']);
+    }
+
+    public function testEthernetCompileErrorRemovedPersonalLibraryPaths()
+    {
+        $files = array(array("filename" => "Blink.ino", "content" => "#include <Ethernet.h>\nvoid setup() {\n}\nvoid loop() {\n}\n"));
+        $format = "binary";
+        $version = "105";
+        $libraries = array('4096_cb_personal_lib_PseudoEthernet' => array('files' => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
+        $build = array("mcu" => "atmega328p", "f_cpu" => "16000000", "core" => "arduino", "variant" => "standard");
+
+        $data = json_encode(array("files" => $files, "format" => $format, "version" => $version, "libraries" => $libraries, "build" => $build));
+
+        $client = static::createClient();
+
+        $authorizationKey = $client->getContainer()->getParameter("authorizationKey");
+
+        $client->request('POST', '/' . $authorizationKey . '/v1', array(), array(), array(), $data);
+
+        $response = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertEquals($response["success"], false);
+        $this->assertEquals($response["step"], 4);
+        $this->assertContains('(personal library file) PseudoEthernet/Ethernet.h:1:10: </b><b><font style="color: red">fatal error: </font></b><b>\'SPI.h\' file not found', $response['message']);
+    }
+
     public function testAutocomplete()
     {
         $this->markTestIncomplete('No tests for the code completion feature yet.');