From 26ca41142344c9b01f6649f8169bc459ef6d5379 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Mon, 10 Sep 2018 09:56:18 +0300
Subject: [PATCH] Minor: use common constant for `kotlin.Result`

---
 .../resolve/checkers/ResultClassInReturnTypeChecker.kt   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt
index 5d9aec6c7cf..aea3d6beb05 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt
@@ -5,19 +5,16 @@
 
 package org.jetbrains.kotlin.resolve.checkers
 
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.AnalysisFlag
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.types.KotlinType
 
 class ResultClassInReturnTypeChecker : DeclarationChecker {
-    companion object {
-        internal const val RESULT_NAME = "Result"
-    }
 
     override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) {
         if (context.languageVersionSettings.getFlag(AnalysisFlag.allowResultReturnType)) return
@@ -57,6 +54,6 @@ internal fun KotlinType.isResultType(): Boolean {
 private fun DeclarationDescriptor.isResultClass(): Boolean {
     val container = containingDeclaration ?: return false
     return container is PackageFragmentDescriptor &&
-            container.fqName == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME &&
-            name.asString() == ResultClassInReturnTypeChecker.RESULT_NAME
+            container.fqName == DescriptorUtils.RESULT_FQ_NAME.parent() &&
+            name == DescriptorUtils.RESULT_FQ_NAME.shortName()
 }