EA-53504 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText

java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java

@@ -119,15 +119,13 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction {
       statement = (PsiExpressionStatement)CodeStyleManager.getInstance(project).reformat(statement);
       PsiAssignmentExpression assignment = (PsiAssignmentExpression)statement.getExpression();
       PsiExpression initializer = var.getInitializer();
-      PsiExpression rExpression;
-      if (initializer instanceof PsiArrayInitializerExpression) {
+      PsiExpression rExpression = initializer;
+      if (initializer instanceof PsiArrayInitializerExpression && var.getType() instanceof PsiArrayType) {
         rExpression = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createExpressionFromText(
           "new " + var.getTypeElement().getText() + " " + initializer.getText(), null
         );
       }
-      else {
-        rExpression = initializer;
-      }
+
       assignment.getRExpression().replace(rExpression);
       initializer.delete();
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration/afterNotArray.java

@@ -0,0 +1,7 @@
+// "Split into declaration and assignment" "true"
+class Test {
+  {
+    String l;
+      l = {"foo"};
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration/beforeNotArray.java

@@ -0,0 +1,6 @@
+// "Split into declaration and assignment" "true"
+class Test {
+  {
+    String l <caret>= {"foo"};
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/intention/SplitDeclarationTest.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2014 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.
+ */
+package com.intellij.codeInsight.intention;
+
+import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
+import com.intellij.codeInsight.intention.impl.SplitIfAction;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+
+public class SplitDeclarationTest extends LightQuickFixParameterizedTestCase {
+
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration";
+  }
+}