diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/runner/base/PreLaunchProcessListener.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/runner/base/PreLaunchProcessListener.kt index 92b64c96..6e53c045 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/runner/base/PreLaunchProcessListener.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/runner/base/PreLaunchProcessListener.kt @@ -22,10 +22,7 @@ package com.falsepattern.zigbrains.debugger.runner.base -import com.falsepattern.zigbrains.project.run.ZigProcessHandler import com.falsepattern.zigbrains.shared.cli.startIPCAwareProcess -import com.falsepattern.zigbrains.shared.ipc.IPCUtil -import com.falsepattern.zigbrains.shared.ipc.ipc import com.intellij.execution.ExecutionException import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.process.ProcessEvent diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt index d8a8837c..a219eef4 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt @@ -48,7 +48,6 @@ import com.jetbrains.cidr.execution.debugger.CidrDebuggerPathManager import com.jetbrains.cidr.execution.debugger.backend.bin.UrlProvider import com.jetbrains.cidr.execution.debugger.backend.lldb.LLDBDriverConfiguration import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.withContext import java.io.IOException import java.net.URL diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt index 42db892a..e94c8194 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt @@ -26,7 +26,6 @@ import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.toNioPathOrNull import com.intellij.util.EnvironmentUtil import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn import org.jetbrains.annotations.NonNls diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/ZigConsoleBuilder.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/ZigConsoleBuilder.kt index e46a415f..df3d0f31 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/ZigConsoleBuilder.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/ZigConsoleBuilder.kt @@ -26,7 +26,6 @@ import com.intellij.execution.filters.TextConsoleBuilderImpl import com.intellij.execution.ui.ConsoleView import com.intellij.openapi.project.Project import com.intellij.terminal.TerminalExecutionConsole -import java.nio.file.Path class ZigConsoleBuilder(private val project: Project, private val emulateTerminal: Boolean = false): TextConsoleBuilderImpl(project) { override fun createConsole(): ConsoleView { diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt index 73b28156..4e13a161 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt @@ -35,8 +35,6 @@ import com.intellij.execution.configurations.PtyCommandLine import com.intellij.execution.process.ProcessHandler import com.intellij.execution.runners.ExecutionEnvironment import com.intellij.platform.ide.progress.ModalTaskOwner -import com.intellij.platform.util.progress.reportProgress -import com.intellij.platform.util.progress.reportRawProgress import kotlin.io.path.pathString abstract class ZigProfileState> ( diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectGeneratorPeer.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectGeneratorPeer.kt index b80be707..3014bac3 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectGeneratorPeer.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigProjectGeneratorPeer.kt @@ -23,10 +23,8 @@ package com.falsepattern.zigbrains.project.newproject import com.intellij.ide.util.projectWizard.SettingsStep -import com.intellij.openapi.Disposable import com.intellij.openapi.ui.TextFieldWithBrowseButton import com.intellij.openapi.ui.ValidationInfo -import com.intellij.openapi.util.Disposer import com.intellij.platform.ProjectGeneratorPeer import com.intellij.ui.dsl.builder.panel import javax.swing.JComponent diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigProcessHandler.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigProcessHandler.kt index 8753be03..08c3c155 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigProcessHandler.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/run/ZigProcessHandler.kt @@ -24,10 +24,7 @@ package com.falsepattern.zigbrains.project.run import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.configurations.PtyCommandLine -import com.intellij.execution.process.AnsiEscapeDecoder.ColoredTextAcceptor -import com.intellij.execution.process.KillableColoredProcessHandler import com.intellij.execution.process.KillableProcessHandler -import com.intellij.openapi.util.Key import com.pty4j.PtyProcess import java.nio.charset.Charset diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainListService.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainListService.kt index b599b6cb..fc1c8733 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainListService.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainListService.kt @@ -28,7 +28,10 @@ import com.falsepattern.zigbrains.project.toolchain.base.resolve import com.falsepattern.zigbrains.project.toolchain.base.toRef import com.falsepattern.zigbrains.shared.UUIDMapSerializable import com.falsepattern.zigbrains.shared.UUIDStorage -import com.intellij.openapi.components.* +import com.intellij.openapi.components.Service +import com.intellij.openapi.components.State +import com.intellij.openapi.components.Storage +import com.intellij.openapi.components.service @Service(Service.Level.APP) @State( diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainService.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainService.kt index 9395c997..3e708be5 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainService.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ZigToolchainService.kt @@ -27,16 +27,12 @@ import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain import com.falsepattern.zigbrains.shared.asUUID import com.falsepattern.zigbrains.shared.zigCoroutineScope import com.intellij.openapi.application.EDT -import com.intellij.openapi.components.SerializablePersistentStateComponent -import com.intellij.openapi.components.Service -import com.intellij.openapi.components.State -import com.intellij.openapi.components.Storage -import com.intellij.openapi.components.service +import com.intellij.openapi.components.* import com.intellij.openapi.project.Project import com.intellij.util.xmlb.annotations.Attribute import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import java.util.UUID +import java.util.* @Service(Service.Level.PROJECT) @State( diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchain.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchain.kt index c0f2cb3b..74c0b44d 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchain.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchain.kt @@ -26,9 +26,7 @@ import com.falsepattern.zigbrains.project.toolchain.tools.ZigCompilerTool import com.falsepattern.zigbrains.shared.NamedObject import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.openapi.project.Project -import com.intellij.openapi.util.Key import com.intellij.util.xmlb.annotations.Attribute -import com.intellij.util.xmlb.annotations.MapAnnotation import java.nio.file.Path /** diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainConfigurable.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainConfigurable.kt index 41f85815..abbd34f7 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainConfigurable.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainConfigurable.kt @@ -25,12 +25,11 @@ package com.falsepattern.zigbrains.project.toolchain.base import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider import com.falsepattern.zigbrains.project.toolchain.ui.ImmutableElementPanel import com.falsepattern.zigbrains.project.toolchain.zigToolchainList -import com.intellij.openapi.project.Project import com.intellij.openapi.ui.NamedConfigurable import com.intellij.openapi.util.Key import com.intellij.openapi.util.NlsContexts import com.intellij.ui.dsl.builder.panel -import java.util.UUID +import java.util.* import java.util.function.Supplier import javax.swing.JComponent diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainProvider.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainProvider.kt index 73c5dc80..01d66775 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainProvider.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/base/ZigToolchainProvider.kt @@ -31,13 +31,8 @@ import com.intellij.openapi.util.UserDataHolder import com.intellij.ui.SimpleColoredComponent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.asFlow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.flatMapConcat -import kotlinx.coroutines.flow.flowOn -import java.util.UUID -import kotlin.collections.none +import kotlinx.coroutines.flow.* +import java.util.* private val EXTENSION_POINT_NAME = ExtensionPointName.create("com.falsepattern.zigbrains.toolchainProvider") diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainDownloader.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainDownloader.kt index 7df767ef..3cb24106 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainDownloader.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainDownloader.kt @@ -26,10 +26,7 @@ import com.falsepattern.zigbrains.ZigBrainsBundle import com.falsepattern.zigbrains.project.toolchain.local.LocalZigToolchain import com.falsepattern.zigbrains.project.toolchain.local.getSuggestedLocalToolchainPath import com.falsepattern.zigbrains.shared.downloader.Downloader -import com.falsepattern.zigbrains.shared.downloader.LocalSelector -import com.intellij.openapi.util.NlsContexts import java.awt.Component -import java.nio.file.Path class LocalToolchainDownloader(component: Component) : Downloader(component) { override val windowTitle get() = ZigBrainsBundle.message("settings.toolchain.downloader.title") diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainSelector.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainSelector.kt index a27106cc..f983988a 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainSelector.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/LocalToolchainSelector.kt @@ -23,37 +23,18 @@ package com.falsepattern.zigbrains.project.toolchain.downloader import com.falsepattern.zigbrains.ZigBrainsBundle -import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain import com.falsepattern.zigbrains.project.toolchain.local.LocalZigToolchain import com.falsepattern.zigbrains.project.toolchain.zigToolchainList -import com.falsepattern.zigbrains.shared.coroutine.asContextElement -import com.falsepattern.zigbrains.shared.coroutine.launchWithEDT -import com.falsepattern.zigbrains.shared.coroutine.withEDTContext import com.falsepattern.zigbrains.shared.downloader.LocalSelector import com.falsepattern.zigbrains.shared.withUniqueName -import com.falsepattern.zigbrains.shared.zigCoroutineScope import com.intellij.icons.AllIcons -import com.intellij.openapi.application.ModalityState -import com.intellij.openapi.fileChooser.FileChooser import com.intellij.openapi.fileChooser.FileChooserDescriptor import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory -import com.intellij.openapi.ui.DialogBuilder -import com.intellij.openapi.util.Disposer import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.TaskCancellation import com.intellij.platform.ide.progress.withModalProgress -import com.intellij.ui.DocumentAdapter -import com.intellij.ui.components.JBLabel -import com.intellij.ui.components.JBTextField -import com.intellij.ui.components.textFieldWithBrowseButton -import com.intellij.ui.dsl.builder.AlignX -import com.intellij.ui.dsl.builder.panel -import com.intellij.util.concurrency.annotations.RequiresEdt import java.awt.Component import java.nio.file.Path -import java.util.concurrent.atomic.AtomicBoolean -import javax.swing.event.DocumentEvent -import kotlin.io.path.pathString class LocalToolchainSelector(component: Component): LocalSelector(component) { override val windowTitle: String diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/ZigVersionInfo.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/ZigVersionInfo.kt index 40cbdfbc..e3c6aaa5 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/ZigVersionInfo.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/downloader/ZigVersionInfo.kt @@ -23,46 +23,19 @@ package com.falsepattern.zigbrains.project.toolchain.downloader import com.falsepattern.zigbrains.ZigBrainsBundle -import com.falsepattern.zigbrains.shared.Unarchiver import com.falsepattern.zigbrains.shared.downloader.VersionInfo import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball -import com.falsepattern.zigbrains.shared.downloader.downloadTarball -import com.falsepattern.zigbrains.shared.downloader.flattenDownloadDir import com.falsepattern.zigbrains.shared.downloader.getTarballIfCompatible import com.falsepattern.zigbrains.shared.downloader.tempPluginDir -import com.falsepattern.zigbrains.shared.downloader.unpackTarball -import com.intellij.openapi.application.PathManager -import com.intellij.openapi.progress.EmptyProgressIndicator -import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.progress.coroutineToIndicator import com.intellij.openapi.util.io.FileUtil -import com.intellij.openapi.util.io.toNioPathOrNull -import com.intellij.platform.util.progress.* import com.intellij.util.asSafely import com.intellij.util.download.DownloadableFileService -import com.intellij.util.io.createDirectories -import com.intellij.util.io.delete -import com.intellij.util.io.move -import com.intellij.util.system.CpuArch -import com.intellij.util.system.OS import com.intellij.util.text.SemVer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonElement -import kotlinx.serialization.json.JsonObject -import kotlinx.serialization.json.JsonPrimitive -import kotlinx.serialization.json.decodeFromJsonElement -import kotlinx.serialization.json.decodeFromStream -import java.io.File -import java.nio.file.Files -import java.nio.file.Path -import kotlin.io.path.ExperimentalPathApi -import kotlin.io.path.deleteRecursively -import kotlin.io.path.isDirectory -import kotlin.io.path.name +import kotlinx.serialization.json.* @JvmRecord data class ZigVersionInfo( diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchain.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchain.kt index 290d46b0..385235db 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchain.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchain.kt @@ -28,11 +28,8 @@ import com.intellij.execution.ExecutionException import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.openapi.project.Project import com.intellij.openapi.project.guessProjectDir -import com.intellij.openapi.util.Key import com.intellij.openapi.util.SystemInfo -import com.intellij.openapi.util.io.toNioPathOrNull import com.intellij.openapi.vfs.toNioPathOrNull -import com.intellij.util.keyFMap.KeyFMap import java.nio.file.Path @JvmRecord diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainConfigurable.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainConfigurable.kt index f570fca4..46a161d6 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainConfigurable.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainConfigurable.kt @@ -24,7 +24,7 @@ package com.falsepattern.zigbrains.project.toolchain.local import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable -import java.util.UUID +import java.util.* class LocalZigToolchainConfigurable( uuid: UUID, diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainProvider.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainProvider.kt index ac776b9e..dee209ee 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainProvider.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/local/LocalZigToolchainProvider.kt @@ -31,23 +31,14 @@ import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainProvider import com.falsepattern.zigbrains.shared.ui.renderPathNameComponent import com.intellij.openapi.project.Project import com.intellij.openapi.util.UserDataHolder -import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.toNioPathOrNull -import com.intellij.openapi.util.text.StringUtil import com.intellij.ui.SimpleColoredComponent -import com.intellij.ui.SimpleTextAttributes import com.intellij.util.system.OS import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.asFlow -import kotlinx.coroutines.flow.emptyFlow -import kotlinx.coroutines.flow.flatMapConcat -import kotlinx.coroutines.flow.flattenConcat -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.* import java.nio.file.Files import java.nio.file.Path -import java.util.UUID +import java.util.* import kotlin.io.path.isDirectory import kotlin.io.path.pathString diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigCompilerTool.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigCompilerTool.kt index 6369ff53..50357a3f 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigCompilerTool.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/tools/ZigCompilerTool.kt @@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.project.toolchain.tools import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain import com.intellij.openapi.project.Project -import kotlinx.coroutines.runBlocking import kotlinx.serialization.SerializationException import kotlinx.serialization.json.Json import java.nio.file.Path diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ImmutableNamedElementPanelBase.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ImmutableNamedElementPanelBase.kt index d19571f6..5f3906c4 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ImmutableNamedElementPanelBase.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ImmutableNamedElementPanelBase.kt @@ -23,7 +23,6 @@ package com.falsepattern.zigbrains.project.toolchain.ui import com.falsepattern.zigbrains.ZigBrainsBundle -import com.falsepattern.zigbrains.shared.NamedObject import com.intellij.ui.components.JBTextField import com.intellij.ui.dsl.builder.AlignX import com.intellij.ui.dsl.builder.Panel diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainComboBoxHandler.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainComboBoxHandler.kt index 74ef2f85..2f323184 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainComboBoxHandler.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainComboBoxHandler.kt @@ -30,7 +30,7 @@ import com.falsepattern.zigbrains.shared.ui.ListElem import com.falsepattern.zigbrains.shared.withUniqueName import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import java.awt.Component -import java.util.UUID +import java.util.* internal object ZigToolchainComboBoxHandler { @RequiresBackgroundThread diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainDriver.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainDriver.kt index 048b6be5..6e02494f 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainDriver.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainDriver.kt @@ -29,20 +29,10 @@ import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain import com.falsepattern.zigbrains.project.toolchain.base.createNamedConfigurable import com.falsepattern.zigbrains.project.toolchain.base.suggestZigToolchains import com.falsepattern.zigbrains.project.toolchain.zigToolchainList -import com.falsepattern.zigbrains.shared.ui.ListElem -import com.falsepattern.zigbrains.shared.ui.ListElemIn -import com.falsepattern.zigbrains.shared.ui.Separator -import com.falsepattern.zigbrains.shared.ui.UUIDComboBoxDriver -import com.falsepattern.zigbrains.shared.ui.ZBComboBox -import com.falsepattern.zigbrains.shared.ui.ZBContext -import com.falsepattern.zigbrains.shared.ui.ZBModel -import com.falsepattern.zigbrains.shared.ui.asActual -import com.falsepattern.zigbrains.shared.ui.asPending -import com.intellij.openapi.project.Project +import com.falsepattern.zigbrains.shared.ui.* import com.intellij.openapi.ui.NamedConfigurable -import com.intellij.openapi.util.UserDataHolder import java.awt.Component -import java.util.UUID +import java.util.* sealed interface ZigToolchainDriver: UUIDComboBoxDriver { override val theMap get() = zigToolchainList diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainEditor.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainEditor.kt index 123cebc8..30ec0ae6 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainEditor.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/ZigToolchainEditor.kt @@ -39,7 +39,7 @@ import com.intellij.openapi.project.ProjectManager import com.intellij.openapi.util.Key import com.intellij.ui.dsl.builder.Panel import kotlinx.coroutines.launch -import java.util.UUID +import java.util.* import java.util.function.Supplier class ZigToolchainEditor(private val sharedState: ZigProjectConfigurationProvider.IUserDataBridge): diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/model.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/model.kt index 8945a8d3..f157649d 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/model.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/ui/model.kt @@ -26,11 +26,7 @@ import com.falsepattern.zigbrains.Icons import com.falsepattern.zigbrains.ZigBrainsBundle import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain import com.falsepattern.zigbrains.project.toolchain.base.render -import com.falsepattern.zigbrains.shared.ui.ListElem -import com.falsepattern.zigbrains.shared.ui.ZBCellRenderer -import com.falsepattern.zigbrains.shared.ui.ZBComboBox -import com.falsepattern.zigbrains.shared.ui.ZBContext -import com.falsepattern.zigbrains.shared.ui.ZBModel +import com.falsepattern.zigbrains.shared.ui.* import com.intellij.icons.AllIcons import com.intellij.openapi.project.Project import com.intellij.ui.SimpleTextAttributes diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/SubConfigurable.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/SubConfigurable.kt index 99397c2a..eafca678 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/SubConfigurable.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/SubConfigurable.kt @@ -27,7 +27,6 @@ import com.intellij.openapi.options.Configurable import com.intellij.openapi.util.Disposer import com.intellij.ui.dsl.builder.Panel import com.intellij.ui.dsl.builder.panel -import java.util.ArrayList import javax.swing.JComponent interface SubConfigurable: Disposable { diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUID.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUID.kt index deb3a33c..214fcd58 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUID.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUID.kt @@ -22,7 +22,7 @@ package com.falsepattern.zigbrains.shared -import java.util.UUID +import java.util.* fun String.asUUID(): UUID? = UUID.fromString(this) fun UUID.asString(): String = toString() \ No newline at end of file diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUIDMapSerializable.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUIDMapSerializable.kt index f6118bc5..2590d2b6 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUIDMapSerializable.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/UUIDMapSerializable.kt @@ -26,8 +26,7 @@ import com.intellij.openapi.components.SerializablePersistentStateComponent import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.lang.ref.WeakReference -import java.util.UUID -import kotlin.collections.any +import java.util.* typealias UUIDStorage = Map diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/Downloader.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/Downloader.kt index 2b5a4a34..881f2ba5 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/Downloader.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/Downloader.kt @@ -45,7 +45,7 @@ import com.intellij.ui.dsl.builder.panel import com.intellij.util.concurrency.annotations.RequiresEdt import java.awt.Component import java.nio.file.Path -import java.util.Vector +import java.util.* import javax.swing.DefaultComboBoxModel import javax.swing.JList import javax.swing.event.DocumentEvent diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/VersionInfo.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/VersionInfo.kt index 26c7d3dd..68208436 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/VersionInfo.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/downloader/VersionInfo.kt @@ -23,7 +23,6 @@ package com.falsepattern.zigbrains.shared.downloader import com.falsepattern.zigbrains.ZigBrainsBundle -import com.falsepattern.zigbrains.project.toolchain.downloader.ZigVersionInfo import com.falsepattern.zigbrains.shared.Unarchiver import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball import com.intellij.openapi.application.PathManager diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDComboBoxDriver.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDComboBoxDriver.kt index d7c639a1..aa7fa261 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDComboBoxDriver.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDComboBoxDriver.kt @@ -25,7 +25,7 @@ package com.falsepattern.zigbrains.shared.ui import com.falsepattern.zigbrains.shared.UUIDMapSerializable import com.intellij.openapi.ui.NamedConfigurable import java.awt.Component -import java.util.UUID +import java.util.* interface UUIDComboBoxDriver { val theMap: UUIDMapSerializable.Converting diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapEditor.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapEditor.kt index 69d67c71..12e21cc4 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapEditor.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapEditor.kt @@ -39,7 +39,7 @@ import com.intellij.util.IconUtil import com.intellij.util.asSafely import com.intellij.util.concurrency.annotations.RequiresEdt import kotlinx.coroutines.launch -import java.util.UUID +import java.util.* import javax.swing.JComponent import javax.swing.tree.DefaultTreeModel diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapSelector.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapSelector.kt index 0aac57e1..d45ae3e9 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapSelector.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/UUIDMapSelector.kt @@ -28,12 +28,10 @@ import com.falsepattern.zigbrains.shared.StorageChangeListener import com.falsepattern.zigbrains.shared.coroutine.asContextElement import com.falsepattern.zigbrains.shared.coroutine.launchWithEDT import com.falsepattern.zigbrains.shared.coroutine.withEDTContext -import com.falsepattern.zigbrains.shared.ui.ListElem import com.falsepattern.zigbrains.shared.zigCoroutineScope import com.intellij.openapi.Disposable import com.intellij.openapi.application.EDT import com.intellij.openapi.application.ModalityState -import com.intellij.openapi.application.runInEdt import com.intellij.openapi.observable.util.whenListChanged import com.intellij.openapi.options.ShowSettingsUtil import com.intellij.openapi.ui.DialogWrapper @@ -41,12 +39,11 @@ import com.intellij.ui.dsl.builder.AlignX import com.intellij.ui.dsl.builder.Row import com.intellij.util.concurrency.annotations.RequiresEdt import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Runnable import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.awt.event.ItemEvent -import java.util.UUID +import java.util.* import javax.swing.JButton abstract class UUIDMapSelector(val driver: UUIDComboBoxDriver): Disposable { diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/elements.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/elements.kt index f1916ed5..3148d936 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/elements.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/elements.kt @@ -24,7 +24,7 @@ package com.falsepattern.zigbrains.shared.ui import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import java.util.UUID +import java.util.* sealed interface ListElemIn diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/model.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/model.kt index ab5812d1..717a16d1 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/model.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ui/model.kt @@ -31,12 +31,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.ComboBox import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil -import com.intellij.ui.CellRendererPanel -import com.intellij.ui.CollectionComboBoxModel -import com.intellij.ui.ColoredListCellRenderer -import com.intellij.ui.GroupHeaderSeparator -import com.intellij.ui.SimpleColoredComponent -import com.intellij.ui.SimpleTextAttributes +import com.intellij.ui.* import com.intellij.ui.components.panels.OpaquePanel import com.intellij.ui.popup.list.ComboBoxPopup import com.intellij.util.concurrency.annotations.RequiresEdt @@ -47,13 +42,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import java.awt.BorderLayout import java.awt.Component -import java.util.IdentityHashMap -import java.util.UUID +import java.util.* import java.util.function.Consumer import javax.accessibility.AccessibleContext import javax.swing.JList import javax.swing.border.Border -import kotlin.io.path.pathString class ZBComboBoxPopup( context: ZBContext, diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt index a55c3f39..326102ed 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt @@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp import com.falsepattern.zigbrains.lsp.config.ZLSConfigProviderBase import com.falsepattern.zigbrains.lsp.zls.zls -import com.falsepattern.zigbrains.project.toolchain.ZigToolchainService import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.notification.Notification import com.intellij.notification.NotificationType diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettings.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettings.kt index 75f29d74..1c462864 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettings.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettings.kt @@ -23,8 +23,6 @@ package com.falsepattern.zigbrains.lsp.settings import com.falsepattern.zigbrains.lsp.config.SemanticTokens -import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider -import com.intellij.openapi.project.Project import com.intellij.util.xmlb.annotations.Attribute import org.jetbrains.annotations.NonNls diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSConfigurable.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSConfigurable.kt index e9e67c75..87c5fb76 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSConfigurable.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSConfigurable.kt @@ -24,10 +24,9 @@ package com.falsepattern.zigbrains.lsp.zls import com.intellij.openapi.ui.NamedConfigurable import com.intellij.openapi.util.NlsContexts -import com.intellij.openapi.util.NlsSafe import com.intellij.ui.dsl.builder.panel import java.awt.Dimension -import java.util.UUID +import java.util.* import javax.swing.JComponent class ZLSConfigurable(val uuid: UUID, zls: ZLSVersion): NamedConfigurable() { diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSInstallationsService.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSInstallationsService.kt index 70a13e52..52e1b3f8 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSInstallationsService.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSInstallationsService.kt @@ -25,7 +25,10 @@ package com.falsepattern.zigbrains.lsp.zls import com.falsepattern.zigbrains.lsp.zls.ZLSInstallationsService.MyState import com.falsepattern.zigbrains.shared.UUIDMapSerializable import com.falsepattern.zigbrains.shared.UUIDStorage -import com.intellij.openapi.components.* +import com.intellij.openapi.components.Service +import com.intellij.openapi.components.State +import com.intellij.openapi.components.Storage +import com.intellij.openapi.components.service @Service(Service.Level.APP) @State( diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSPanel.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSPanel.kt index 2c166de2..b6c167fc 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSPanel.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSPanel.kt @@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp.zls import com.falsepattern.zigbrains.lsp.ZLSBundle import com.falsepattern.zigbrains.lsp.settings.ZLSSettingsPanel -import com.falsepattern.zigbrains.project.toolchain.local.LocalZigToolchain import com.falsepattern.zigbrains.project.toolchain.ui.ImmutableNamedElementPanelBase import com.falsepattern.zigbrains.shared.cli.call import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSService.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSService.kt index 85a588a0..cdadebf7 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSService.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSService.kt @@ -28,7 +28,7 @@ import com.falsepattern.zigbrains.project.toolchain.base.withExtraData import com.falsepattern.zigbrains.shared.asString import com.falsepattern.zigbrains.shared.asUUID import com.intellij.openapi.project.Project -import java.util.UUID +import java.util.* fun T.withZLS(uuid: UUID?): T { return withExtraData("zls_uuid", uuid?.asString()) diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSVersion.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSVersion.kt index 0cabd69e..8386baea 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSVersion.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ZLSVersion.kt @@ -28,9 +28,9 @@ import com.falsepattern.zigbrains.shared.cli.call import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe import com.intellij.openapi.util.io.toNioPathOrNull import com.intellij.util.text.SemVer -import java.nio.file.Path import com.intellij.util.xmlb.annotations.Attribute import com.intellij.util.xmlb.annotations.Tag +import java.nio.file.Path import kotlin.io.path.isExecutable import kotlin.io.path.isRegularFile import kotlin.io.path.pathString diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/downloader/ZLSVersionInfo.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/downloader/ZLSVersionInfo.kt index 08a2652c..66b0ade7 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/downloader/ZLSVersionInfo.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/downloader/ZLSVersionInfo.kt @@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp.zls.downloader import com.falsepattern.zigbrains.lsp.ZLSBundle import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain -import com.falsepattern.zigbrains.project.toolchain.downloader.ZigVersionInfo import com.falsepattern.zigbrains.shared.downloader.VersionInfo import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball import com.falsepattern.zigbrains.shared.downloader.getTarballIfCompatible @@ -38,12 +37,7 @@ import com.intellij.util.text.SemVer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonElement -import kotlinx.serialization.json.JsonObject -import kotlinx.serialization.json.JsonPrimitive -import kotlinx.serialization.json.decodeFromJsonElement -import kotlinx.serialization.json.decodeFromStream +import kotlinx.serialization.json.* import java.net.URLEncoder @JvmRecord diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSDriver.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSDriver.kt index 6b7133e4..01f76706 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSDriver.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSDriver.kt @@ -33,15 +33,8 @@ import com.falsepattern.zigbrains.lsp.zls.zlsInstallations import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable.Companion.TOOLCHAIN_KEY import com.falsepattern.zigbrains.shared.UUIDMapSerializable -import com.falsepattern.zigbrains.shared.ui.ListElem +import com.falsepattern.zigbrains.shared.ui.* import com.falsepattern.zigbrains.shared.ui.ListElem.One.Actual -import com.falsepattern.zigbrains.shared.ui.ListElemIn -import com.falsepattern.zigbrains.shared.ui.Separator -import com.falsepattern.zigbrains.shared.ui.UUIDComboBoxDriver -import com.falsepattern.zigbrains.shared.ui.ZBComboBox -import com.falsepattern.zigbrains.shared.ui.ZBContext -import com.falsepattern.zigbrains.shared.ui.ZBModel -import com.falsepattern.zigbrains.shared.ui.asPending import com.falsepattern.zigbrains.shared.withUniqueName import com.intellij.openapi.project.Project import com.intellij.openapi.ui.NamedConfigurable @@ -57,7 +50,7 @@ import kotlinx.coroutines.flow.flowOn import java.awt.Component import java.nio.file.Files import java.nio.file.Path -import java.util.UUID +import java.util.* import kotlin.io.path.isDirectory import kotlin.io.path.isExecutable import kotlin.io.path.isRegularFile diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSEditor.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSEditor.kt index c9de94db..e5355722 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSEditor.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/ZLSEditor.kt @@ -22,8 +22,6 @@ package com.falsepattern.zigbrains.lsp.zls.ui -import com.falsepattern.zigbrains.lsp.ZLSStarter -import com.falsepattern.zigbrains.lsp.startLSP import com.falsepattern.zigbrains.lsp.zls.ZLSVersion import com.falsepattern.zigbrains.lsp.zls.withZLS import com.falsepattern.zigbrains.lsp.zls.zlsUUID diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/model.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/model.kt index 53c680d5..bdfd879e 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/model.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/zls/ui/model.kt @@ -25,12 +25,7 @@ package com.falsepattern.zigbrains.lsp.zls.ui import com.falsepattern.zigbrains.lsp.LSPIcons import com.falsepattern.zigbrains.lsp.ZLSBundle import com.falsepattern.zigbrains.lsp.zls.ZLSVersion -import com.falsepattern.zigbrains.shared.ui.ListElem -import com.falsepattern.zigbrains.shared.ui.ZBCellRenderer -import com.falsepattern.zigbrains.shared.ui.ZBComboBox -import com.falsepattern.zigbrains.shared.ui.ZBContext -import com.falsepattern.zigbrains.shared.ui.ZBModel -import com.falsepattern.zigbrains.shared.ui.renderPathNameComponent +import com.falsepattern.zigbrains.shared.ui.* import com.intellij.icons.AllIcons import com.intellij.openapi.project.Project import com.intellij.ui.SimpleTextAttributes