chore: optimize imports
This commit is contained in:
parent
53f4d1d330
commit
4722613b4c
45 changed files with 38 additions and 172 deletions
|
@ -22,10 +22,7 @@
|
||||||
|
|
||||||
package com.falsepattern.zigbrains.debugger.runner.base
|
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.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.ExecutionException
|
||||||
import com.intellij.execution.configurations.GeneralCommandLine
|
import com.intellij.execution.configurations.GeneralCommandLine
|
||||||
import com.intellij.execution.process.ProcessEvent
|
import com.intellij.execution.process.ProcessEvent
|
||||||
|
|
|
@ -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.bin.UrlProvider
|
||||||
import com.jetbrains.cidr.execution.debugger.backend.lldb.LLDBDriverConfiguration
|
import com.jetbrains.cidr.execution.debugger.backend.lldb.LLDBDriverConfiguration
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.runInterruptible
|
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
|
|
|
@ -26,7 +26,6 @@ import com.intellij.openapi.util.SystemInfo
|
||||||
import com.intellij.openapi.util.io.toNioPathOrNull
|
import com.intellij.openapi.util.io.toNioPathOrNull
|
||||||
import com.intellij.util.EnvironmentUtil
|
import com.intellij.util.EnvironmentUtil
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.firstOrNull
|
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import kotlinx.coroutines.flow.flowOn
|
import kotlinx.coroutines.flow.flowOn
|
||||||
import org.jetbrains.annotations.NonNls
|
import org.jetbrains.annotations.NonNls
|
||||||
|
|
|
@ -26,7 +26,6 @@ import com.intellij.execution.filters.TextConsoleBuilderImpl
|
||||||
import com.intellij.execution.ui.ConsoleView
|
import com.intellij.execution.ui.ConsoleView
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.terminal.TerminalExecutionConsole
|
import com.intellij.terminal.TerminalExecutionConsole
|
||||||
import java.nio.file.Path
|
|
||||||
|
|
||||||
class ZigConsoleBuilder(private val project: Project, private val emulateTerminal: Boolean = false): TextConsoleBuilderImpl(project) {
|
class ZigConsoleBuilder(private val project: Project, private val emulateTerminal: Boolean = false): TextConsoleBuilderImpl(project) {
|
||||||
override fun createConsole(): ConsoleView {
|
override fun createConsole(): ConsoleView {
|
||||||
|
|
|
@ -35,8 +35,6 @@ import com.intellij.execution.configurations.PtyCommandLine
|
||||||
import com.intellij.execution.process.ProcessHandler
|
import com.intellij.execution.process.ProcessHandler
|
||||||
import com.intellij.execution.runners.ExecutionEnvironment
|
import com.intellij.execution.runners.ExecutionEnvironment
|
||||||
import com.intellij.platform.ide.progress.ModalTaskOwner
|
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
|
import kotlin.io.path.pathString
|
||||||
|
|
||||||
abstract class ZigProfileState<T: ZigExecConfig<T>> (
|
abstract class ZigProfileState<T: ZigExecConfig<T>> (
|
||||||
|
|
|
@ -23,10 +23,8 @@
|
||||||
package com.falsepattern.zigbrains.project.newproject
|
package com.falsepattern.zigbrains.project.newproject
|
||||||
|
|
||||||
import com.intellij.ide.util.projectWizard.SettingsStep
|
import com.intellij.ide.util.projectWizard.SettingsStep
|
||||||
import com.intellij.openapi.Disposable
|
|
||||||
import com.intellij.openapi.ui.TextFieldWithBrowseButton
|
import com.intellij.openapi.ui.TextFieldWithBrowseButton
|
||||||
import com.intellij.openapi.ui.ValidationInfo
|
import com.intellij.openapi.ui.ValidationInfo
|
||||||
import com.intellij.openapi.util.Disposer
|
|
||||||
import com.intellij.platform.ProjectGeneratorPeer
|
import com.intellij.platform.ProjectGeneratorPeer
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
|
|
|
@ -24,10 +24,7 @@ package com.falsepattern.zigbrains.project.run
|
||||||
|
|
||||||
import com.intellij.execution.configurations.GeneralCommandLine
|
import com.intellij.execution.configurations.GeneralCommandLine
|
||||||
import com.intellij.execution.configurations.PtyCommandLine
|
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.execution.process.KillableProcessHandler
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.pty4j.PtyProcess
|
import com.pty4j.PtyProcess
|
||||||
import java.nio.charset.Charset
|
import java.nio.charset.Charset
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,10 @@ import com.falsepattern.zigbrains.project.toolchain.base.resolve
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.toRef
|
import com.falsepattern.zigbrains.project.toolchain.base.toRef
|
||||||
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
||||||
import com.falsepattern.zigbrains.shared.UUIDStorage
|
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)
|
@Service(Service.Level.APP)
|
||||||
@State(
|
@State(
|
||||||
|
|
|
@ -27,16 +27,12 @@ import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
||||||
import com.falsepattern.zigbrains.shared.asUUID
|
import com.falsepattern.zigbrains.shared.asUUID
|
||||||
import com.falsepattern.zigbrains.shared.zigCoroutineScope
|
import com.falsepattern.zigbrains.shared.zigCoroutineScope
|
||||||
import com.intellij.openapi.application.EDT
|
import com.intellij.openapi.application.EDT
|
||||||
import com.intellij.openapi.components.SerializablePersistentStateComponent
|
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
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.util.xmlb.annotations.Attribute
|
import com.intellij.util.xmlb.annotations.Attribute
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
@Service(Service.Level.PROJECT)
|
@Service(Service.Level.PROJECT)
|
||||||
@State(
|
@State(
|
||||||
|
|
|
@ -26,9 +26,7 @@ import com.falsepattern.zigbrains.project.toolchain.tools.ZigCompilerTool
|
||||||
import com.falsepattern.zigbrains.shared.NamedObject
|
import com.falsepattern.zigbrains.shared.NamedObject
|
||||||
import com.intellij.execution.configurations.GeneralCommandLine
|
import com.intellij.execution.configurations.GeneralCommandLine
|
||||||
import com.intellij.openapi.project.Project
|
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.Attribute
|
||||||
import com.intellij.util.xmlb.annotations.MapAnnotation
|
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -25,12 +25,11 @@ package com.falsepattern.zigbrains.project.toolchain.base
|
||||||
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
||||||
import com.falsepattern.zigbrains.project.toolchain.ui.ImmutableElementPanel
|
import com.falsepattern.zigbrains.project.toolchain.ui.ImmutableElementPanel
|
||||||
import com.falsepattern.zigbrains.project.toolchain.zigToolchainList
|
import com.falsepattern.zigbrains.project.toolchain.zigToolchainList
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.openapi.ui.NamedConfigurable
|
import com.intellij.openapi.ui.NamedConfigurable
|
||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.openapi.util.NlsContexts
|
import com.intellij.openapi.util.NlsContexts
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import java.util.function.Supplier
|
import java.util.function.Supplier
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
|
|
||||||
|
|
|
@ -31,13 +31,8 @@ import com.intellij.openapi.util.UserDataHolder
|
||||||
import com.intellij.ui.SimpleColoredComponent
|
import com.intellij.ui.SimpleColoredComponent
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.*
|
||||||
import kotlinx.coroutines.flow.asFlow
|
import java.util.*
|
||||||
import kotlinx.coroutines.flow.filter
|
|
||||||
import kotlinx.coroutines.flow.flatMapConcat
|
|
||||||
import kotlinx.coroutines.flow.flowOn
|
|
||||||
import java.util.UUID
|
|
||||||
import kotlin.collections.none
|
|
||||||
|
|
||||||
private val EXTENSION_POINT_NAME = ExtensionPointName.create<ZigToolchainProvider>("com.falsepattern.zigbrains.toolchainProvider")
|
private val EXTENSION_POINT_NAME = ExtensionPointName.create<ZigToolchainProvider>("com.falsepattern.zigbrains.toolchainProvider")
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,7 @@ import com.falsepattern.zigbrains.ZigBrainsBundle
|
||||||
import com.falsepattern.zigbrains.project.toolchain.local.LocalZigToolchain
|
import com.falsepattern.zigbrains.project.toolchain.local.LocalZigToolchain
|
||||||
import com.falsepattern.zigbrains.project.toolchain.local.getSuggestedLocalToolchainPath
|
import com.falsepattern.zigbrains.project.toolchain.local.getSuggestedLocalToolchainPath
|
||||||
import com.falsepattern.zigbrains.shared.downloader.Downloader
|
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.awt.Component
|
||||||
import java.nio.file.Path
|
|
||||||
|
|
||||||
class LocalToolchainDownloader(component: Component) : Downloader<LocalZigToolchain, ZigVersionInfo>(component) {
|
class LocalToolchainDownloader(component: Component) : Downloader<LocalZigToolchain, ZigVersionInfo>(component) {
|
||||||
override val windowTitle get() = ZigBrainsBundle.message("settings.toolchain.downloader.title")
|
override val windowTitle get() = ZigBrainsBundle.message("settings.toolchain.downloader.title")
|
||||||
|
|
|
@ -23,37 +23,18 @@
|
||||||
package com.falsepattern.zigbrains.project.toolchain.downloader
|
package com.falsepattern.zigbrains.project.toolchain.downloader
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.ZigBrainsBundle
|
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.local.LocalZigToolchain
|
||||||
import com.falsepattern.zigbrains.project.toolchain.zigToolchainList
|
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.downloader.LocalSelector
|
||||||
import com.falsepattern.zigbrains.shared.withUniqueName
|
import com.falsepattern.zigbrains.shared.withUniqueName
|
||||||
import com.falsepattern.zigbrains.shared.zigCoroutineScope
|
|
||||||
import com.intellij.icons.AllIcons
|
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.FileChooserDescriptor
|
||||||
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
|
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.ModalTaskOwner
|
||||||
import com.intellij.platform.ide.progress.TaskCancellation
|
import com.intellij.platform.ide.progress.TaskCancellation
|
||||||
import com.intellij.platform.ide.progress.withModalProgress
|
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.awt.Component
|
||||||
import java.nio.file.Path
|
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<LocalZigToolchain>(component) {
|
class LocalToolchainSelector(component: Component): LocalSelector<LocalZigToolchain>(component) {
|
||||||
override val windowTitle: String
|
override val windowTitle: String
|
||||||
|
|
|
@ -23,46 +23,19 @@
|
||||||
package com.falsepattern.zigbrains.project.toolchain.downloader
|
package com.falsepattern.zigbrains.project.toolchain.downloader
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.ZigBrainsBundle
|
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
|
||||||
import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball
|
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.getTarballIfCompatible
|
||||||
import com.falsepattern.zigbrains.shared.downloader.tempPluginDir
|
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.progress.coroutineToIndicator
|
||||||
import com.intellij.openapi.util.io.FileUtil
|
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.asSafely
|
||||||
import com.intellij.util.download.DownloadableFileService
|
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 com.intellij.util.text.SemVer
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import kotlinx.serialization.ExperimentalSerializationApi
|
import kotlinx.serialization.ExperimentalSerializationApi
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.json.*
|
||||||
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
|
|
||||||
|
|
||||||
@JvmRecord
|
@JvmRecord
|
||||||
data class ZigVersionInfo(
|
data class ZigVersionInfo(
|
||||||
|
|
|
@ -28,11 +28,8 @@ import com.intellij.execution.ExecutionException
|
||||||
import com.intellij.execution.configurations.GeneralCommandLine
|
import com.intellij.execution.configurations.GeneralCommandLine
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.project.guessProjectDir
|
import com.intellij.openapi.project.guessProjectDir
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.SystemInfo
|
import com.intellij.openapi.util.SystemInfo
|
||||||
import com.intellij.openapi.util.io.toNioPathOrNull
|
|
||||||
import com.intellij.openapi.vfs.toNioPathOrNull
|
import com.intellij.openapi.vfs.toNioPathOrNull
|
||||||
import com.intellij.util.keyFMap.KeyFMap
|
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
||||||
@JvmRecord
|
@JvmRecord
|
||||||
|
|
|
@ -24,7 +24,7 @@ package com.falsepattern.zigbrains.project.toolchain.local
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable
|
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
class LocalZigToolchainConfigurable(
|
class LocalZigToolchainConfigurable(
|
||||||
uuid: UUID,
|
uuid: UUID,
|
||||||
|
|
|
@ -31,23 +31,14 @@ import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainProvider
|
||||||
import com.falsepattern.zigbrains.shared.ui.renderPathNameComponent
|
import com.falsepattern.zigbrains.shared.ui.renderPathNameComponent
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.util.UserDataHolder
|
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.io.toNioPathOrNull
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
|
||||||
import com.intellij.ui.SimpleColoredComponent
|
import com.intellij.ui.SimpleColoredComponent
|
||||||
import com.intellij.ui.SimpleTextAttributes
|
|
||||||
import com.intellij.util.system.OS
|
import com.intellij.util.system.OS
|
||||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.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 java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import kotlin.io.path.isDirectory
|
import kotlin.io.path.isDirectory
|
||||||
import kotlin.io.path.pathString
|
import kotlin.io.path.pathString
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.project.toolchain.tools
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import kotlinx.serialization.SerializationException
|
import kotlinx.serialization.SerializationException
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
package com.falsepattern.zigbrains.project.toolchain.ui
|
package com.falsepattern.zigbrains.project.toolchain.ui
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.ZigBrainsBundle
|
import com.falsepattern.zigbrains.ZigBrainsBundle
|
||||||
import com.falsepattern.zigbrains.shared.NamedObject
|
|
||||||
import com.intellij.ui.components.JBTextField
|
import com.intellij.ui.components.JBTextField
|
||||||
import com.intellij.ui.dsl.builder.AlignX
|
import com.intellij.ui.dsl.builder.AlignX
|
||||||
import com.intellij.ui.dsl.builder.Panel
|
import com.intellij.ui.dsl.builder.Panel
|
||||||
|
|
|
@ -30,7 +30,7 @@ import com.falsepattern.zigbrains.shared.ui.ListElem
|
||||||
import com.falsepattern.zigbrains.shared.withUniqueName
|
import com.falsepattern.zigbrains.shared.withUniqueName
|
||||||
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
|
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
internal object ZigToolchainComboBoxHandler {
|
internal object ZigToolchainComboBoxHandler {
|
||||||
@RequiresBackgroundThread
|
@RequiresBackgroundThread
|
||||||
|
|
|
@ -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.createNamedConfigurable
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.suggestZigToolchains
|
import com.falsepattern.zigbrains.project.toolchain.base.suggestZigToolchains
|
||||||
import com.falsepattern.zigbrains.project.toolchain.zigToolchainList
|
import com.falsepattern.zigbrains.project.toolchain.zigToolchainList
|
||||||
import com.falsepattern.zigbrains.shared.ui.ListElem
|
import com.falsepattern.zigbrains.shared.ui.*
|
||||||
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.intellij.openapi.ui.NamedConfigurable
|
import com.intellij.openapi.ui.NamedConfigurable
|
||||||
import com.intellij.openapi.util.UserDataHolder
|
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
sealed interface ZigToolchainDriver: UUIDComboBoxDriver<ZigToolchain> {
|
sealed interface ZigToolchainDriver: UUIDComboBoxDriver<ZigToolchain> {
|
||||||
override val theMap get() = zigToolchainList
|
override val theMap get() = zigToolchainList
|
||||||
|
|
|
@ -39,7 +39,7 @@ import com.intellij.openapi.project.ProjectManager
|
||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.ui.dsl.builder.Panel
|
import com.intellij.ui.dsl.builder.Panel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import java.util.function.Supplier
|
import java.util.function.Supplier
|
||||||
|
|
||||||
class ZigToolchainEditor(private val sharedState: ZigProjectConfigurationProvider.IUserDataBridge):
|
class ZigToolchainEditor(private val sharedState: ZigProjectConfigurationProvider.IUserDataBridge):
|
||||||
|
|
|
@ -26,11 +26,7 @@ import com.falsepattern.zigbrains.Icons
|
||||||
import com.falsepattern.zigbrains.ZigBrainsBundle
|
import com.falsepattern.zigbrains.ZigBrainsBundle
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.render
|
import com.falsepattern.zigbrains.project.toolchain.base.render
|
||||||
import com.falsepattern.zigbrains.shared.ui.ListElem
|
import com.falsepattern.zigbrains.shared.ui.*
|
||||||
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.intellij.icons.AllIcons
|
import com.intellij.icons.AllIcons
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.ui.SimpleTextAttributes
|
import com.intellij.ui.SimpleTextAttributes
|
||||||
|
|
|
@ -27,7 +27,6 @@ import com.intellij.openapi.options.Configurable
|
||||||
import com.intellij.openapi.util.Disposer
|
import com.intellij.openapi.util.Disposer
|
||||||
import com.intellij.ui.dsl.builder.Panel
|
import com.intellij.ui.dsl.builder.Panel
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import java.util.ArrayList
|
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
|
|
||||||
interface SubConfigurable<T>: Disposable {
|
interface SubConfigurable<T>: Disposable {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
package com.falsepattern.zigbrains.shared
|
package com.falsepattern.zigbrains.shared
|
||||||
|
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
fun String.asUUID(): UUID? = UUID.fromString(this)
|
fun String.asUUID(): UUID? = UUID.fromString(this)
|
||||||
fun UUID.asString(): String = toString()
|
fun UUID.asString(): String = toString()
|
|
@ -26,8 +26,7 @@ import com.intellij.openapi.components.SerializablePersistentStateComponent
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.lang.ref.WeakReference
|
import java.lang.ref.WeakReference
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import kotlin.collections.any
|
|
||||||
|
|
||||||
typealias UUIDStorage<T> = Map<String, T>
|
typealias UUIDStorage<T> = Map<String, T>
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ import com.intellij.ui.dsl.builder.panel
|
||||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.util.Vector
|
import java.util.*
|
||||||
import javax.swing.DefaultComboBoxModel
|
import javax.swing.DefaultComboBoxModel
|
||||||
import javax.swing.JList
|
import javax.swing.JList
|
||||||
import javax.swing.event.DocumentEvent
|
import javax.swing.event.DocumentEvent
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
package com.falsepattern.zigbrains.shared.downloader
|
package com.falsepattern.zigbrains.shared.downloader
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.ZigBrainsBundle
|
import com.falsepattern.zigbrains.ZigBrainsBundle
|
||||||
import com.falsepattern.zigbrains.project.toolchain.downloader.ZigVersionInfo
|
|
||||||
import com.falsepattern.zigbrains.shared.Unarchiver
|
import com.falsepattern.zigbrains.shared.Unarchiver
|
||||||
import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball
|
import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball
|
||||||
import com.intellij.openapi.application.PathManager
|
import com.intellij.openapi.application.PathManager
|
||||||
|
|
|
@ -25,7 +25,7 @@ package com.falsepattern.zigbrains.shared.ui
|
||||||
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
||||||
import com.intellij.openapi.ui.NamedConfigurable
|
import com.intellij.openapi.ui.NamedConfigurable
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
interface UUIDComboBoxDriver<T> {
|
interface UUIDComboBoxDriver<T> {
|
||||||
val theMap: UUIDMapSerializable.Converting<T, *, *>
|
val theMap: UUIDMapSerializable.Converting<T, *, *>
|
||||||
|
|
|
@ -39,7 +39,7 @@ import com.intellij.util.IconUtil
|
||||||
import com.intellij.util.asSafely
|
import com.intellij.util.asSafely
|
||||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
import javax.swing.tree.DefaultTreeModel
|
import javax.swing.tree.DefaultTreeModel
|
||||||
|
|
||||||
|
|
|
@ -28,12 +28,10 @@ import com.falsepattern.zigbrains.shared.StorageChangeListener
|
||||||
import com.falsepattern.zigbrains.shared.coroutine.asContextElement
|
import com.falsepattern.zigbrains.shared.coroutine.asContextElement
|
||||||
import com.falsepattern.zigbrains.shared.coroutine.launchWithEDT
|
import com.falsepattern.zigbrains.shared.coroutine.launchWithEDT
|
||||||
import com.falsepattern.zigbrains.shared.coroutine.withEDTContext
|
import com.falsepattern.zigbrains.shared.coroutine.withEDTContext
|
||||||
import com.falsepattern.zigbrains.shared.ui.ListElem
|
|
||||||
import com.falsepattern.zigbrains.shared.zigCoroutineScope
|
import com.falsepattern.zigbrains.shared.zigCoroutineScope
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.Disposable
|
||||||
import com.intellij.openapi.application.EDT
|
import com.intellij.openapi.application.EDT
|
||||||
import com.intellij.openapi.application.ModalityState
|
import com.intellij.openapi.application.ModalityState
|
||||||
import com.intellij.openapi.application.runInEdt
|
|
||||||
import com.intellij.openapi.observable.util.whenListChanged
|
import com.intellij.openapi.observable.util.whenListChanged
|
||||||
import com.intellij.openapi.options.ShowSettingsUtil
|
import com.intellij.openapi.options.ShowSettingsUtil
|
||||||
import com.intellij.openapi.ui.DialogWrapper
|
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.ui.dsl.builder.Row
|
||||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.Runnable
|
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import java.awt.event.ItemEvent
|
import java.awt.event.ItemEvent
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import javax.swing.JButton
|
import javax.swing.JButton
|
||||||
|
|
||||||
abstract class UUIDMapSelector<T>(val driver: UUIDComboBoxDriver<T>): Disposable {
|
abstract class UUIDMapSelector<T>(val driver: UUIDComboBoxDriver<T>): Disposable {
|
||||||
|
|
|
@ -24,7 +24,7 @@ package com.falsepattern.zigbrains.shared.ui
|
||||||
|
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
sealed interface ListElemIn<T>
|
sealed interface ListElemIn<T>
|
||||||
|
|
|
@ -31,12 +31,7 @@ import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.ui.ComboBox
|
import com.intellij.openapi.ui.ComboBox
|
||||||
import com.intellij.openapi.util.io.FileUtil
|
import com.intellij.openapi.util.io.FileUtil
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
import com.intellij.openapi.util.text.StringUtil
|
||||||
import com.intellij.ui.CellRendererPanel
|
import com.intellij.ui.*
|
||||||
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.components.panels.OpaquePanel
|
import com.intellij.ui.components.panels.OpaquePanel
|
||||||
import com.intellij.ui.popup.list.ComboBoxPopup
|
import com.intellij.ui.popup.list.ComboBoxPopup
|
||||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||||
|
@ -47,13 +42,11 @@ import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.awt.BorderLayout
|
import java.awt.BorderLayout
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.util.IdentityHashMap
|
import java.util.*
|
||||||
import java.util.UUID
|
|
||||||
import java.util.function.Consumer
|
import java.util.function.Consumer
|
||||||
import javax.accessibility.AccessibleContext
|
import javax.accessibility.AccessibleContext
|
||||||
import javax.swing.JList
|
import javax.swing.JList
|
||||||
import javax.swing.border.Border
|
import javax.swing.border.Border
|
||||||
import kotlin.io.path.pathString
|
|
||||||
|
|
||||||
class ZBComboBoxPopup<T>(
|
class ZBComboBoxPopup<T>(
|
||||||
context: ZBContext<T>,
|
context: ZBContext<T>,
|
||||||
|
|
|
@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.lsp.config.ZLSConfigProviderBase
|
import com.falsepattern.zigbrains.lsp.config.ZLSConfigProviderBase
|
||||||
import com.falsepattern.zigbrains.lsp.zls.zls
|
import com.falsepattern.zigbrains.lsp.zls.zls
|
||||||
import com.falsepattern.zigbrains.project.toolchain.ZigToolchainService
|
|
||||||
import com.intellij.execution.configurations.GeneralCommandLine
|
import com.intellij.execution.configurations.GeneralCommandLine
|
||||||
import com.intellij.notification.Notification
|
import com.intellij.notification.Notification
|
||||||
import com.intellij.notification.NotificationType
|
import com.intellij.notification.NotificationType
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
package com.falsepattern.zigbrains.lsp.settings
|
package com.falsepattern.zigbrains.lsp.settings
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.lsp.config.SemanticTokens
|
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 com.intellij.util.xmlb.annotations.Attribute
|
||||||
import org.jetbrains.annotations.NonNls
|
import org.jetbrains.annotations.NonNls
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,9 @@ package com.falsepattern.zigbrains.lsp.zls
|
||||||
|
|
||||||
import com.intellij.openapi.ui.NamedConfigurable
|
import com.intellij.openapi.ui.NamedConfigurable
|
||||||
import com.intellij.openapi.util.NlsContexts
|
import com.intellij.openapi.util.NlsContexts
|
||||||
import com.intellij.openapi.util.NlsSafe
|
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import java.awt.Dimension
|
import java.awt.Dimension
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
|
|
||||||
class ZLSConfigurable(val uuid: UUID, zls: ZLSVersion): NamedConfigurable<UUID>() {
|
class ZLSConfigurable(val uuid: UUID, zls: ZLSVersion): NamedConfigurable<UUID>() {
|
||||||
|
|
|
@ -25,7 +25,10 @@ package com.falsepattern.zigbrains.lsp.zls
|
||||||
import com.falsepattern.zigbrains.lsp.zls.ZLSInstallationsService.MyState
|
import com.falsepattern.zigbrains.lsp.zls.ZLSInstallationsService.MyState
|
||||||
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
||||||
import com.falsepattern.zigbrains.shared.UUIDStorage
|
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)
|
@Service(Service.Level.APP)
|
||||||
@State(
|
@State(
|
||||||
|
|
|
@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp.zls
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
||||||
import com.falsepattern.zigbrains.lsp.settings.ZLSSettingsPanel
|
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.project.toolchain.ui.ImmutableNamedElementPanelBase
|
||||||
import com.falsepattern.zigbrains.shared.cli.call
|
import com.falsepattern.zigbrains.shared.cli.call
|
||||||
import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe
|
import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe
|
||||||
|
|
|
@ -28,7 +28,7 @@ import com.falsepattern.zigbrains.project.toolchain.base.withExtraData
|
||||||
import com.falsepattern.zigbrains.shared.asString
|
import com.falsepattern.zigbrains.shared.asString
|
||||||
import com.falsepattern.zigbrains.shared.asUUID
|
import com.falsepattern.zigbrains.shared.asUUID
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
fun <T: ZigToolchain> T.withZLS(uuid: UUID?): T {
|
fun <T: ZigToolchain> T.withZLS(uuid: UUID?): T {
|
||||||
return withExtraData("zls_uuid", uuid?.asString())
|
return withExtraData("zls_uuid", uuid?.asString())
|
||||||
|
|
|
@ -28,9 +28,9 @@ import com.falsepattern.zigbrains.shared.cli.call
|
||||||
import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe
|
import com.falsepattern.zigbrains.shared.cli.createCommandLineSafe
|
||||||
import com.intellij.openapi.util.io.toNioPathOrNull
|
import com.intellij.openapi.util.io.toNioPathOrNull
|
||||||
import com.intellij.util.text.SemVer
|
import com.intellij.util.text.SemVer
|
||||||
import java.nio.file.Path
|
|
||||||
import com.intellij.util.xmlb.annotations.Attribute
|
import com.intellij.util.xmlb.annotations.Attribute
|
||||||
import com.intellij.util.xmlb.annotations.Tag
|
import com.intellij.util.xmlb.annotations.Tag
|
||||||
|
import java.nio.file.Path
|
||||||
import kotlin.io.path.isExecutable
|
import kotlin.io.path.isExecutable
|
||||||
import kotlin.io.path.isRegularFile
|
import kotlin.io.path.isRegularFile
|
||||||
import kotlin.io.path.pathString
|
import kotlin.io.path.pathString
|
||||||
|
|
|
@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.lsp.zls.downloader
|
||||||
|
|
||||||
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchain
|
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
|
||||||
import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball
|
import com.falsepattern.zigbrains.shared.downloader.VersionInfo.Tarball
|
||||||
import com.falsepattern.zigbrains.shared.downloader.getTarballIfCompatible
|
import com.falsepattern.zigbrains.shared.downloader.getTarballIfCompatible
|
||||||
|
@ -38,12 +37,7 @@ import com.intellij.util.text.SemVer
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import kotlinx.serialization.ExperimentalSerializationApi
|
import kotlinx.serialization.ExperimentalSerializationApi
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.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.net.URLEncoder
|
import java.net.URLEncoder
|
||||||
|
|
||||||
@JvmRecord
|
@JvmRecord
|
||||||
|
|
|
@ -33,15 +33,8 @@ import com.falsepattern.zigbrains.lsp.zls.zlsInstallations
|
||||||
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider
|
||||||
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable.Companion.TOOLCHAIN_KEY
|
import com.falsepattern.zigbrains.project.toolchain.base.ZigToolchainConfigurable.Companion.TOOLCHAIN_KEY
|
||||||
import com.falsepattern.zigbrains.shared.UUIDMapSerializable
|
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.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.falsepattern.zigbrains.shared.withUniqueName
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.ui.NamedConfigurable
|
import com.intellij.openapi.ui.NamedConfigurable
|
||||||
|
@ -57,7 +50,7 @@ import kotlinx.coroutines.flow.flowOn
|
||||||
import java.awt.Component
|
import java.awt.Component
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
import kotlin.io.path.isDirectory
|
import kotlin.io.path.isDirectory
|
||||||
import kotlin.io.path.isExecutable
|
import kotlin.io.path.isExecutable
|
||||||
import kotlin.io.path.isRegularFile
|
import kotlin.io.path.isRegularFile
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
|
|
||||||
package com.falsepattern.zigbrains.lsp.zls.ui
|
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.ZLSVersion
|
||||||
import com.falsepattern.zigbrains.lsp.zls.withZLS
|
import com.falsepattern.zigbrains.lsp.zls.withZLS
|
||||||
import com.falsepattern.zigbrains.lsp.zls.zlsUUID
|
import com.falsepattern.zigbrains.lsp.zls.zlsUUID
|
||||||
|
|
|
@ -25,12 +25,7 @@ package com.falsepattern.zigbrains.lsp.zls.ui
|
||||||
import com.falsepattern.zigbrains.lsp.LSPIcons
|
import com.falsepattern.zigbrains.lsp.LSPIcons
|
||||||
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
import com.falsepattern.zigbrains.lsp.ZLSBundle
|
||||||
import com.falsepattern.zigbrains.lsp.zls.ZLSVersion
|
import com.falsepattern.zigbrains.lsp.zls.ZLSVersion
|
||||||
import com.falsepattern.zigbrains.shared.ui.ListElem
|
import com.falsepattern.zigbrains.shared.ui.*
|
||||||
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.intellij.icons.AllIcons
|
import com.intellij.icons.AllIcons
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.ui.SimpleTextAttributes
|
import com.intellij.ui.SimpleTextAttributes
|
||||||
|
|
Loading…
Add table
Reference in a new issue