Import names from singleton but show CANNOT_IMPORT_ON_DEMAND_FROM_SINGLETON error

compiler/testData/diagnostics/tests/scopes/kt900-1.kt

@@ -6,7 +6,7 @@ import c.<!CANNOT_IMPORT_ON_DEMAND_FROM_SINGLETON!>M<!>.*
 
 fun foo() {
     val <!UNUSED_VARIABLE!>b<!>: B = B()
-    var <!UNUSED_VARIABLE!>r<!>: <!UNRESOLVED_REFERENCE!>R<!> = <!UNRESOLVED_REFERENCE!>R<!>()
+    var <!UNUSED_VARIABLE!>r<!>: R = R()
 }
 
 class A() {

compiler/testData/diagnostics/tests/scopes/kt900-2.kt

@@ -14,7 +14,7 @@ val y: T = Y
 fun f() {
     <!UNRESOLVED_REFERENCE!>bar<!>()
     R.bar()
-    <!UNRESOLVED_REFERENCE!>B<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo<!>()
+    B.foo()
 }
 
 object M {