inline local: don't enable short circuit when detecting refs/defs (IDEA-195332)

java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java

@@ -397,7 +397,7 @@ public class DefUseUtil {
 
     RefsDefs(@NotNull PsiCodeBlock body) throws AnalysisCanceledException {
       this.body = body;
-      flow = ControlFlowFactory.getInstance(body.getProject()).getControlFlow(body, ourPolicy);
+      flow = ControlFlowFactory.getInstance(body.getProject()).getControlFlow(body, ourPolicy, false, false);
       instructions = flow.getInstructions();
     }
 

java/java-tests/testData/refactoring/inlineLocal/DisableShortCircuit.java

@@ -0,0 +1,6 @@
+class MyTest {
+  {
+    int <caret>j = 0;
+    System.out.println(false ? j : 'x');
+  }
+}

java/java-tests/testData/refactoring/inlineLocal/DisableShortCircuit.java.after

@@ -0,0 +1,5 @@
+class MyTest {
+  {
+      System.out.println(false ? 0 : 'x');
+  }
+}

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

@@ -270,6 +270,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
     doTest(false);
   }
 
+  public void testDisableShortCircuit() {
+    doTest(false);
+  }
+
   public void testOperationPrecedenceWhenInlineToStringConcatenation() {
     doTest(false);
   }