From 009db1cb0f943612413fc1bb62c970986a2dc2f0 Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Thu, 20 Mar 2025 00:13:32 +0100 Subject: [PATCH] chore: Optimize imports --- .../ZigClionDebuggerDriverConfigurationProvider.kt | 1 - .../zigbrains/debugger/dap/DAPDriver.kt | 14 ++++++-------- .../debugger/toolchain/MSVCMetadataProvider.kt | 2 -- .../toolchain/ZigDebuggerToolchainService.kt | 1 - .../zigbrains/debugger/win/WinDAPDriver.kt | 3 +-- .../kotlin/com/falsepattern/zigbrains/ZBStartup.kt | 2 -- .../com/falsepattern/zigbrains/direnv/Env.kt | 5 ++++- .../project/execution/base/ZigProfileState.kt | 2 +- .../project/newproject/ZigNewProjectPanel.kt | 2 -- .../project/toolchain/tools/ZigCompilerTool.kt | 1 - .../falsepattern/zigbrains/shared/ipc/IPCUtil.kt | 5 ++++- .../falsepattern/zigbrains/shared/ipc/Payload.kt | 1 - .../zon/highlighting/ZonSyntaxHighlighter.kt | 6 ------ lsp/build.gradle.kts | 2 -- .../zigbrains/lsp/ZLSStreamConnectionProvider.kt | 6 ------ .../falsepattern/zigbrains/lsp/config/ZLSConfig.kt | 1 - .../zigbrains/lsp/settings/ZLSSettings.kt | 1 - 17 files changed, 16 insertions(+), 39 deletions(-) diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/clion/ZigClionDebuggerDriverConfigurationProvider.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/clion/ZigClionDebuggerDriverConfigurationProvider.kt index 317608aa..40e6563c 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/clion/ZigClionDebuggerDriverConfigurationProvider.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/clion/ZigClionDebuggerDriverConfigurationProvider.kt @@ -24,7 +24,6 @@ package com.falsepattern.zigbrains.clion import com.falsepattern.zigbrains.debugger.ZigDebuggerDriverConfigurationProvider import com.falsepattern.zigbrains.debugger.settings.ZigDebuggerSettings -import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project import com.intellij.openapi.util.SystemInfo diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt index 899e4795..ac5b34ab 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/dap/DAPDriver.kt @@ -26,11 +26,7 @@ import com.falsepattern.zigbrains.project.run.ZigProcessHandler import com.falsepattern.zigbrains.shared.zigCoroutineScope import com.intellij.execution.ExecutionException import com.intellij.execution.configurations.PtyCommandLine -import com.intellij.execution.process.BaseProcessHandler -import com.intellij.execution.process.ProcessAdapter -import com.intellij.execution.process.ProcessEvent -import com.intellij.execution.process.ProcessListener -import com.intellij.execution.process.ProcessOutputType +import com.intellij.execution.process.* import com.intellij.openapi.util.Key import com.intellij.openapi.util.KeyWithDefaultValue import com.intellij.openapi.util.io.toNioPathOrNull @@ -45,9 +41,12 @@ import com.jetbrains.cidr.execution.debugger.memory.AddressRange import com.jetbrains.cidr.system.HostMachine import com.jetbrains.cidr.system.LocalHost import io.ktor.util.* -import kotlinx.coroutines.* +import kotlinx.coroutines.Job +import kotlinx.coroutines.async import kotlinx.coroutines.future.asCompletableFuture import kotlinx.coroutines.future.asDeferred +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking import org.eclipse.lsp4j.debug.* import org.eclipse.lsp4j.debug.services.IDebugProtocolClient import org.eclipse.lsp4j.debug.services.IDebugProtocolServer @@ -58,8 +57,7 @@ import java.io.ByteArrayOutputStream import java.io.File import java.io.OutputStream import java.io.PipedOutputStream -import java.lang.Exception -import java.util.TreeMap +import java.util.* import java.util.concurrent.CompletableFuture import java.util.concurrent.Executors import kotlin.math.min diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/MSVCMetadataProvider.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/MSVCMetadataProvider.kt index 6fcfe103..23148139 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/MSVCMetadataProvider.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/MSVCMetadataProvider.kt @@ -27,10 +27,8 @@ import com.falsepattern.zigbrains.debugger.settings.MSVCDownloadPermission import com.falsepattern.zigbrains.debugger.settings.ZigDebuggerSettings import com.falsepattern.zigbrains.debugger.toolchain.ZigDebuggerToolchainService.Companion.downloadPath import com.falsepattern.zigbrains.shared.coroutine.withCurrentEDTModalityContext -import com.falsepattern.zigbrains.shared.coroutine.withEDTContext import com.intellij.notification.Notification import com.intellij.notification.NotificationType -import com.intellij.openapi.application.ModalityState import com.intellij.openapi.progress.coroutineToIndicator import com.intellij.openapi.ui.DialogBuilder import com.intellij.platform.util.progress.withProgressText 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 7c4b589a..c6f01bf7 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 @@ -49,7 +49,6 @@ import com.jetbrains.cidr.execution.debugger.backend.lldb.LLDBDriverConfiguratio import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.withContext -import java.io.File import java.io.IOException import java.net.URL import java.nio.file.Path diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/win/WinDAPDriver.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/win/WinDAPDriver.kt index 39693544..eef68bb2 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/win/WinDAPDriver.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/win/WinDAPDriver.kt @@ -39,9 +39,8 @@ import org.eclipse.lsp4j.jsonrpc.debug.messages.DebugResponseMessage import org.eclipse.lsp4j.jsonrpc.messages.Message import org.eclipse.lsp4j.jsonrpc.services.JsonRequest import java.io.InputStream -import java.lang.RuntimeException import java.security.MessageDigest -import java.util.Base64 +import java.util.* import java.util.concurrent.CompletableFuture import java.util.zip.Inflater diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/ZBStartup.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/ZBStartup.kt index d9780011..b51e5b7f 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/ZBStartup.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/ZBStartup.kt @@ -23,8 +23,6 @@ package com.falsepattern.zigbrains import com.falsepattern.zigbrains.direnv.DirenvCmd -import com.falsepattern.zigbrains.direnv.emptyEnv -import com.falsepattern.zigbrains.direnv.getDirenv import com.falsepattern.zigbrains.project.settings.zigProjectSettings import com.falsepattern.zigbrains.project.toolchain.LocalZigToolchain import com.falsepattern.zigbrains.project.toolchain.ZigToolchainProvider 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 df168117..4d695819 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/direnv/Env.kt @@ -29,7 +29,10 @@ import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.flow import org.jetbrains.annotations.NonNls import java.io.File -import kotlin.io.path.* +import kotlin.io.path.absolute +import kotlin.io.path.isDirectory +import kotlin.io.path.isExecutable +import kotlin.io.path.isRegularFile data class Env(val env: Map) { private val path get() = getVariable("PATH")?.split(File.pathSeparatorChar) 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 21f93b48..0db42868 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 @@ -26,8 +26,8 @@ import com.falsepattern.zigbrains.ZigBrainsBundle import com.falsepattern.zigbrains.project.run.ZigProcessHandler import com.falsepattern.zigbrains.project.settings.zigProjectSettings import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain -import com.falsepattern.zigbrains.shared.ipc.IPCUtil import com.falsepattern.zigbrains.shared.coroutine.runModalOrBlocking +import com.falsepattern.zigbrains.shared.ipc.IPCUtil import com.falsepattern.zigbrains.shared.ipc.ipc import com.intellij.build.BuildTextConsoleView import com.intellij.execution.DefaultExecutionResult diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectPanel.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectPanel.kt index dfab77ba..6418285b 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectPanel.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectPanel.kt @@ -23,9 +23,7 @@ package com.falsepattern.zigbrains.project.newproject import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider -import com.falsepattern.zigbrains.project.template.ZigExecutableTemplate import com.falsepattern.zigbrains.project.template.ZigInitTemplate -import com.falsepattern.zigbrains.project.template.ZigLibraryTemplate import com.falsepattern.zigbrains.project.template.ZigProjectTemplate import com.intellij.openapi.Disposable import com.intellij.openapi.actionSystem.ActionToolbarPosition 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 394cda12..85e2af65 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 @@ -27,7 +27,6 @@ import com.falsepattern.zigbrains.project.toolchain.ZigToolchainEnvironmentSeria import com.intellij.openapi.project.Project import kotlinx.serialization.SerializationException import kotlinx.serialization.json.Json -import java.lang.IllegalStateException import java.nio.file.Path class ZigCompilerTool(toolchain: AbstractZigToolchain) : ZigTool(toolchain) { diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/IPCUtil.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/IPCUtil.kt index 7a77eb7e..5f11d6ee 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/IPCUtil.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/IPCUtil.kt @@ -27,7 +27,10 @@ import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.FileUtil import com.intellij.util.io.awaitExit -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import java.nio.charset.Charset import java.nio.file.Path diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/Payload.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/Payload.kt index 4fe34ba7..bd2cdb00 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/Payload.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/shared/ipc/Payload.kt @@ -26,7 +26,6 @@ import com.falsepattern.zigbrains.project.steps.ui.BaseNodeDescriptor import com.intellij.openapi.project.Project import com.intellij.util.asSafely import java.io.DataInput -import javax.swing.tree.DefaultMutableTreeNode data class Payload(val completed: UInt, val estimatedTotal: UInt, val name: String, var children: ArrayList = ArrayList()) { companion object { diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonSyntaxHighlighter.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonSyntaxHighlighter.kt index f4324af0..25447dc7 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonSyntaxHighlighter.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonSyntaxHighlighter.kt @@ -22,8 +22,6 @@ package com.falsepattern.zigbrains.zon.highlighting -import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter -import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion.BAD_CHAR import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion.CHAR import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion.COMMENT @@ -35,16 +33,12 @@ import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion import com.falsepattern.zigbrains.zig.highlighter.ZigSyntaxHighlighter.Companion.STRING_ESC_V import com.falsepattern.zigbrains.zig.psi.ZigTypes import com.falsepattern.zigbrains.zon.lexer.ZonHighlightingLexer -import com.falsepattern.zigbrains.zon.lexer.ZonLexerAdapter import com.falsepattern.zigbrains.zon.psi.ZonTypes -import com.intellij.openapi.editor.HighlighterColors import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.fileTypes.SyntaxHighlighterBase import com.intellij.psi.StringEscapesTokenTypes import com.intellij.psi.TokenType import com.intellij.psi.tree.IElementType -import org.jetbrains.annotations.NonNls -import com.intellij.openapi.editor.DefaultLanguageHighlighterColors as DefaultColors class ZonSyntaxHighlighter : SyntaxHighlighterBase() { override fun getHighlightingLexer() = ZonHighlightingLexer() diff --git a/lsp/build.gradle.kts b/lsp/build.gradle.kts index cb94ceee..eff7868f 100644 --- a/lsp/build.gradle.kts +++ b/lsp/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.grammarkit.tasks.GenerateLexerTask -import org.jetbrains.grammarkit.tasks.GenerateParserTask import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType plugins { 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 7048c887..b542353d 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/ZLSStreamConnectionProvider.kt @@ -29,22 +29,16 @@ import com.falsepattern.zigbrains.lsp.settings.zlsSettings import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.notification.Notification import com.intellij.notification.NotificationType -import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project import com.intellij.openapi.project.guessProjectDir import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.toNioPathOrNull -import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.toNioPathOrNull import com.redhat.devtools.lsp4ij.server.OSProcessStreamConnectionProvider import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToStream -import org.eclipse.lsp4j.InlayHint -import org.eclipse.lsp4j.jsonrpc.messages.Message -import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage -import org.eclipse.lsp4j.services.LanguageServer import java.nio.file.Path import kotlin.io.path.isExecutable import kotlin.io.path.isRegularFile diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/config/ZLSConfig.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/config/ZLSConfig.kt index 2796cb44..45ef89f1 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/config/ZLSConfig.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/config/ZLSConfig.kt @@ -22,7 +22,6 @@ package com.falsepattern.zigbrains.lsp.config -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import org.jetbrains.annotations.NonNls 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 48e8bf13..388e2007 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,7 +23,6 @@ package com.falsepattern.zigbrains.lsp.settings import com.falsepattern.zigbrains.lsp.config.SemanticTokens -import com.falsepattern.zigbrains.lsp.config.ZLSConfig import com.falsepattern.zigbrains.project.settings.ZigProjectConfigurationProvider import com.intellij.openapi.project.Project import org.jetbrains.annotations.NonNls