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

Fix blinking test

Browse Source
This commit is contained in:
Stanislav Erokhin
2014-12-02 14:23:58 +03:00
parent aa97bb8cfc
commit fc70c416ed
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
@NotNull @NotNull
public Map<JetCallableDeclaration, CallableMemberDescriptor> getMembers() { public Map<JetCallableDeclaration, CallableMemberDescriptor> getMembers() {
if (members == null) { if (members == null) {
members = Maps.newHashMap(); members = Maps.newLinkedHashMap();
members.putAll(functions); members.putAll(functions);
members.putAll(properties); members.putAll(properties);
members.putAll(primaryConstructorParameterProperties); members.putAll(primaryConstructorParameterProperties);
compiler/testData/diagnostics/tests/regressions/Jet81.kt
+2 -2
View File
@@ -18,10 +18,10 @@ class Test2 {
{ {
<!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1
} }
val x = <!UNINITIALIZED_VARIABLE, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> val x = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>b<!>
val y = 1 val y = 1
} }
val b = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> val b = a.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>
val c = a.y val c = a.y
} }
compiler/testData/diagnostics/tests/regressions/Jet81.txt
+1 -1
View File
@@ -28,7 +28,7 @@ internal final class Test {
internal final class Test2 { internal final class Test2 {
public constructor Test2() public constructor Test2()
private final val a: Test2.<init>.<no name provided> private final val a: Test2.<init>.<no name provided>
internal final val b: [ERROR : <ERROR PROPERTY TYPE>] internal final val b: [ERROR : Type for b]
internal final val c: kotlin.Int = 1 internal final val c: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int