Preprocessor regexp: "." now matches even line terminators. Closes #1653

Author: Federico Fissore

app/src/processing/app/preproc/PdePreprocessor.java

@@ -257,7 +257,7 @@ public String strip(String in) {
     // pre-processor directive
     p += "|" + "(^\\s*#.*?$)";
 
-    Pattern pattern = Pattern.compile(p, Pattern.MULTILINE);
+    Pattern pattern = Pattern.compile(p, Pattern.MULTILINE | Pattern.DOTALL);
     Matcher matcher = pattern.matcher(in);
     return matcher.replaceAll(" ");
   }

app/test/processing/app/preproc/LineContinuations.ino

@@ -0,0 +1,34 @@
+const char *foo = "\
+hello \
+world\n";
+
+//" delete this comment line and the IDE parser will crash
+
+void setup()
+{
+}
+
+void loop()
+{
+}
+/*
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+*/

app/test/processing/app/preproc/LineContinuations.stripped.ino

@@ -0,0 +1,12 @@
+const char *foo =  ;
+
+ 
+
+void setup()
+{
+}
+
+void loop()
+{
+}
+ 

app/test/processing/app/preproc/PdePreprocessorTest.java

@@ -93,4 +93,18 @@ public void testCharWithEscapedDoubleQuote() throws Exception {
     assertEquals("Wire.h", pdePreprocessor.getExtraImports().get(1));
   }
 
+  @Test
+  public void testLineContinuations() throws Exception {
+    String s = FileUtils.readFileToString(new File(PdePreprocessorTest.class.getResource("LineContinuations.ino").getFile()));
+
+    PdePreprocessor pdePreprocessor = new PdePreprocessor();
+    String actualOutput = pdePreprocessor.strip(s);
+    String expectedOutput = FileUtils.readFileToString(new File(PdePreprocessorTest.class.getResource("LineContinuations.stripped.ino").getFile()));
+
+    assertEquals(expectedOutput, actualOutput);
+
+    pdePreprocessor.writePrefix(s);
+    assertEquals(0, pdePreprocessor.getExtraImports().size());
+  }
+
 }