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

"field" reassignment: fix and test

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-16 12:05:44 +03:00
parent 9f640b00d9
commit 9939f96c09
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+6 -2
View File
@@ -47,6 +47,7 @@ import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges;
import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
import org.jetbrains.kotlin.diagnostics.Errors;
@@ -400,8 +401,11 @@ public class JetFlowInformationProvider {
@NotNull Collection<VariableDescriptor> varWithValReassignErrorGenerated
) {
VariableDescriptor variableDescriptor = ctxt.variableDescriptor;
if (JetPsiUtil.isBackingFieldReference(expression) && variableDescriptor instanceof PropertyDescriptor) {
PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor;
if (variableDescriptor instanceof SyntheticFieldDescriptor
|| (JetPsiUtil.isBackingFieldReference(expression) && variableDescriptor instanceof PropertyDescriptor)) {
PropertyDescriptor propertyDescriptor = variableDescriptor instanceof SyntheticFieldDescriptor
? ((SyntheticFieldDescriptor) variableDescriptor).getPropertyDescriptor()
: (PropertyDescriptor) variableDescriptor;
JetPropertyAccessor accessor = PsiTreeUtil.getParentOfType(expression, JetPropertyAccessor.class);
if (accessor != null) {
DeclarationDescriptor accessorDescriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, accessor);
compiler/testData/diagnostics/tests/backingField/FieldReassignment.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
val my: Int = 1
get() {
field++
return field
}
compiler/testData/diagnostics/tests/backingField/FieldReassignment.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public val my: kotlin.Int = 1
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+6
View File
@@ -1362,6 +1362,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("FieldReassignment.kt")
public void testFieldReassignment() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldReassignment.kt");
doTest(fileName);
}
@TestMetadata("FieldShadow.kt")
public void testFieldShadow() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldShadow.kt");