inline field: preserve context for diamonds (IDEA-158604)

java/java-tests/testData/refactoring/inlineConstantField/DiamondInitializer.java

@@ -0,0 +1,10 @@
+import java.util.HashMap;
+import java.util.Map;
+
+final class Foo {
+  private Map<String, Object> map = new HashMap<>();
+
+  private Map<String, Object> getMap() {
+    return m<caret>ap;
+  }
+}

java/java-tests/testData/refactoring/inlineConstantField/DiamondInitializer.java.after

@@ -0,0 +1,9 @@
+import java.util.HashMap;
+import java.util.Map;
+
+final class Foo {
+
+    private Map<String, Object> getMap() {
+    return new HashMap<>();
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java

@@ -42,6 +42,10 @@ public class InlineConstantFieldTest extends LightRefactoringTestCase {
     doTest();
   }
 
+  public void testDiamondInitializer() throws Exception {
+    doTest();
+  }
+
   public void testMultipleInitializers() throws Exception {
     configureByFile("/refactoring/inlineConstantField/" + getTestName(false) + ".java");
     PsiElement element = TargetElementUtil