Merge branch 'master' into upsource-master

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/breakStringOnLineBreaks/afterAll.java

@@ -0,0 +1,7 @@
+// "Break string on '\n'" "true"
+
+class A {
+    String s = "Hello,\n\r" +
+            "world\n" +
+            "!\n";
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/breakStringOnLineBreaks/beforeAll.java

@@ -0,0 +1,5 @@
+// "Break string on '\n'" "true"
+
+class A {
+    String s = "Hello,\n\rwor<caret>ld\n!\n";
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/breakStringOnLineBreaks/beforeLastSlashN.java

@@ -0,0 +1,5 @@
+// "Break string on '\n'" "false"
+
+class A {
+  String s = "Hello!\n";
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/breakStringOnLineBreaks/beforeLastSlashNSlashR.java

@@ -0,0 +1,5 @@
+// "Break string on '\n'" "false"
+
+class A {
+  String s = "Hello!\n\r";
+}