From 4e4b1044888828e34281ac93c1f6c5f7ccdefdd4 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 14 Jun 2021 17:03:38 -0700 Subject: [PATCH] FIR/UAST: commonize expression list --- .../kotlin/expressions/KotlinUExpressionList.kt | 16 ++-------------- .../jetbrains/uast/kotlin/FirKotlinConverter.kt | 3 +++ 2 files changed, 5 insertions(+), 14 deletions(-) rename plugins/{uast-kotlin => uast-kotlin-base}/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt (60%) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt similarity index 60% rename from plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt rename to plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt index a59f8d3875a..51a9f0008a3 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt +++ b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * 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. + * Copyright 2010-2021 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. */ package org.jetbrains.uast.kotlin @@ -29,7 +18,6 @@ open class KotlinUExpressionList( givenParent: UElement? ) : KotlinAbstractUExpression(givenParent), UExpressionList, KotlinUElementWithType, KotlinEvaluatableUElement { override lateinit var expressions: List - internal set companion object { fun createClassBody(psi: PsiElement?, uastParent: UElement?): KotlinUExpressionList = diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt index 85ff539d130..ccf9b7479e7 100644 --- a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt +++ b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt @@ -194,6 +194,9 @@ internal object FirKotlinConverter : BaseKotlinConverter { return with(requiredTypes) { when (element) { + is KtClassBody -> { + el(build(KotlinUExpressionList.Companion::createClassBody)) + } is KtExpression -> { convertExpression(element, givenParent, requiredTypes) }