From 36926d9ad161a91b89316e3eaf86d4978406f9f9 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 7 Jul 2022 20:03:19 +0200 Subject: [PATCH] [light classes] move JavaElementFinder to light-classes-base module ^KT-53097 --- .../org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt | 5 ++--- .../jetbrains/kotlin/asJava/finder/JavaElementFinder.java | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename compiler/{light-classes => light-classes-base}/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt (98%) delete mode 100644 compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt b/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt similarity index 98% rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt rename to compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt index aacb1a538a0..cc73c8d358b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt +++ b/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt @@ -1,11 +1,10 @@ /* - * 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.asJava.finder -import com.google.common.collect.Sets import com.intellij.openapi.project.Project import com.intellij.openapi.util.Condition import com.intellij.psi.* @@ -105,7 +104,7 @@ class JavaElementFinder( val declarations = kotlinAsJavaSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope) - val answer = Sets.newHashSet() + val answer = hashSetOf() answer.addAll(kotlinAsJavaSupport.getFacadeNames(packageFQN, scope)) for (declaration in declarations) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java deleted file mode 100644 index e69de29bb2d..00000000000