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";
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertColorRepresentation/after2Bytes.java

@@ -0,0 +1,21 @@
+// "Convert to 'new Color(0x10101)'" "true"
+
+package java.awt;
+
+class A {
+  private Color color = new Color(0x10101);
+}
+
+class Color {
+  Color(int r, int g, int b) {
+  }
+
+  Color(int r, int g, int b, int a) {
+  }
+
+  Color(int rgb) {
+  }
+
+  Color(int rgba, boolean hasAlpha) {
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertColorRepresentation/before2Bytes.java

@@ -0,0 +1,21 @@
+// "Convert to 'new Color(0x10101)'" "true"
+
+package java.awt;
+
+class A {
+  private Color color = new Color(257, 257,<caret> 257);
+}
+
+class Color {
+  Color(int r, int g, int b) {
+  }
+
+  Color(int r, int g, int b, int a) {
+  }
+
+  Color(int rgb) {
+  }
+
+  Color(int rgba, boolean hasAlpha) {
+  }
+}