Skip to content

Commit

Permalink
optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurnikov committed Jun 27, 2024
1 parent 0619df6 commit d3e087c
Show file tree
Hide file tree
Showing 23 changed files with 18 additions and 38 deletions.
3 changes: 1 addition & 2 deletions src/main/kotlin/org/move/bytecode/AptosDecompiler.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/org/move/cli/MoveProjectsService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/move/cli/manifest/AptosConfigYaml.kt
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/org/move/cli/manifest/MoveToml.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/main/kotlin/org/move/cli/runConfigurations/Utils.kt
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/org/move/ide/formatter/impl/indent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/org/move/ide/hints/InlayParameterHints.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/move/openapiext/utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d3e087c

Please sign in to comment.