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

Change Variable Mutability Quick-Fix: Forbid on non-primary-constructor parameters

Browse Source 
#KT-10601 Fixed
This commit is contained in:
Alexey Sedunov
2016-01-11 15:22:45 +03:00
parent 5a108c5cde
commit 73233b2e90
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
+4 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
class ChangeVariableMutabilityFix(element: KtNamedDeclaration, private val makeVar: Boolean) : KotlinQuickFixAction<KtNamedDeclaration>(element) { class ChangeVariableMutabilityFix(element: KtNamedDeclaration, private val makeVar: Boolean) : KotlinQuickFixAction<KtNamedDeclaration>(element) {
@@ -35,7 +36,9 @@ class ChangeVariableMutabilityFix(element: KtNamedDeclaration, private val makeV
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean { override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
return when (element) { return when (element) {
is KtProperty -> element.isVar != makeVar is KtProperty -> element.isVar != makeVar
is KtParameter -> (element.valOrVarKeyword == KtTokens.VAR_KEYWORD) != makeVar is KtParameter ->
element.getStrictParentOfType<KtPrimaryConstructor>()?.valueParameterList == element.parent
&& (element.valOrVarKeyword == KtTokens.VAR_KEYWORD) != makeVar
else -> false else -> false
} }
} }
idea/testData/quickfix/variables/changeMutability/funParameter.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// "Make variable mutable" "false"
// ERROR: Val cannot be reassigned
fun fun1(i: Int) {
<caret>i = 2
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+6
View File
@@ -7460,6 +7460,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
} }
@TestMetadata("funParameter.kt")
public void testFunParameter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/funParameter.kt");
doTest(fileName);
}
@TestMetadata("localInGetter.kt") @TestMetadata("localInGetter.kt")
public void testLocalInGetter() throws Exception { public void testLocalInGetter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/localInGetter.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/localInGetter.kt");