MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

restore intention place; fix tests

Browse Source
This commit is contained in:
anna
2012-07-18 17:31:32 +02:00
parent 28230348a2
commit 673cc81da2
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-impl/src/com/intellij/codeInsight/intention/impl/PushConditionInCallAction.java
View File

@@ -39,6 +39,7 @@ public class PushConditionInCallAction extends PsiElementBaseIntentionAction {
if (element instanceof PsiCompiledElement) return false;
if (!element.getManager().isInProject(element)) return false;
if (!(element instanceof PsiJavaToken && ((PsiJavaToken)element).getTokenType() == JavaTokenType.QUEST)) return false;
final PsiConditionalExpression conditionalExpression = PsiTreeUtil.getParentOfType(element, PsiConditionalExpression.class);
if (conditionalExpression == null) return false;
final PsiExpression thenExpression = conditionalExpression.getThenExpression();
@@ -74,7 +75,7 @@ public class PushConditionInCallAction extends PsiElementBaseIntentionAction {
}
}
}
setText("Push condition '" + conditionalExpression.getCondition().getText() + "' inside " +
setText("Push condition '" + conditionalExpression.getCondition().getText() + "' inside " +
(thenMethod.isConstructor() ? "constructor" : "method") + " call");
return true;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/pushConditionInCall/after1.java
View File

@@ -1,4 +1,4 @@
// "Push condition b inside method call" "true"
// "Push condition 'b' inside method call" "true"
class Foo {
void bar(boolean b){
String s = foo(b ? "true" : "false");

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/pushConditionInCall/before1.java
View File

@@ -1,4 +1,4 @@
// "Push condition b inside method call" "true"
// "Push condition 'b' inside method call" "true"
class Foo {
void bar(boolean b){
String s = b <caret>? foo("true") : foo("false");

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/pushConditionInCall/beforeDifferentMethods.java
View File

@@ -1,4 +1,4 @@
// "Push condition b inside method call" "false"
// "Push condition 'b' inside method call" "false"
class Foo {
void bar(boolean b){
String s = b <caret>? foo("true") : foo(false);

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/pushConditionInCall/beforeMultipleArgs.java
View File

@@ -1,4 +1,4 @@
// "Push condition b inside method call" "false"
// "Push condition 'b' inside method call" "false"
class Foo {
void bar(boolean b){
String s = b <caret>? foo("true", true) : foo("false", false);