Skip to content

Commit 739670d

Browse files
committed
Move compiler wrapper into subpackage
1 parent f8c3aad commit 739670d

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

server/src/main/kotlin/org/javacs/kt/CompiledFile.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.javacs.kt
33
import com.intellij.openapi.util.TextRange
44
import com.intellij.psi.PsiElement
55
import com.intellij.psi.PsiIdentifier
6+
import org.javacs.kt.compiler.CompilationKind
67
import org.javacs.kt.position.changedRegion
78
import org.javacs.kt.position.position
89
import org.javacs.kt.util.findParent

server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.javacs.kt
22

33
import org.javacs.kt.classpath.defaultClassPathResolver
4+
import org.javacs.kt.compiler.Compiler
45
import java.io.Closeable
56
import java.nio.file.Files
67
import java.nio.file.FileSystems

server/src/main/kotlin/org/javacs/kt/SourcePath.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.javacs.kt
22

3+
import org.javacs.kt.compiler.CompilationKind
34
import org.javacs.kt.util.fileExtension
45
import org.javacs.kt.util.filePath
56
import org.javacs.kt.util.describeURI

server/src/main/kotlin/org/javacs/kt/Compiler.kt renamed to server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javacs.kt
1+
package org.javacs.kt.compiler
22

33
import com.intellij.codeInsight.NullableNotNullManager
44
import com.intellij.lang.Language
@@ -76,6 +76,8 @@ import kotlin.script.experimental.host.ScriptingHostConfiguration
7676
import kotlin.script.experimental.host.configurationDependencies
7777
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
7878
import kotlin.script.experimental.jvm.JvmDependency
79+
import org.javacs.kt.LOG
80+
import org.javacs.kt.CompilerConfiguration
7981
import org.javacs.kt.util.KotlinLSException
8082
import org.javacs.kt.util.LoggingMessageCollector
8183

server/src/main/kotlin/org/javacs/kt/j2k/JavaToKotlinConverter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.intellij.psi.PsiFileFactory
55
import com.intellij.openapi.project.Project
66
// import org.jetbrains.kotlin.j2k.JavaToKotlinTranslator
77
import org.javacs.kt.LOG
8-
import org.javacs.kt.Compiler
9-
import org.javacs.kt.CompilationKind
8+
import org.javacs.kt.compiler.Compiler
9+
import org.javacs.kt.compiler.CompilationKind
1010
import org.javacs.kt.util.nonNull
1111

1212
fun convertJavaToKotlin(javaCode: String, compiler: Compiler): String {

0 commit comments

Comments
 (0)