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

Don't add primary constructors parameters for properties

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-19 20:14:50 +04:00
parent bf2cc99109
commit 4b5a192e4c
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+4 -1
View File
@@ -245,7 +245,10 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEnti
WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, primaryConstructor, RedeclarationHandler.DO_NOTHING, "Scope with constructor parameters in " + getName());
for (ValueParameterDescriptor valueParameterDescriptor : primaryConstructor.getValueParameters()) {
scope.addVariableDescriptor(valueParameterDescriptor);
JetParameter jetParameter = originalClassInfo.getPrimaryConstructorParameters().get(valueParameterDescriptor.getIndex());
if (jetParameter.getValOrVarNode() == null) {
scope.addVariableDescriptor(valueParameterDescriptor);
}
}
scope.changeLockLevel(WritableScope.LockLevel.READING);
compiler/testData/diagnostics/tests/UninitializedOrReassignedVariables.kt → compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
View File
compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt
+5
View File
@@ -0,0 +1,5 @@
class AnonymousInitializers(var a: String) {
{
a = "s"
}
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+10 -5
View File
@@ -459,11 +459,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.kt");
}
@TestMetadata("UninitializedOrReassignedVariables.kt")
public void testUninitializedOrReassignedVariables() throws Exception {
doTest("compiler/testData/diagnostics/tests/UninitializedOrReassignedVariables.kt");
}
@TestMetadata("UnitByDefaultForFunctionTypes.kt")
public void testUnitByDefaultForFunctionTypes() throws Exception {
doTest("compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.kt");
@@ -1683,11 +1678,21 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.kt");
}
@TestMetadata("scopeOfAnonymousInitializer.kt")
public void testScopeOfAnonymousInitializer() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt");
}
@TestMetadata("uninitializedInLocalDeclarations.kt")
public void testUninitializedInLocalDeclarations() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.kt");
}
@TestMetadata("UninitializedOrReassignedVariables.kt")
public void testUninitializedOrReassignedVariables() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt");
}
@TestMetadata("unreachableCode.kt")
public void testUnreachableCode() throws Exception {
doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/unreachableCode.kt");