From 260db2fa65c101b64736d6fc012303319f5958b7 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Thu, 16 Nov 2023 15:13:46 +0100 Subject: [PATCH] [Web] Refactor: Move FirWebCommonExternalChecker to appropriate place Move it from gen/ to src/ and fix the package name --- .../analysis/js/checkers/declaration/FirJsExternalChecker.kt | 3 +-- .../wasm/checkers/declaration/FirWasmExternalChecker.kt | 2 +- .../checkers/declaration}/FirWebCommonExternalChecker.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename compiler/fir/checkers/checkers.web.common/{gen/org/jetbrains/kotlin/fir/analysis/web/common => src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/declaration}/FirWebCommonExternalChecker.kt (99%) diff --git a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsExternalChecker.kt b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsExternalChecker.kt index d7b4d339a41..25eed49b447 100644 --- a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsExternalChecker.kt +++ b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsExternalChecker.kt @@ -23,13 +23,12 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyBackingField import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.analysis.js.checkers.isNativeObject import org.jetbrains.kotlin.fir.analysis.js.checkers.superClassNotAny -import org.jetbrains.kotlin.fir.analysis.web.common.FirWebCommonExternalChecker +import org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration.FirWebCommonExternalChecker import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.JsStandardClassIds import org.jetbrains.kotlin.name.JsStandardClassIds.Annotations.JsNative -import org.jetbrains.kotlin.name.WasmStandardClassIds import org.jetbrains.kotlin.psi.KtParameter object FirJsExternalChecker : FirWebCommonExternalChecker() { diff --git a/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/declaration/FirWasmExternalChecker.kt b/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/declaration/FirWasmExternalChecker.kt index 1dd68976195..2aff68e1b6b 100644 --- a/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/declaration/FirWasmExternalChecker.kt +++ b/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/declaration/FirWasmExternalChecker.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors -import org.jetbrains.kotlin.fir.analysis.web.common.FirWebCommonExternalChecker +import org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration.FirWebCommonExternalChecker import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol diff --git a/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/web/common/FirWebCommonExternalChecker.kt b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/declaration/FirWebCommonExternalChecker.kt similarity index 99% rename from compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/web/common/FirWebCommonExternalChecker.kt rename to compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/declaration/FirWebCommonExternalChecker.kt index e19cdd78b32..9dc94ad75ce 100644 --- a/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/web/common/FirWebCommonExternalChecker.kt +++ b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/declaration/FirWebCommonExternalChecker.kt @@ -3,7 +3,7 @@ * 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.kotlin.fir.analysis.web.common +package org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration import org.jetbrains.kotlin.* import org.jetbrains.kotlin.descriptors.ClassKind