inline field: reuse cast etc from inline variable refactoring (IDEA-91150)

java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java

@@ -170,34 +170,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
   private void inlineExpressionUsage(PsiExpression expr,
                                      final PsiConstantEvaluationHelper evalHelper,
                                      PsiExpression initializer1) throws IncorrectOperationException {
-    while (expr.getParent() instanceof PsiArrayAccessExpression) {
-      PsiArrayAccessExpression arrayAccess = (PsiArrayAccessExpression)expr.getParent();
-      Object value = evalHelper.computeConstantExpression(arrayAccess.getIndexExpression());
-      if (value instanceof Integer) {
-        int intValue = ((Integer)value).intValue();
-        if (initializer1 instanceof PsiNewExpression) {
-          PsiExpression[] arrayInitializers = ((PsiNewExpression)initializer1).getArrayInitializer().getInitializers();
-          if (0 <= intValue && intValue < arrayInitializers.length) {
-            expr = (PsiExpression)expr.getParent();
-            initializer1 = normalize(arrayInitializers[intValue]);
-            continue;
-          }
-        }
-      }
-
-      break;
-    }
-
-    if (initializer1 instanceof PsiArrayInitializerExpression) {
-      final PsiType type = expr.getType();
-      if (type != null) {
-        initializer1 = (PsiExpression)initializer1.replace(
-          (PsiNewExpression)JavaPsiFacade.getInstance(expr.getProject()).getElementFactory()
-            .createExpressionFromText("new " + type.getCanonicalText() + initializer1.getText(), initializer1));
-      }
-    }
     myField.normalizeDeclaration();
-    ChangeContextUtil.encodeContextInfo(initializer1, true);
     if (expr instanceof PsiReferenceExpression) {
       PsiExpression qExpression = ((PsiReferenceExpression)expr).getQualifierExpression();
       if (qExpression != null) {
@@ -214,8 +187,8 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
         }
       }
     }
-    PsiElement element = expr.replace(initializer1);
-    ChangeContextUtil.decodeContextInfo(element, null, null);
+
+    InlineUtil.inlineVariable(myField, initializer1, (PsiJavaCodeReferenceElement)expr);
   }
 
   private static PsiExpression normalize(PsiExpression expression) {

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+  Runnable r = () -> {};
+  void foo() {
+    <caret>r.run();
+  }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Test {
+    void foo() {
+    ((Runnable) () -> {
+    }).run();
+  }
+}

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

@@ -31,6 +31,10 @@ public class InlineConstantFieldTest extends LightRefactoringTestCase {
     doTest();
   }
 
+  public void testCastWhenLambdaAsQualifier() throws Exception {
+    doTest();
+  }
+
   private void doTest() throws Exception {
     String name = getTestName(false);
     @NonNls String fileName = "/refactoring/inlineConstantField/" + name + ".java";