Drop KtImportsFactory as it became unused after previous commit

This commit is contained in:
Denis Zharkov
2018-07-10 13:48:17 +03:00
parent ec23695f77
commit 79e776e9d7
4 changed files with 0 additions and 85 deletions
@@ -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,
@@ -69,7 +69,6 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
private final MemoizedFunctionToNotNull<KtFile, LazyAnnotations> fileAnnotations;
private final MemoizedFunctionToNotNull<KtFile, LazyAnnotations> 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() {
@@ -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<ImportPath, KtImportDirective> 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<KtImportDirective> createImportDirectives(@NotNull Collection<ImportPath> importPaths) {
return CollectionsKt.map(importPaths, this::createImportDirective);
}
@NotNull
public Collection<KtImportDirective> createImportDirectivesNotCached(@NotNull Collection<ImportPath> importPaths) {
return KtPsiFactoryKt.KtPsiFactory(project, false).createImportDirectives(importPaths);
}
}
@@ -437,18 +437,6 @@ class KtPsiFactory @JvmOverloads constructor(private val project: Project, val m
}
}
fun createImportDirectives(paths: Collection<ImportPath>): List<KtImportDirective> {
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!!
}