Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/template/postfix/templates/var/add_after.java

@@ -1,5 +1,5 @@
 public class Foo {
     void m(Object o) {
-        int foo = 1;<caret>
+        int <caret>foo = 1;
     }
 }

java/java-tests/testData/codeInsight/template/postfix/templates/var/anonymous.java

@@ -0,0 +1,7 @@
+public class Foo {
+    void m() {
+        foo(new Runnable() {public void run()}.var<caret>);
+    }
+
+    void foo(Runnable r) {}
+}

java/java-tests/testData/codeInsight/template/postfix/templates/var/anonymous_after.java

@@ -0,0 +1,9 @@
+public class Foo {
+    void m() {
+        Runnable foo = new Runnable() {
+            public void run()
+        }; foo(foo);
+    }
+
+    void foo(Runnable r) {}
+}

java/java-tests/testData/codeInsight/template/postfix/templates/var/simple_after.java

@@ -1,5 +1,5 @@
 public class Foo {
     void m(Object o) {
-        boolean foo = o instanceof String;<caret>
+        boolean <caret>foo = o instanceof String;
     }
 }