From 589094377e952f88bea68d301897e81a8af8af60 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 26 Sep 2019 18:13:52 +0700 Subject: [PATCH] QualifiedExpressionResolver: change root prefix from `_Qfadj4tPV` to `_root_ide_package_` --- .../jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt | 4 ++-- idea/testData/shortenRefs/PropertyFunctionConflict.kt | 2 +- idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index 9fc3c4fbdb8..80a284c3639 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -789,11 +789,11 @@ class QualifiedExpressionResolver(val languageVersionSettings: LanguageVersionSe * * fun test(a: Any) { * a.A() // invalid code -> incorrect import/completion/etc. - * _Qfadj4tPV.a.A() // OK + * _root_ide_package_.a.A() // OK * } * --------- */ - const val ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE = "_Qfadj4tPV" + const val ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE = "_root_ide_package_" const val ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE_WITH_DOT = "$ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE." } } diff --git a/idea/testData/shortenRefs/PropertyFunctionConflict.kt b/idea/testData/shortenRefs/PropertyFunctionConflict.kt index ca6b8ec341e..e2229854d2d 100644 --- a/idea/testData/shortenRefs/PropertyFunctionConflict.kt +++ b/idea/testData/shortenRefs/PropertyFunctionConflict.kt @@ -2,6 +2,6 @@ package a class Goo { fun x() { - _Qfadj4tPV.a.b.foo() + _root_ide_package_.a.b.foo() } } \ No newline at end of file diff --git a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt index 6c5bb0ab497..ab739bdbf36 100644 --- a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt +++ b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt @@ -1,3 +1,3 @@ -fun f(s: _Qfadj4tPV.same.same) { +fun f(s: _root_ide_package_.same.same) { } \ No newline at end of file