Skip to content

Commit b8a40b0

Browse files
refactor: remove wildcard imports
1 parent e0fcca1 commit b8a40b0

File tree

3 files changed

+57
-26
lines changed

3 files changed

+57
-26
lines changed

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

+24-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
package org.javacs.kt
22

3-
import org.eclipse.lsp4j.*
3+
import java.io.Closeable
4+
import java.nio.file.Paths
5+
import java.util.concurrent.CompletableFuture
6+
import java.util.concurrent.CompletableFuture.completedFuture
7+
import kotlin.system.exitProcess
8+
import org.eclipse.lsp4j.CompletionOptions
9+
import org.eclipse.lsp4j.ExecuteCommandOptions
10+
import org.eclipse.lsp4j.InitializeParams
11+
import org.eclipse.lsp4j.InitializeResult
12+
import org.eclipse.lsp4j.MessageParams
13+
import org.eclipse.lsp4j.MessageType
14+
import org.eclipse.lsp4j.RenameOptions
15+
import org.eclipse.lsp4j.SemanticTokensWithRegistrationOptions
16+
import org.eclipse.lsp4j.ServerCapabilities
17+
import org.eclipse.lsp4j.ServerInfo
18+
import org.eclipse.lsp4j.SignatureHelpOptions
19+
import org.eclipse.lsp4j.TextDocumentSyncKind
20+
import org.eclipse.lsp4j.WorkspaceFolder
21+
import org.eclipse.lsp4j.WorkspaceFoldersOptions
22+
import org.eclipse.lsp4j.WorkspaceServerCapabilities
423
import org.eclipse.lsp4j.jsonrpc.messages.Either
524
import org.eclipse.lsp4j.jsonrpc.services.JsonDelegate
625
import org.eclipse.lsp4j.services.LanguageClient
@@ -9,19 +28,16 @@ import org.eclipse.lsp4j.services.LanguageServer
928
import org.eclipse.lsp4j.services.NotebookDocumentService
1029
import org.javacs.kt.command.ALL_COMMANDS
1130
import org.javacs.kt.database.DatabaseService
31+
import org.javacs.kt.externalsources.ClassContentProvider
32+
import org.javacs.kt.externalsources.ClassPathSourceArchiveProvider
33+
import org.javacs.kt.externalsources.CompositeSourceArchiveProvider
34+
import org.javacs.kt.externalsources.JdkSourceArchiveProvider
1235
import org.javacs.kt.progress.LanguageClientProgress
1336
import org.javacs.kt.progress.Progress
1437
import org.javacs.kt.semantictokens.semanticTokensLegend
1538
import org.javacs.kt.util.AsyncExecutor
1639
import org.javacs.kt.util.TemporaryDirectory
1740
import org.javacs.kt.util.parseURI
18-
import org.javacs.kt.externalsources.*
19-
import org.javacs.kt.index.SymbolIndex
20-
import java.io.Closeable
21-
import java.nio.file.Paths
22-
import java.util.concurrent.CompletableFuture
23-
import java.util.concurrent.CompletableFuture.completedFuture
24-
import kotlin.system.exitProcess
2541

2642
class Server(
2743
val config: Configuration = Configuration()

server/src/main/kotlin/org/javacs/kt/compiler/CompilationEnvironment.kt

+20-14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
package org.javacs.kt.compiler
44

55
import com.intellij.openapi.util.Disposer
6+
import java.io.Closeable
7+
import java.io.File
8+
import java.net.URLClassLoader
9+
import java.nio.file.Path
10+
import kotlin.script.dependencies.Environment
11+
import kotlin.script.dependencies.ScriptContents
12+
import kotlin.script.experimental.dependencies.DependenciesResolver
13+
import kotlin.script.experimental.dependencies.ScriptDependencies
14+
import kotlin.script.experimental.host.ScriptingHostConfiguration
15+
import kotlin.script.experimental.host.configurationDependencies
16+
import kotlin.script.experimental.jvm.JvmDependency
17+
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
618
import org.javacs.kt.CompilerConfiguration
719
import org.javacs.kt.LOG
820
import org.javacs.kt.ScriptsConfiguration
@@ -17,7 +29,14 @@ import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots
1729
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
1830
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
1931
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
20-
import org.jetbrains.kotlin.config.*
32+
import org.jetbrains.kotlin.config.ApiVersion
33+
import org.jetbrains.kotlin.config.CommonConfigurationKeys
34+
import org.jetbrains.kotlin.config.CompilerConfiguration as CompilerConfigurationApi
35+
import org.jetbrains.kotlin.config.JVMConfigurationKeys
36+
import org.jetbrains.kotlin.config.JvmTarget
37+
import org.jetbrains.kotlin.config.LanguageFeature
38+
import org.jetbrains.kotlin.config.LanguageVersion
39+
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
2140
import org.jetbrains.kotlin.container.ComponentProvider
2241
import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
2342
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
@@ -33,19 +52,6 @@ import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
3352
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
3453
import org.jetbrains.kotlin.scripting.definitions.getEnvironment
3554
import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate
36-
import java.io.Closeable
37-
import java.io.File
38-
import java.net.URLClassLoader
39-
import java.nio.file.Path
40-
import kotlin.script.dependencies.Environment
41-
import kotlin.script.dependencies.ScriptContents
42-
import kotlin.script.experimental.dependencies.DependenciesResolver
43-
import kotlin.script.experimental.dependencies.ScriptDependencies
44-
import kotlin.script.experimental.host.ScriptingHostConfiguration
45-
import kotlin.script.experimental.host.configurationDependencies
46-
import kotlin.script.experimental.jvm.JvmDependency
47-
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
48-
import org.jetbrains.kotlin.config.CompilerConfiguration as CompilerConfigurationApi
4955

5056
/**
5157
* Kotlin compiler APIs used to parse, analyze and compile

server/src/main/kotlin/org/javacs/kt/definition/DefinitionHandler.kt

+13-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ import java.nio.file.Path
55
import java.nio.file.Paths
66
import org.eclipse.lsp4j.Location
77
import org.eclipse.lsp4j.Range
8-
import org.javacs.kt.*
9-
import org.javacs.kt.externalsources.*
10-
import org.javacs.kt.position.*
11-
import org.javacs.kt.util.*
8+
import org.javacs.kt.CompiledFile
9+
import org.javacs.kt.CompilerClassPath
10+
import org.javacs.kt.ExternalSourcesConfiguration
11+
import org.javacs.kt.LOG
12+
import org.javacs.kt.externalsources.ClassContentProvider
13+
import org.javacs.kt.externalsources.KlsURI
14+
import org.javacs.kt.externalsources.toKlsURI
15+
import org.javacs.kt.position.isZero
16+
import org.javacs.kt.position.location
17+
import org.javacs.kt.position.position
18+
import org.javacs.kt.util.TemporaryDirectory
19+
import org.javacs.kt.util.parseURI
20+
import org.javacs.kt.util.partitionAroundLast
1221
import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
1322
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
1423
import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi

0 commit comments

Comments
 (0)