From 79e776e9d7e5d9c015cab98a07a7e113bce78766 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 10 Jul 2018 13:48:17 +0300 Subject: [PATCH] Drop KtImportsFactory as it became unused after previous commit --- .../kotlin/resolve/lazy/FileScopeFactory.kt | 3 - .../kotlin/resolve/lazy/ResolveSession.java | 11 ---- .../kotlin/psi/KtImportsFactory.java | 59 ------------------- .../org/jetbrains/kotlin/psi/KtPsiFactory.kt | 12 ---- 4 files changed, 85 deletions(-) delete mode 100644 compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt index 59419ea3bf3..ac3fd1255c9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt @@ -24,9 +24,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtImportDirective import org.jetbrains.kotlin.psi.KtImportInfo -import org.jetbrains.kotlin.psi.KtImportsFactory import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.scopes.* import org.jetbrains.kotlin.resolve.source.KotlinSourceElement @@ -43,7 +41,6 @@ class FileScopeFactory( private val moduleDescriptor: ModuleDescriptor, private val qualifiedExpressionResolver: QualifiedExpressionResolver, private val bindingTrace: BindingTrace, - private val ktImportsFactory: KtImportsFactory, private val platformToKotlinClassMap: PlatformToKotlinClassMap, private val targetPlatform: TargetPlatform, private val languageVersionSettings: LanguageVersionSettings, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index 51748dcf81e..ee2589dae6d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -69,7 +69,6 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { private final MemoizedFunctionToNotNull fileAnnotations; private final MemoizedFunctionToNotNull danglingAnnotations; - private KtImportsFactory jetImportFactory; private AnnotationResolver annotationResolver; private DescriptorResolver descriptorResolver; private FunctionDescriptorResolver functionDescriptorResolver; @@ -87,11 +86,6 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { private final SyntheticResolveExtension syntheticResolveExtension; - @Inject - public void setJetImportFactory(KtImportsFactory jetImportFactory) { - this.jetImportFactory = jetImportFactory; - } - @Inject public void setAnnotationResolve(AnnotationResolver annotationResolver) { this.annotationResolver = annotationResolver; @@ -380,11 +374,6 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { } } - @NotNull - public KtImportsFactory getJetImportsFactory() { - return jetImportFactory; - } - @Override @NotNull public AnnotationResolver getAnnotationResolver() { diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java deleted file mode 100644 index fa5bfbe4562..00000000000 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtImportsFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2010-2015 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. - */ - -package org.jetbrains.kotlin.psi; - -import com.intellij.openapi.project.Project; -import kotlin.collections.CollectionsKt; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.resolve.ImportPath; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -public class KtImportsFactory { - @NotNull private final Project project; - - private final Map importsCache = new HashMap<>(); - - public KtImportsFactory(@NotNull Project project) { - this.project = project; - } - - @NotNull - private KtImportDirective createImportDirective(@NotNull ImportPath importPath) { - KtImportDirective directive = importsCache.get(importPath); - if (directive != null) { - return directive; - } - - KtImportDirective createdDirective = KtPsiFactoryKt.KtPsiFactory(project, false).createImportDirective(importPath); - importsCache.put(importPath, createdDirective); - - return createdDirective; - } - - @NotNull - public Collection createImportDirectives(@NotNull Collection importPaths) { - return CollectionsKt.map(importPaths, this::createImportDirective); - } - - @NotNull - public Collection createImportDirectivesNotCached(@NotNull Collection importPaths) { - return KtPsiFactoryKt.KtPsiFactory(project, false).createImportDirectives(importPaths); - } -} diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt index 443b31ce826..fd240126c61 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt @@ -437,18 +437,6 @@ class KtPsiFactory @JvmOverloads constructor(private val project: Project, val m } } - fun createImportDirectives(paths: Collection): List { - val fileContent = buildString { - for (path in paths) { - appendImport(path) - append('\n') - } - } - - val file = createFile(fileContent) - return file.importDirectives - } - fun createPrimaryConstructor(text: String = ""): KtPrimaryConstructor { return createClass(if (text.isNotEmpty()) "class A $text" else "class A()").primaryConstructor!! }