Merge branch 'master' into upsource-master

java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurException.java

@@ -1,3 +0,0 @@
-public class OurException extends Throwable{
-
-}

java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurNotException.java

@@ -1,6 +0,0 @@
-public class OurNotException {
-  public static class InnerException extends Throwable{
-  }
-  public static class InnerNonException{
-  }
-}

java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/AAClass.java

@@ -1,4 +0,0 @@
-package pack;
-
-public class AAClass {
-}

java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/WithInnerAClass.java

@@ -1,5 +0,0 @@
-package pack;
-
-public class WithInnerAClass{
-  public static class Inner{}
-}

java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-result.java

@@ -1,4 +0,0 @@
-class Main {
-
-    foo.bar.AxBxCxDxEx<caret>
-}

java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-source.java

@@ -1,4 +0,0 @@
-class Main {
-
-    ABCDE<caret>
-}

java/java-tests/testData/codeInsight/completion/normalSorting/PreferLocalsToStaticsInSecondCompletion.java

@@ -0,0 +1,7 @@
+class Util {
+  void foox() {
+    int fooy;
+    foo<caret>
+  }
+
+}

java/java-tests/testData/codeInsight/completion/normalSorting/PreselectMostRelevantInTheMiddleAlpha.java

@@ -1,17 +1,17 @@
-class Foo {
-  int ELEMENT_A = 1;
-  int ELEMENT_B = 1;
-  int ELEMENT_C = 1;
-  int ELEMENT_D = 1;
-  int ELEMENT_E = 1;
-  int ELEMENT_F = 1;
-  int ELEMENT_G = 1;
-  int ELEMENT_H = 1;
-  int ELEMENT_I = 1;
-
-
-    {
-        El<caret>
-    }
-
+class Foo {
+  int ELXEMENT_A = 1;
+  int ELXEMENT_B = 1;
+  int ELXEMENT_C = 1;
+  int ELXEMENT_D = 1;
+  int ELXEMENT_E = 1;
+  int ELXEMENT_F = 1;
+  int ELXEMENT_G = 1;
+  int ELXEMENT_H = 1;
+  int ELXEMENT_I = 1;
+
+
+    {
+        Elx<caret>
+    }
+
 }

java/java-tests/testData/codeInsight/completion/normalSorting/UnderscoresDontMakeMatchMiddle.java

@@ -0,0 +1,5 @@
+class FooBar {
+  void foo(FooBar _fooBar) {
+    fb<caret>
+  }
+}

java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedInCaseOfAnonymousClasses-out.java

@@ -1,9 +1,33 @@
-class MyClass {
-  public void foo() {
-    MyDD<String> d = new MyDD<String>() {
-    };
-  }
-}
-
-abstract class MyDD<T> {
+class MyClass {
+  public void foo() {
+    MyDD<String> d = new MyDD<String>() {
+        @Override
+        public int hashCode() {
+            <selection>return super.hashCode();    //To change body of overridden methods use File | Settings | File Templates.</selection>
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return super.equals(obj);    //To change body of overridden methods use File | Settings | File Templates.
+        }
+
+        @Override
+        protected Object clone() throws CloneNotSupportedException {
+            return super.clone();    //To change body of overridden methods use File | Settings | File Templates.
+        }
+
+        @Override
+        public String toString() {
+            return super.toString();    //To change body of overridden methods use File | Settings | File Templates.
+        }
+
+        @Override
+        protected void finalize() throws Throwable {
+            super.finalize();    //To change body of overridden methods use File | Settings | File Templates.
+        }
+    };
+  }
+}
+
+abstract class MyDD<T> {
 }

java/java-tests/testData/codeInsight/completion/smartType/NewAnonymousFunction-out.java

@@ -1,5 +1,29 @@
-interface Function<X, Y> { }
-class A {
-  private static final Function<String, String> a = new Function<String, String>() {
-  <caret>};
+interface Function<X, Y> { }
+class A {
+  private static final Function<String, String> a = new Function<String, String>() {
+      @Override
+      public int hashCode() {
+          <selection>return super.hashCode();    //To change body of overridden methods use File | Settings | File Templates.</selection>
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+          return super.equals(obj);    //To change body of overridden methods use File | Settings | File Templates.
+      }
+
+      @Override
+      protected Object clone() throws CloneNotSupportedException {
+          return super.clone();    //To change body of overridden methods use File | Settings | File Templates.
+      }
+
+      @Override
+      public String toString() {
+          return super.toString();    //To change body of overridden methods use File | Settings | File Templates.
+      }
+
+      @Override
+      protected void finalize() throws Throwable {
+          super.finalize();    //To change body of overridden methods use File | Settings | File Templates.
+      }
+  };
 }

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) {
+  }
+}