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

IDEA-111193: Add field to script and initialize it in script body

Browse Source
This commit is contained in:
Max Medvedev
2013-08-21 14:42:42 +04:00
parent d05b56ca90
commit efe063e7db
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldProcessor.java
+9 -8
View File
@@ -41,6 +41,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEn
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMember;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMembersDeclaration;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.util.GrStatementOwner;
import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
@@ -181,10 +182,10 @@ public class GrIntroduceFieldProcessor {
final PsiElement place = context.getPlace();
final GrMember member = GrIntroduceFieldHandler.getContainer(place, scope);
LOG.assertTrue(member != null);
GrOpenBlock container = member instanceof GrMethod? ((GrMethod)member).getBlock():
member instanceof GrClassInitializer ? ((GrClassInitializer)member).getBlock():
null;
GrStatementOwner container = member instanceof GrMethod ? ((GrMethod)member).getBlock() :
member instanceof GrClassInitializer ? ((GrClassInitializer)member).getBlock() :
place.getContainingFile() instanceof GroovyFile ? ((GroovyFile)place.getContainingFile()) :
null;
assert container != null;
final GrStatement anchor;
@@ -241,16 +242,16 @@ public class GrIntroduceFieldProcessor {
private void generateAssignment(GrVariable field,
@Nullable GrStatement anchor,
GrCodeBlock defaultContainer) {
GrStatementOwner defaultContainer) {
final GrExpression initializer = getInitializer();
GrAssignmentExpression init = (GrAssignmentExpression)GroovyPsiElementFactory.getInstance(context.getProject())
.createExpressionFromText(settings.getName() + " = " + initializer.getText());
GrCodeBlock block;
GrStatementOwner block;
if (anchor != null) {
anchor = GroovyRefactoringUtil.addBlockIntoParent(anchor);
LOG.assertTrue(anchor.getParent() instanceof GrCodeBlock);
block = (GrCodeBlock)anchor.getParent();
LOG.assertTrue(anchor.getParent() instanceof GrStatementOwner);
block = (GrStatementOwner)anchor.getParent();
}
else {
block = defaultContainer;