From 478b18e37618daacf33d0602f8cb76129f5e6c47 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 27 Apr 2015 15:13:44 +0200 Subject: [PATCH] remove two final occurrences of 'class object' from testdata --- compiler/testData/resolve/ClassObjects.resolve | 2 +- .../testData/hierarchy/calls/callees/kotlinClassObject/main0.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/testData/resolve/ClassObjects.resolve b/compiler/testData/resolve/ClassObjects.resolve index 014390cdace..698bd8c0d9d 100644 --- a/compiler/testData/resolve/ClassObjects.resolve +++ b/compiler/testData/resolve/ClassObjects.resolve @@ -1,7 +1,7 @@ package Jet86 class A { - class ~A~object { + companion ~A~object { ~A.x~val x = 1 } } diff --git a/idea/testData/hierarchy/calls/callees/kotlinClassObject/main0.kt b/idea/testData/hierarchy/calls/callees/kotlinClassObject/main0.kt index 889011598e9..4701f06add7 100644 --- a/idea/testData/hierarchy/calls/callees/kotlinClassObject/main0.kt +++ b/idea/testData/hierarchy/calls/callees/kotlinClassObject/main0.kt @@ -12,7 +12,7 @@ open class KClientBase { } class KClient: KClientBase() { - class object { + companion object { val bar = run { val localVal = packageFun("")