From 13ac64b84aae0a20af46f74f40f006e31c458693 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Apr 2018 15:27:45 +0300 Subject: [PATCH] Move parseFileUtils to incremental-compilation-impl --- .../org/jetbrains/kotlin/daemon/common/CompileService.kt | 1 - .../src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt | 2 +- .../kotlin/incremental/IncrementalCompilerRunner.kt | 2 +- .../jetbrains/kotlin/incremental/parsing}/parseFileUtils.kt | 6 ++++-- .../kotlin/incremental/parsing}/ClassesFqNamesTest.kt | 4 +--- 5 files changed, 7 insertions(+), 8 deletions(-) rename compiler/{psi/src/org/jetbrains/kotlin/parsing/util => incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/parsing}/parseFileUtils.kt (95%) rename compiler/{tests/org/jetbrains/kotlin/parsing/utils => incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/parsing}/ClassesFqNamesTest.kt (94%) diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt index 53df258a198..03eadd5825c 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.daemon.common import org.jetbrains.kotlin.cli.common.repl.* -import org.jetbrains.kotlin.parsing.util.classesFqNames import java.io.File import java.io.Serializable import java.rmi.Remote diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index c872b7483a1..b1a5a2d9543 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt @@ -49,9 +49,9 @@ import org.jetbrains.kotlin.daemon.report.DaemonMessageReporterPrintStreamAdapte import org.jetbrains.kotlin.daemon.report.RemoteICReporter import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.parsing.classesFqNames import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.Module -import org.jetbrains.kotlin.parsing.util.classesFqNames import org.jetbrains.kotlin.progress.CompilationCanceledStatus import java.io.BufferedOutputStream import java.io.ByteArrayOutputStream diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt index 655cccb118a..1d87fa6ae2a 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.incremental.components.ExpectActualTracker import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.multiproject.ArtifactChangesProvider import org.jetbrains.kotlin.incremental.multiproject.ChangesRegistry +import org.jetbrains.kotlin.incremental.parsing.classesFqNames import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.parsing.util.classesFqNames import org.jetbrains.kotlin.progress.CompilationCanceledStatus import java.io.File import java.util.* diff --git a/compiler/psi/src/org/jetbrains/kotlin/parsing/util/parseFileUtils.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/parsing/parseFileUtils.kt similarity index 95% rename from compiler/psi/src/org/jetbrains/kotlin/parsing/util/parseFileUtils.kt rename to compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/parsing/parseFileUtils.kt index 35d877db6d6..71e9e2ed8c5 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/parsing/util/parseFileUtils.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/parsing/parseFileUtils.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.parsing.util +package org.jetbrains.kotlin.incremental.parsing import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreProjectEnvironment @@ -80,7 +80,9 @@ private inline fun withPsiSetup(fn: PsiSetup.() -> T): T { val applicationEnvironment = CoreApplicationEnvironment(disposable, false) val projectEnvironment = CoreProjectEnvironment(disposable, applicationEnvironment) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java) - applicationEnvironment.registerApplicationService(ScriptDefinitionProvider::class.java, NoopScriptDefinitionProvider()) + applicationEnvironment.registerApplicationService(ScriptDefinitionProvider::class.java, + NoopScriptDefinitionProvider() + ) applicationEnvironment.registerFileType(KotlinFileType.INSTANCE, "kt") applicationEnvironment.registerParserDefinition(KotlinParserDefinition()) diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/utils/ClassesFqNamesTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/parsing/ClassesFqNamesTest.kt similarity index 94% rename from compiler/tests/org/jetbrains/kotlin/parsing/utils/ClassesFqNamesTest.kt rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/parsing/ClassesFqNamesTest.kt index a9717bf9c38..36b60760afe 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/utils/ClassesFqNamesTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/parsing/ClassesFqNamesTest.kt @@ -3,16 +3,14 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.parsing.utils +package org.jetbrains.kotlin.incremental.parsing import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.kotlin.parsing.util.classesFqNames import org.junit.After import org.junit.Before import org.junit.Test import java.io.File -import kotlin.test.assertEquals class ClassesFqNamesTest { private lateinit var workingDir: File