1
0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-07-31 03:59:07 +02:00

Remove deprecated methods and options

This commit is contained in:
Alex Plate 2020-10-23 11:18:46 +03:00
parent 319874b973
commit 7bccaa8717
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
5 changed files with 3 additions and 55 deletions

View File

@ -59,12 +59,6 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
ideaselection when IDE sets a selection - IdeaVim ONLY
(examples: extend selection, wrap with while, etc.)
Deprecated values:
template ~~please use `idearefactormode` option~~
when starting a template - IdeaVim ONLY
refactoring ~~please use ideaselection~~
same as ideaselection - IdeaVim ONLY
'showmode' 'smd' message on the status line to show current mode
'showcmd' 'sc' show (partial) command in the status bar
'sidescroll' 'ss' minimum number of columns to scroll horizontally
@ -104,12 +98,6 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
If true, join command will be performed via IDE
See wiki/`ideajoin` examples
`ideastatusbar` `ideastatusbar` Boolean (default true)
DEPRECATED. Please use `ideastatusicon`
If false, IdeaVim icon won't be shown in the status bar.
Works only from `~/.ideavimrc` after the IDE restart.
`ideastatusicon` `ideastatusicon` String(default "enabled")

View File

@ -27,7 +27,6 @@ import com.maddyhome.idea.vim.helper.noneOfEnum
import com.maddyhome.idea.vim.helper.vimCommandState
import com.maddyhome.idea.vim.key.CommandPartNode
import com.maddyhome.idea.vim.option.OptionsManager.showmode
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.Contract
import java.util.*
import javax.swing.KeyStroke
@ -60,12 +59,6 @@ class CommandState private constructor() {
var executingCommand: Command? = null
private set
// Keep the compatibility with the IdeaVim-EasyMotion plugin before the stable release
@get:Deprecated("")
@get:ApiStatus.ScheduledForRemoval(inVersion = "0.58")
val mappingMode: MappingMode
get() = mappingState.mappingMode
val isOperatorPending: Boolean
get() = mappingState.mappingMode == MappingMode.OP_PENDING && !commandBuilder.isEmpty

View File

@ -32,7 +32,6 @@ import com.maddyhome.idea.vim.key.MappingOwner
import com.maddyhome.idea.vim.key.OperatorFunction
import com.maddyhome.idea.vim.ui.ExEntryPanel
import com.maddyhome.idea.vim.ui.ModalEntry
import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval
import java.awt.event.KeyEvent
import javax.swing.KeyStroke
@ -44,22 +43,6 @@ import javax.swing.KeyStroke
* @author vlan
*/
object VimExtensionFacade {
/** The 'map' command for mapping keys to handlers defined in extensions. */
@JvmStatic
@ScheduledForRemoval(inVersion = "0.58")
@Deprecated("Only for EasyMotion support")
fun putExtensionHandlerMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>, extensionHandler: VimExtensionHandler, recursive: Boolean) {
VimPlugin.getKey().putKeyMapping(modes, fromKeys, MappingOwner.Plugin.get("easymotion"), extensionHandler, recursive)
}
@ScheduledForRemoval(inVersion = "0.58")
@Deprecated("Only for EasyMotion support")
@JvmStatic
fun putKeyMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>,
toKeys: List<KeyStroke>, recursive: Boolean) {
VimPlugin.getKey().putKeyMapping(modes, fromKeys, MappingOwner.Plugin.get("easymotion"), toKeys, recursive)
}
/** The 'map' command for mapping keys to handlers defined in extensions. */
@JvmStatic
fun putExtensionHandlerMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>,

View File

@ -93,10 +93,6 @@ object OptionsManager {
val dialogescape = addOption(BoundStringOption("dialogescape", "de", "legacy", arrayOf("legacy", "on", "off")))
val oneline = addOption(ToggleOption("oneline", "oneline", true))
@ApiStatus.ScheduledForRemoval(inVersion = "0.59")
@Deprecated("please use ideastatusicon")
val ideastatusbar = addOption(ToggleOption("ideastatusbar", "ideastatusbar", true))
fun isSet(name: String): Boolean {
val option = getOption(name)
return option is ToggleOption && option.getValue()
@ -397,24 +393,15 @@ object SelectModeOptionData {
const val key = "key"
const val cmd = "cmd"
@ApiStatus.ScheduledForRemoval(inVersion = "0.58")
@Deprecated("Please, use `idearefactormode` option")
const val template = "template"
@ApiStatus.ScheduledForRemoval(inVersion = "0.58")
@Deprecated("Please, use `ideaselection`")
const val refactoring = "refactoring"
const val ideaselection = "ideaselection"
@Suppress("DEPRECATION")
val options = arrayOf(mouse, key, cmd, template, refactoring, ideaselection)
val options = arrayOf(mouse, key, cmd, ideaselection)
val default = emptyArray<String>()
val option = BoundListOption(name, abbr, default, options)
fun ideaselectionEnabled(): Boolean {
@Suppress("DEPRECATION")
return ideaselection in OptionsManager.selectmode || refactoring in OptionsManager.selectmode
return ideaselection in OptionsManager.selectmode
}
}

View File

@ -63,10 +63,7 @@ class StatusBarIconFactory : StatusBarWidgetFactory, LightEditCompatible {
}
override fun isAvailable(project: Project): Boolean {
@Suppress("DEPRECATION")
if (!OptionsManager.ideastatusbar.isSet) return false
if (OptionsManager.ideastatusicon.value == IdeaStatusIcon.disabled) return false
return true
return OptionsManager.ideastatusicon.value != IdeaStatusIcon.disabled
}
override fun createWidget(project: Project): StatusBarWidget {