From 9b87dcbeaed29f943680727b84b04e49a1634589 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Fri, 21 Jan 2022 14:05:40 +0300 Subject: [PATCH] [FIR JS] Move FirInvalidAndDangerousCharactersChecker to checkers.jvm This is a JVM-specific checker. --- .../fir/analysis/jvm/checkers/JvmDeclarationCheckers.kt | 1 + .../FirJvmInvalidAndDangerousCharactersChecker.kt} | 7 ++++--- .../fir/analysis/checkers/CommonDeclarationCheckers.kt | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) rename compiler/fir/checkers/{src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt => checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmInvalidAndDangerousCharactersChecker.kt} (90%) diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/JvmDeclarationCheckers.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/JvmDeclarationCheckers.kt index 98c77cced03..80d7c89ad99 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/JvmDeclarationCheckers.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/JvmDeclarationCheckers.kt @@ -17,6 +17,7 @@ object JvmDeclarationCheckers : DeclarationCheckers() { FirJvmFunctionDelegateMemberNameClashChecker, FirJvmStaticChecker, FirRepeatableAnnotationChecker, + FirJvmInvalidAndDangerousCharactersChecker, ) override val classCheckers: Set diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmInvalidAndDangerousCharactersChecker.kt similarity index 90% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt rename to compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmInvalidAndDangerousCharactersChecker.kt index 55026645338..5f467c1d527 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmInvalidAndDangerousCharactersChecker.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.kotlin.fir.analysis.checkers.declaration +package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement @@ -11,10 +11,11 @@ import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.diagnostics.reportOn +import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.name.Name -object FirInvalidAndDangerousCharactersChecker : FirBasicDeclarationChecker() { +object FirJvmInvalidAndDangerousCharactersChecker : FirBasicDeclarationChecker() { // See The Java Virtual Machine Specification, section 4.7.9.1 https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.9.1 private val INVALID_CHARS = setOf('.', ';', '[', ']', '/', '<', '>', ':', '\\') diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonDeclarationCheckers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonDeclarationCheckers.kt index b5a9a298716..1444472b2e0 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonDeclarationCheckers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/CommonDeclarationCheckers.kt @@ -27,7 +27,6 @@ object CommonDeclarationCheckers : DeclarationCheckers() { FirExposedVisibilityDeclarationChecker, FirCyclicTypeBoundsChecker, FirExpectActualDeclarationChecker, - FirInvalidAndDangerousCharactersChecker, FirAmbiguousAnonymousTypeChecker, FirExplicitApiDeclarationChecker, FirAnnotationChecker,