Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
	platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java

java/java-tests/testData/codeInsight/completion/normal/FinalInForLoop.java

@@ -0,0 +1,7 @@
+public class Foooo {
+
+    {
+        for (fin<caret>x)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/PrimitiveTypesInForLoopSpace.java

@@ -0,0 +1,8 @@
+public class Foooo {
+
+    {
+        int intaaaa;
+        for (in<caret>)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/PrimitiveTypesInForLoopSpace_after.java

@@ -0,0 +1,8 @@
+public class Foooo {
+
+    {
+        int intaaaa;
+        for (int <caret>)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn.java

@@ -0,0 +1,8 @@
+public abstract class Zzza {
+
+    int foo() {
+        ret<caret>x
+    }
+
+
+}

java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn_after.java

@@ -0,0 +1,8 @@
+public abstract class Zzza {
+
+    int foo() {
+        return <caret>x
+    }
+
+
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lossyEncoding/Text.txt

@@ -1 +1 @@
-abcd
+abcd<caret>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeExtendsToImplements/after7.java

@@ -0,0 +1,9 @@
+// "Change 'implements b' to 'extends b'" "true"
+class a extends b<C.D> {
+}
+
+class b<T> {}
+
+class C {
+  static class D {}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeExtendsToImplements/before7.java

@@ -0,0 +1,9 @@
+// "Change 'implements b' to 'extends b'" "true"
+class a implements <caret>b<C.D> {
+}
+
+class b<T> {}
+
+class C {
+  static class D {}
+}

java/java-tests/testData/codeInsight/nullityinferrer/afterAssertParamNotNull.java

@@ -0,0 +1,14 @@
+import org.jetbrains.annotations.NotNull;
+
+class Test {
+  @NotNull
+  public String noNull(@NotNull String text) {
+    assert text != null;
+    return "";
+  }
+
+  private void foo() {
+    @NotNull String str = "";
+    assert str != null;
+  }
+}

java/java-tests/testData/codeInsight/nullityinferrer/afterConditionalReturnNotNull.java

@@ -0,0 +1,9 @@
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class Test {
+    @NotNull
+    public  String noNull( @Nullable String text) {
+        return text == null ? "" : text;
+    }
+}

java/java-tests/testData/codeInsight/nullityinferrer/afterParameterCheckedForNull.java

@@ -1,37 +1,37 @@
-import org.jetbrains.annotations.*;
-
-class Test {
-  void bar(@Nullable String str) {
-    if (str == null) {
-      foo(str);
-    }
-  }
-
-  String foo(String str) {
-    return str;
-  }
-
-  @Nullable
-  String foo1(@Nullable String str) {
-    if (str == null);
-    return (str);
-  }
-
-  @NotNull
-  String foo2(@Nullable String str) {
-    if (str == null);
-    return ((String)str);
-  }
-
-  @Nullable
-  String fram(@Nullable String str, boolean b) {
-    if (str != null) {
-      return b ? str : "not null strimg";
-    }
-    return "str was null";
-  }
-
-
-
-
+import org.jetbrains.annotations.*;
+
+class Test {
+  void bar(@Nullable String str) {
+    if (str == null) {
+      foo(str);
+    }
+  }
+
+  String foo(String str) {
+    return str;
+  }
+
+  @Nullable
+  String foo1(@Nullable String str) {
+    if (str == null);
+    return (str);
+  }
+
+  @NotNull
+  String foo2(@Nullable String str) {
+    if (str == null);
+    return ((String)str);
+  }
+
+  @NotNull
+  String fram(@Nullable String str, boolean b) {
+    if (str != null) {
+      return b ? str : "not null strimg";
+    }
+    return "str was null";
+  }
+
+
+
+
 }

java/java-tests/testData/codeInsight/nullityinferrer/beforeAssertParamNotNull.java

@@ -0,0 +1,11 @@
+class Test {
+  public String noNull(String text) {
+    assert text != null;
+    return "";
+  }
+
+  private void foo() {
+    String str = "";
+    assert str != null;
+  }
+}

java/java-tests/testData/codeInsight/nullityinferrer/beforeConditionalReturnNotNull.java

@@ -0,0 +1,5 @@
+class Test {
+    public  String noNull( String text) {
+        return text == null ? "" : text;
+    }
+}