azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better code for change variable mutability fix

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-07-10 15:53:27 +04:00
parent b983a0eaa0
commit 2df60a27c8
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
+4 -7
View File
@@ -37,7 +37,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
public class ChangeVariableMutabilityFix implements IntentionAction { public class ChangeVariableMutabilityFix implements IntentionAction {
private boolean isVar; private boolean isVar;
public ChangeVariableMutabilityFix(boolean isVar) { public ChangeVariableMutabilityFix(boolean isVar) {
this.isVar = isVar; this.isVar = isVar;
} }
@@ -45,7 +45,7 @@ public class ChangeVariableMutabilityFix implements IntentionAction {
public ChangeVariableMutabilityFix() { public ChangeVariableMutabilityFix() {
this(false); this(false);
} }
@NotNull @NotNull
@Override @Override
public String getText() { public String getText() {
@@ -86,11 +86,8 @@ public class ChangeVariableMutabilityFix implements IntentionAction {
@Override @Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
JetProperty property = getCorrespondingProperty(editor, (JetFile)file); JetProperty property = getCorrespondingProperty(editor, (JetFile)file);
assert property != null && !property.isVar(); assert property != null;
property.getValOrVarNode().getPsi().replace(JetPsiFactory.createValOrVarNode(project, isVar ? "val" : "var").getPsi());
JetProperty newElement = JetPsiFactory.createProperty(project, property.getText().replaceFirst(
property.isVar() ? "var" : "val", property.isVar() ? "val" : "var"));
property.replace(newElement);
} }
@Override @Override
idea/testData/quickfix/variables/changeMutability/afterValWithSetter.kt
+1 -2
View File
@@ -1,6 +1,5 @@
// "Make variable mutable" "true" // "Make variable mutable" "true"
class A() { class A() {
var a: Int = 0 var a: Int = 0
set(v: Int) { set(v: Int) {}
}
} }