diff --git a/src/main/kotlin/org/move/bytecode/AptosDecompiler.kt b/src/main/kotlin/org/move/bytecode/AptosDecompiler.kt index 7d53798b9..b906d220a 100644 --- a/src/main/kotlin/org/move/bytecode/AptosDecompiler.kt +++ b/src/main/kotlin/org/move/bytecode/AptosDecompiler.kt @@ -11,10 +11,9 @@ import com.intellij.openapi.vfs.* import com.intellij.openapi.vfs.newvfs.BulkFileListener import com.intellij.openapi.vfs.newvfs.events.VFileEvent import org.move.cli.runConfigurations.aptos.Aptos -import org.move.cli.settings.getAptosCli import org.move.openapiext.pathAsPath -import org.move.openapiext.rootPluginDisposable import org.move.openapiext.rootPath +import org.move.openapiext.rootPluginDisposable import org.move.stdext.RsResult import org.move.stdext.unwrapOrElse import java.io.File diff --git a/src/main/kotlin/org/move/cli/MoveProjectsService.kt b/src/main/kotlin/org/move/cli/MoveProjectsService.kt index 642995c8f..ab4ef0abb 100644 --- a/src/main/kotlin/org/move/cli/MoveProjectsService.kt +++ b/src/main/kotlin/org/move/cli/MoveProjectsService.kt @@ -7,7 +7,6 @@ import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.logger -import com.intellij.openapi.externalSystem.autoimport.AutoImportProjectTracker import com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectTracker import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.progress.ProcessCanceledException diff --git a/src/main/kotlin/org/move/cli/externalLinter/MvExternalLinterProjectSettingsService.kt b/src/main/kotlin/org/move/cli/externalLinter/MvExternalLinterProjectSettingsService.kt index 4b6139eea..e3ae55838 100644 --- a/src/main/kotlin/org/move/cli/externalLinter/MvExternalLinterProjectSettingsService.kt +++ b/src/main/kotlin/org/move/cli/externalLinter/MvExternalLinterProjectSettingsService.kt @@ -5,12 +5,8 @@ package org.move.cli.externalLinter -import com.intellij.openapi.components.Service +import com.intellij.openapi.components.* import com.intellij.openapi.components.Service.Level.PROJECT -import com.intellij.openapi.components.State -import com.intellij.openapi.components.Storage -import com.intellij.openapi.components.StoragePathMacros -import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import org.move.cli.externalLinter.MvExternalLinterProjectSettingsService.MvExternalLinterProjectSettings import org.move.cli.settings.MvProjectSettingsServiceBase diff --git a/src/main/kotlin/org/move/cli/externalSystem/MoveExternalSystemProjectAware.kt b/src/main/kotlin/org/move/cli/externalSystem/MoveExternalSystemProjectAware.kt index d1a2a147d..6f2b37421 100644 --- a/src/main/kotlin/org/move/cli/externalSystem/MoveExternalSystemProjectAware.kt +++ b/src/main/kotlin/org/move/cli/externalSystem/MoveExternalSystemProjectAware.kt @@ -8,7 +8,6 @@ import com.intellij.openapi.project.Project import org.move.cli.MoveProjectsService import org.move.cli.MoveProjectsService.MoveRefreshStatus import org.move.cli.moveProjectsService -import org.move.openapiext.saveAllDocuments class MoveExternalSystemProjectAware( private val project: Project diff --git a/src/main/kotlin/org/move/cli/manifest/AptosConfigYaml.kt b/src/main/kotlin/org/move/cli/manifest/AptosConfigYaml.kt index eb08da40b..050560813 100644 --- a/src/main/kotlin/org/move/cli/manifest/AptosConfigYaml.kt +++ b/src/main/kotlin/org/move/cli/manifest/AptosConfigYaml.kt @@ -1,9 +1,9 @@ package org.move.cli.manifest -import kotlin.io.path.readText import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.error.YAMLException import java.nio.file.Path +import kotlin.io.path.readText data class AptosConfigYaml( val configYamlPath: Path, diff --git a/src/main/kotlin/org/move/cli/manifest/MoveToml.kt b/src/main/kotlin/org/move/cli/manifest/MoveToml.kt index 45b002d3d..7cda8905b 100644 --- a/src/main/kotlin/org/move/cli/manifest/MoveToml.kt +++ b/src/main/kotlin/org/move/cli/manifest/MoveToml.kt @@ -3,7 +3,6 @@ package org.move.cli.manifest import com.intellij.openapi.project.Project import org.move.cli.* import org.move.openapiext.* -import org.move.openapiext.common.isUnitTestMode import org.move.stdext.chain import org.toml.lang.psi.TomlFile import java.nio.file.Path diff --git a/src/main/kotlin/org/move/cli/runConfigurations/Utils.kt b/src/main/kotlin/org/move/cli/runConfigurations/Utils.kt index cdb658171..564aab0f6 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/Utils.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/Utils.kt @@ -1,13 +1,10 @@ package org.move.cli.runConfigurations -import com.intellij.execution.filters.Filter import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.project.Project -import org.move.cli.MoveFileHyperlinkFilter import org.move.cli.MoveProject import org.move.cli.moveProjectsService -import java.nio.file.Path val Project.hasMoveProject: Boolean get() = moveProjectsService.allProjects.isNotEmpty() diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/CommandConfigurationHandler.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/CommandConfigurationHandler.kt index 672b8d00e..26aeda2f8 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/aptos/CommandConfigurationHandler.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/aptos/CommandConfigurationHandler.kt @@ -3,8 +3,8 @@ package org.move.cli.runConfigurations.aptos import com.intellij.psi.PsiElement import org.move.cli.MoveProject import org.move.cli.runConfigurations.AptosCommandLine -import org.move.cli.runConfigurations.producers.CommandConfigurationProducerBase import org.move.cli.runConfigurations.producers.AptosCommandLineFromContext +import org.move.cli.runConfigurations.producers.CommandConfigurationProducerBase import org.move.lang.core.psi.MvFunction import org.move.lang.core.psi.MvFunctionParameter import org.move.lang.core.psi.ext.functionId diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCallConfigurationBase.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCallConfigurationBase.kt index 1602d1d11..dd05651ea 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCallConfigurationBase.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCallConfigurationBase.kt @@ -4,8 +4,6 @@ import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.openapi.project.Project import org.move.cli.moveProjectsService import org.move.cli.runConfigurations.CommandConfigurationBase -import org.move.cli.settings.aptosExecPath -import java.nio.file.Path abstract class FunctionCallConfigurationBase( project: Project, diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionParametersPanel.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionParametersPanel.kt index 0c89d7e83..fa0739028 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionParametersPanel.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionParametersPanel.kt @@ -16,7 +16,9 @@ import org.move.lang.core.psi.MvFunction import org.move.lang.core.psi.typeParameters import org.move.lang.core.types.infer.inference import org.move.lang.core.types.ty.TyInteger -import org.move.utils.ui.* +import org.move.utils.ui.MoveTextFieldWithCompletion +import org.move.utils.ui.hasParseErrors +import org.move.utils.ui.ulongTextField import java.util.function.Supplier import javax.swing.JPanel diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/cmd/AptosCommandConfiguration.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/cmd/AptosCommandConfiguration.kt index 6c808e9f2..5ad88bfb2 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/aptos/cmd/AptosCommandConfiguration.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/aptos/cmd/AptosCommandConfiguration.kt @@ -8,8 +8,6 @@ import com.intellij.openapi.project.Project import org.move.cli.moveProjectsService import org.move.cli.runConfigurations.CommandConfigurationBase import org.move.cli.runConfigurations.test.AptosTestConsoleProperties -import org.move.cli.settings.aptosExecPath -import java.nio.file.Path class AptosCommandConfiguration( project: Project, diff --git a/src/main/kotlin/org/move/cli/runConfigurations/aptos/run/RunCommandConfigurationHandler.kt b/src/main/kotlin/org/move/cli/runConfigurations/aptos/run/RunCommandConfigurationHandler.kt index 66a97b635..ffaf448b8 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/aptos/run/RunCommandConfigurationHandler.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/aptos/run/RunCommandConfigurationHandler.kt @@ -4,8 +4,8 @@ import org.move.cli.MoveProject import org.move.cli.runConfigurations.aptos.CommandConfigurationHandler import org.move.lang.core.psi.MvFunction import org.move.lang.core.psi.MvFunctionParameter -import org.move.lang.core.psi.ext.isEntry import org.move.lang.core.psi.ext.hasTestAttr +import org.move.lang.core.psi.ext.isEntry import org.move.lang.core.psi.ext.transactionParameters import org.move.lang.index.MvEntryFunctionIndex diff --git a/src/main/kotlin/org/move/cli/runConfigurations/producers/aptos/AptosTestCommandConfigurationProducer.kt b/src/main/kotlin/org/move/cli/runConfigurations/producers/aptos/AptosTestCommandConfigurationProducer.kt index 7be783b2c..45e72a651 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/producers/aptos/AptosTestCommandConfigurationProducer.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/producers/aptos/AptosTestCommandConfigurationProducer.kt @@ -10,8 +10,8 @@ import org.move.cli.MoveProject import org.move.cli.runConfigurations.AptosCommandLine import org.move.cli.runConfigurations.aptos.AptosCommandConfigurationType import org.move.cli.runConfigurations.aptos.cmd.AptosCommandConfigurationFactory -import org.move.cli.runConfigurations.producers.CommandConfigurationProducerBase import org.move.cli.runConfigurations.producers.AptosCommandLineFromContext +import org.move.cli.runConfigurations.producers.CommandConfigurationProducerBase import org.move.cli.settings.moveSettings import org.move.lang.MoveFile import org.move.lang.core.psi.MvFunction diff --git a/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestLocator.kt b/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestLocator.kt index 0e9d6eced..ccd0c0ee9 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestLocator.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestLocator.kt @@ -3,7 +3,6 @@ package org.move.cli.runConfigurations.test import com.intellij.execution.Location import com.intellij.execution.PsiLocation import com.intellij.execution.testframework.sm.runner.SMTestLocator -import com.intellij.openapi.fileEditor.OpenFileDescriptor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope diff --git a/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestRunState.kt b/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestRunState.kt index 4afb7612c..7bf44d791 100644 --- a/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestRunState.kt +++ b/src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestRunState.kt @@ -1,13 +1,6 @@ package org.move.cli.runConfigurations.test -import com.intellij.execution.DefaultExecutionResult -import com.intellij.execution.ExecutionResult -import com.intellij.execution.Executor import com.intellij.execution.runners.ExecutionEnvironment -import com.intellij.execution.runners.ProgramRunner -import com.intellij.execution.testframework.autotest.ToggleAutoTestAction -import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil -import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView import org.move.cli.runConfigurations.AptosRunStateBase import org.move.cli.runConfigurations.CommandConfigurationBase import org.move.cli.runConfigurations.aptos.AptosTestConsoleBuilder diff --git a/src/main/kotlin/org/move/ide/annotator/RsExternalLinterUtils.kt b/src/main/kotlin/org/move/ide/annotator/RsExternalLinterUtils.kt index 5599e7f21..4b7963148 100644 --- a/src/main/kotlin/org/move/ide/annotator/RsExternalLinterUtils.kt +++ b/src/main/kotlin/org/move/ide/annotator/RsExternalLinterUtils.kt @@ -3,7 +3,6 @@ package org.move.ide.annotator import com.intellij.codeInsight.daemon.impl.HighlightInfo import com.intellij.codeInsight.daemon.impl.HighlightInfoType import com.intellij.lang.annotation.HighlightSeverity -import com.intellij.openapi.Disposable import com.intellij.openapi.application.WriteAction import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.logger diff --git a/src/main/kotlin/org/move/ide/formatter/impl/indent.kt b/src/main/kotlin/org/move/ide/formatter/impl/indent.kt index 8b9fd2747..c87f41077 100644 --- a/src/main/kotlin/org/move/ide/formatter/impl/indent.kt +++ b/src/main/kotlin/org/move/ide/formatter/impl/indent.kt @@ -5,7 +5,6 @@ import com.intellij.lang.ASTNode import org.move.ide.formatter.MoveFmtBlock import org.move.lang.MvElementTypes.* import org.move.lang.core.psi.MvExpr -import org.move.lang.core.psi.MvPragmaSpecStmt fun MoveFmtBlock.computeChildIndent(childNode: ASTNode): Indent? { val parentNode = node diff --git a/src/main/kotlin/org/move/ide/hints/InlayParameterHints.kt b/src/main/kotlin/org/move/ide/hints/InlayParameterHints.kt index d13ac0ec5..2fb28a31d 100644 --- a/src/main/kotlin/org/move/ide/hints/InlayParameterHints.kt +++ b/src/main/kotlin/org/move/ide/hints/InlayParameterHints.kt @@ -3,7 +3,9 @@ package org.move.ide.hints import com.intellij.codeInsight.hints.InlayInfo import com.intellij.psi.PsiElement import org.move.ide.utils.FunctionSignature -import org.move.lang.core.psi.* +import org.move.lang.core.psi.MvMethodCall +import org.move.lang.core.psi.MvRefExpr +import org.move.lang.core.psi.MvStructLitExpr import org.move.lang.core.psi.ext.MvCallable import org.move.lang.core.psi.ext.argumentExprs import org.move.lang.core.psi.ext.startOffset diff --git a/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt b/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt index df2134f1b..0ef032ced 100644 --- a/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt +++ b/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt @@ -11,9 +11,9 @@ import org.move.ide.utils.imports.ImportCandidateCollector import org.move.ide.utils.imports.import import org.move.lang.core.psi.* import org.move.lang.core.psi.ext.ancestorStrict +import org.move.lang.core.psi.ext.asSmartPointer import org.move.lang.core.psi.ext.hasAncestor import org.move.lang.core.psi.ext.importCandidateNamespaces -import org.move.lang.core.psi.ext.asSmartPointer import org.move.lang.core.resolve.ContextScopeInfo import org.move.lang.core.resolve.letStmtScope import org.move.lang.core.resolve.ref.MvReferenceElement diff --git a/src/main/kotlin/org/move/ide/newProject/MoveProjectGenerator.kt b/src/main/kotlin/org/move/ide/newProject/MoveProjectGenerator.kt index ebef4c639..015cd5646 100644 --- a/src/main/kotlin/org/move/ide/newProject/MoveProjectGenerator.kt +++ b/src/main/kotlin/org/move/ide/newProject/MoveProjectGenerator.kt @@ -4,7 +4,6 @@ import com.intellij.ide.util.projectWizard.AbstractNewProjectStep import com.intellij.ide.util.projectWizard.CustomStepProjectGenerator import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase import com.intellij.openapi.components.service -import com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectTracker import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile diff --git a/src/main/kotlin/org/move/ide/notifications/InvalidBlockchainCliConfiguration.kt b/src/main/kotlin/org/move/ide/notifications/InvalidBlockchainCliConfiguration.kt index 26ebb6987..234d94e66 100644 --- a/src/main/kotlin/org/move/ide/notifications/InvalidBlockchainCliConfiguration.kt +++ b/src/main/kotlin/org/move/ide/notifications/InvalidBlockchainCliConfiguration.kt @@ -5,8 +5,11 @@ import com.intellij.openapi.project.DumbAware import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.ui.EditorNotificationPanel -import org.move.cli.settings.* +import org.move.cli.settings.PerProjectAptosConfigurable import org.move.cli.settings.aptos.AptosExecType.LOCAL +import org.move.cli.settings.aptosExecPath +import org.move.cli.settings.isValidExecutable +import org.move.cli.settings.moveSettings import org.move.lang.isMoveFile import org.move.lang.isMoveTomlManifestFile import org.move.openapiext.common.isUnitTestMode diff --git a/src/main/kotlin/org/move/ide/notifications/NoMoveProjectDetectedNotificationProvider.kt b/src/main/kotlin/org/move/ide/notifications/NoMoveProjectDetectedNotificationProvider.kt index 2e21a4c7c..8b03e4f21 100644 --- a/src/main/kotlin/org/move/ide/notifications/NoMoveProjectDetectedNotificationProvider.kt +++ b/src/main/kotlin/org/move/ide/notifications/NoMoveProjectDetectedNotificationProvider.kt @@ -12,7 +12,6 @@ import org.move.cli.MoveProjectsService.Companion.MOVE_PROJECTS_TOPIC import org.move.cli.moveProjectsService import org.move.cli.settings.MvProjectSettingsServiceBase.* import org.move.cli.settings.MvProjectSettingsServiceBase.Companion.MOVE_SETTINGS_TOPIC -import org.move.cli.settings.moveSettings import org.move.lang.isMoveFile import org.move.lang.isMoveTomlManifestFile import org.move.lang.toNioPathOrNull diff --git a/src/main/kotlin/org/move/openapiext/utils.kt b/src/main/kotlin/org/move/openapiext/utils.kt index b82cb90e4..5783a65e6 100644 --- a/src/main/kotlin/org/move/openapiext/utils.kt +++ b/src/main/kotlin/org/move/openapiext/utils.kt @@ -40,10 +40,10 @@ import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import com.intellij.util.concurrency.AppExecutorUtil import org.jdom.Element +import org.move.ide.annotator.RsExternalLinterPass import org.move.lang.toNioPathOrNull import org.move.openapiext.common.isHeadlessEnvironment import org.move.openapiext.common.isUnitTestMode -import org.move.ide.annotator.RsExternalLinterPass import java.nio.file.Path import java.nio.file.Paths import java.util.concurrent.Callable