extractionModel: cleanup code

This commit is contained in:
Dmitry Gridin
2019-08-13 20:21:00 +07:00
parent fcff9a43b4
commit bd5476082b
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias package org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias
@@ -33,12 +22,12 @@ import org.jetbrains.kotlin.types.KotlinType
class TypeReferenceInfo(val reference: KtTypeReference, val type: KotlinType) class TypeReferenceInfo(val reference: KtTypeReference, val type: KotlinType)
internal var KtTypeReference.resolveInfo : TypeReferenceInfo? by CopyablePsiUserDataProperty(Key.create("RESOLVE_INFO")) internal var KtTypeReference.resolveInfo: TypeReferenceInfo? by CopyablePsiUserDataProperty(Key.create("RESOLVE_INFO"))
class IntroduceTypeAliasData( class IntroduceTypeAliasData(
val originalTypeElement: KtElement, val originalTypeElement: KtElement,
val targetSibling: PsiElement, val targetSibling: PsiElement,
val extractTypeConstructor: Boolean = false val extractTypeConstructor: Boolean = false
) : Disposable { ) : Disposable {
val resolutionFacade = originalTypeElement.getResolutionFacade() val resolutionFacade = originalTypeElement.getResolutionFacade()
val bindingContext = resolutionFacade.analyze(originalTypeElement, BodyResolveMode.PARTIAL) val bindingContext = resolutionFacade.analyze(originalTypeElement, BodyResolveMode.PARTIAL)
@@ -52,9 +41,9 @@ class IntroduceTypeAliasData(
override fun visitTypeReference(typeReference: KtTypeReference) { override fun visitTypeReference(typeReference: KtTypeReference) {
val typeElement = typeReference.typeElement ?: return val typeElement = typeReference.typeElement ?: return
val kotlinType = bindingContext[BindingContext.ABBREVIATED_TYPE, typeReference] ?: val kotlinType = bindingContext[BindingContext.ABBREVIATED_TYPE, typeReference]
bindingContext[BindingContext.TYPE, typeReference] ?: ?: bindingContext[BindingContext.TYPE, typeReference]
return ?: return
typeReference.resolveInfo = TypeReferenceInfo(typeReference, kotlinType) typeReference.resolveInfo = TypeReferenceInfo(typeReference, kotlinType)
typeElement.typeArgumentsAsTypes.forEach { it?.accept(this) } typeElement.typeArgumentsAsTypes.forEach { it?.accept(this) }
@@ -72,13 +61,13 @@ class IntroduceTypeAliasData(
data class TypeParameter(val name: String, val typeReferenceInfos: Collection<TypeReferenceInfo>) data class TypeParameter(val name: String, val typeReferenceInfos: Collection<TypeReferenceInfo>)
data class IntroduceTypeAliasDescriptor( data class IntroduceTypeAliasDescriptor(
val originalData: IntroduceTypeAliasData, val originalData: IntroduceTypeAliasData,
val name: String, val name: String,
val visibility: KtModifierKeywordToken?, val visibility: KtModifierKeywordToken?,
val typeParameters: List<TypeParameter> val typeParameters: List<TypeParameter>
) )
data class IntroduceTypeAliasDescriptorWithConflicts( data class IntroduceTypeAliasDescriptorWithConflicts(
val descriptor: IntroduceTypeAliasDescriptor, val descriptor: IntroduceTypeAliasDescriptor,
val conflicts: MultiMap<PsiElement, String> val conflicts: MultiMap<PsiElement, String>
) )