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

Change to backing field fix is dropped because of deprecated syntax

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-09 16:22:15 +03:00
parent cf7146aaf7
commit 5117f744f7
7 changed files with 0 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToBackingFieldFix.java
-73
View File
@@ -1,73 +0,0 @@
/*
* Copyright 2010-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.quickfix;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeToBackingFieldFix extends JetIntentionAction<JetSimpleNameExpression> {
public ChangeToBackingFieldFix(@NotNull JetSimpleNameExpression element) {
super(element);
}
@NotNull
@Override
public String getText() {
return JetBundle.message("change.to.backing.field");
}
@NotNull
@Override
public String getFamilyName() {
return JetBundle.message("change.to.backing.field");
}
@Override
public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException {
JetSimpleNameExpression backingField = (JetSimpleNameExpression) JetPsiFactory(file).createExpression("$" + element.getText());
element.replace(backingField);
}
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetSimpleNameExpression> createAction(Diagnostic diagnostic) {
JetSimpleNameExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetSimpleNameExpression.class);
if (expression == null) {
PsiElement element = diagnostic.getPsiElement();
if (element instanceof JetQualifiedExpression && ((JetQualifiedExpression) element).getReceiverExpression() instanceof JetThisExpression) {
JetExpression selector = ((JetQualifiedExpression) element).getSelectorExpression();
if (selector instanceof JetSimpleNameExpression) {
expression = (JetSimpleNameExpression) selector;
}
}
}
if (expression == null) return null;
return new ChangeToBackingFieldFix(expression);
}
};
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
-4
View File
@@ -123,10 +123,6 @@ public class QuickFixRegistrar : QuickFixContributor {
WRONG_MODIFIER_CONTAINING_DECLARATION.registerFactory(removeModifierFactory)
REPEATED_MODIFIER.registerFactory(removeModifierFactory)
val changeToBackingFieldFactory = ChangeToBackingFieldFix.createFactory()
INITIALIZATION_USING_BACKING_FIELD_CUSTOM_SETTER.registerFactory(changeToBackingFieldFactory)
INITIALIZATION_USING_BACKING_FIELD_OPEN_SETTER.registerFactory(changeToBackingFieldFactory)
val changeToPropertyNameFactory = ChangeToPropertyNameFix.createFactory()
NO_BACKING_FIELD_ABSTRACT_PROPERTY.registerFactory(changeToPropertyNameFactory)
NO_BACKING_FIELD_CUSTOM_ACCESSORS.registerFactory(changeToPropertyNameFactory)
idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Change reference to backing field" "true"
class A() {
var a : Int
set(v) {}
init {
<caret>a = 1
}
}
idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Change reference to backing field" "true"
class A() {
var a : Int
set(v) {}
init {
<caret>$a = 1
}
}
idea/testData/quickfix/variables/changeToBackingField/kt510.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Change reference to backing field" "true"
public open class Identifier() {
var field : Boolean
set(v) {}
init {
<caret>this.field = false;
}
}
idea/testData/quickfix/variables/changeToBackingField/kt510.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Change reference to backing field" "true"
public open class Identifier() {
var field : Boolean
set(v) {}
init {
<caret>this.$field = false;
}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
-21
View File
@@ -6687,27 +6687,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
}
}
@TestMetadata("idea/testData/quickfix/variables/changeToBackingField")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class ChangeToBackingField extends AbstractQuickFixTest {
public void testAllFilesPresentInChangeToBackingField() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("bFRequired.kt")
public void testBFRequired() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt");
doTest(fileName);
}
@TestMetadata("kt510.kt")
public void testKt510() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/kt510.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)