MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

duplicate

Browse Source
This commit is contained in:
Max Medvedev
2013-05-06 09:22:43 +04:00
parent b6f9640a91
commit 91e8ed6219
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SimplifyTernaryOperatorIntention.java
+14 -15
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 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.
@@ -40,7 +40,6 @@ public class SimplifyTernaryOperatorIntention extends Intention {
if (!(element instanceof GrConditionalExpression)) {
throw new IncorrectOperationException("Not invoked on a conditional");
}
GroovyPsiElementFactory groovyPsiElementFactory = GroovyPsiElementFactory.getInstance(project);
GrConditionalExpression condExp = (GrConditionalExpression)element;
GrExpression thenBranch = condExp.getThenBranch();
GrExpression elseBranch = condExp.getElseBranch();
@@ -53,13 +52,7 @@ public class SimplifyTernaryOperatorIntention extends Intention {
String conditionExpText = getStringToPutIntoOrExpression(conditionExp);
String elseExpText = getStringToPutIntoOrExpression(elseBranch);
String newExp = conditionExpText + "||" + elseExpText;
int caretOffset = conditionExpText.length() + 2; // after "||"
GrExpression expressionFromText = groovyPsiElementFactory.createExpressionFromText(newExp, condExp.getContext());
expressionFromText = (GrExpression)condExp.replace(expressionFromText);
editor.getCaretModel().moveToOffset(expressionFromText.getTextOffset() + caretOffset); // just past "||"
manageReplace(editor, condExp, conditionExpText, newExp);
return;
}
@@ -73,14 +66,20 @@ public class SimplifyTernaryOperatorIntention extends Intention {
String newExp = conditionExpText + "&&" + thenExpText;
int caretOffset = conditionExpText.length() + 2; // after "&&"
GrExpression expressionFromText = groovyPsiElementFactory.createExpressionFromText(newExp, condExp.getContext());
expressionFromText = (GrExpression)condExp.replace(expressionFromText);
editor.getCaretModel().moveToOffset(expressionFromText.getTextOffset() + caretOffset); // just past "&&"
manageReplace(editor, condExp, conditionExpText, newExp);
}
}
private static void manageReplace(Editor editor,
GrConditionalExpression condExp,
String conditionExpText, String newExp) {
int caretOffset = conditionExpText.length() + 2; // after operation sign
GrExpression expressionFromText = GroovyPsiElementFactory.getInstance(editor.getProject()).createExpressionFromText(newExp, condExp .getContext());
expressionFromText = (GrExpression)condExp.replace(expressionFromText);
editor.getCaretModel().moveToOffset(expressionFromText.getTextOffset() + caretOffset); // just past operation sign
}
/**