[fix] Detect conflict markers in double quotes, fix #122

src/main/java/se/kth/spork/spoon/printer/SporkPrettyPrinter.java

@@ -183,9 +183,12 @@ public SporkPrinterHelper write(String s) {
                 //
                 // All we need to do here is the decrease tabs and enter some appropriate whitespace
                 writelnIfNotPresent().writeAtLeftMargin(s).writeln();
+                return this;
             }
-            if (globalContentConflicts.containsKey(s)) {
-                Pair<String, String> conflict = globalContentConflicts.get(s);
+
+            String strippedQuotes = trimmed.replaceAll("\"", "");
+            if (globalContentConflicts.containsKey(strippedQuotes)) {
+                Pair<String, String> conflict = globalContentConflicts.get(strippedQuotes);
                 writeConflict(conflict.first, conflict.second);
             } else if (localConflictMap.isPresent() && localConflictMap.get().containsKey(s)) {
                 Pair<String, String> conflict = localConflictMap.get().get(s);

src/test/resources/conflict/integer_literal_conflict/Base.java

@@ -0,0 +1,5 @@
+public class Main {
+    int calcNumber() {
+        return 1 + 2 + 3;
+    }
+}

src/test/resources/conflict/integer_literal_conflict/Expected.java

@@ -0,0 +1,11 @@
+public class Main {
+    int calcNumber() {
+        return 1 + 2 +
+<<<<<<< LEFT
+99
+=======
+102
+>>>>>>> RIGHT
+        ;
+    }
+}

src/test/resources/conflict/integer_literal_conflict/Left.java

@@ -0,0 +1,5 @@
+public class Main {
+    int calcNumber() {
+        return 1 + 2 + 99;
+    }
+}

src/test/resources/conflict/integer_literal_conflict/Right.java

@@ -0,0 +1,5 @@
+public class Main {
+    int calcNumber() {
+        return 1 + 2 + 102;
+    }
+}