mirror of
				https://github.com/chylex/IntelliJ-IdeaVim.git
				synced 2025-11-04 10:40:10 +01:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			1afd0d3c37
			...
			245df6522b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						245df6522b
	
				 | 
					
					
						|||
| 
						
						
							
						
						c890e5ea98
	
				 | 
					
					
						
@@ -8,10 +8,10 @@
 | 
			
		||||
 | 
			
		||||
# suppress inspection "UnusedProperty" for whole file
 | 
			
		||||
 | 
			
		||||
ideaVersion=2023.2
 | 
			
		||||
ideaVersion=2023.2.1
 | 
			
		||||
downloadIdeaSources=true
 | 
			
		||||
instrumentPluginCode=true
 | 
			
		||||
version=chylex-18
 | 
			
		||||
version=chylex-17
 | 
			
		||||
javaVersion=17
 | 
			
		||||
remoteRobotVersion=0.11.17
 | 
			
		||||
antlrVersion=4.10.1
 | 
			
		||||
 
 | 
			
		||||
@@ -14,13 +14,11 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 | 
			
		||||
import com.intellij.openapi.actionSystem.AnAction
 | 
			
		||||
import com.intellij.openapi.actionSystem.AnActionEvent
 | 
			
		||||
import com.intellij.openapi.actionSystem.AnActionWrapper
 | 
			
		||||
import com.intellij.openapi.actionSystem.IdeActions
 | 
			
		||||
import com.intellij.openapi.actionSystem.KeyboardShortcut
 | 
			
		||||
import com.intellij.openapi.actionSystem.PlatformDataKeys
 | 
			
		||||
import com.intellij.openapi.application.invokeLater
 | 
			
		||||
import com.intellij.openapi.diagnostic.logger
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.actionSystem.EditorActionManager
 | 
			
		||||
import com.intellij.openapi.keymap.KeymapManager
 | 
			
		||||
import com.intellij.openapi.progress.ProcessCanceledException
 | 
			
		||||
import com.intellij.openapi.project.DumbAware
 | 
			
		||||
@@ -168,12 +166,9 @@ internal class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatib
 | 
			
		||||
        return ActionEnableStatus.no("Special keys", LogLevel.INFO)
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      val nextTemplateVariableShortcuts = KeymapManager.getInstance().activeKeymap.getShortcuts(IdeActions.ACTION_EDITOR_NEXT_TEMPLATE_VARIABLE)
 | 
			
		||||
      val nextTemplateVariableShortcuts = KeymapManager.getInstance().activeKeymap.getShortcuts("NextTemplateVariable")
 | 
			
		||||
      if (nextTemplateVariableShortcuts.any { it is KeyboardShortcut && it.firstKeyStroke == keyStroke }) {
 | 
			
		||||
        val handler = EditorActionManager.getInstance().getActionHandler(IdeActions.ACTION_EDITOR_NEXT_TEMPLATE_VARIABLE)
 | 
			
		||||
        if (handler.isEnabled(editor, null, e.dataContext)) {
 | 
			
		||||
          return ActionEnableStatus.no("Next template variable or finish in-place refactoring", LogLevel.INFO)
 | 
			
		||||
        }
 | 
			
		||||
        return ActionEnableStatus.no("Next template variable or finish in-place refactoring", LogLevel.INFO)
 | 
			
		||||
      }
 | 
			
		||||
      
 | 
			
		||||
      if (editor.inInsertMode) {
 | 
			
		||||
 
 | 
			
		||||
@@ -88,8 +88,6 @@ import com.maddyhome.idea.vim.listener.MouseEventsDataHolder.skipNDragEvents
 | 
			
		||||
import com.maddyhome.idea.vim.listener.VimListenerManager.EditorListeners.add
 | 
			
		||||
import com.maddyhome.idea.vim.newapi.IjVimEditor
 | 
			
		||||
import com.maddyhome.idea.vim.newapi.vim
 | 
			
		||||
import com.maddyhome.idea.vim.state.VimStateMachine
 | 
			
		||||
import com.maddyhome.idea.vim.state.mode.Mode
 | 
			
		||||
import com.maddyhome.idea.vim.state.mode.inSelectMode
 | 
			
		||||
import com.maddyhome.idea.vim.state.mode.mode
 | 
			
		||||
import com.maddyhome.idea.vim.state.mode.selectionType
 | 
			
		||||
@@ -267,16 +265,6 @@ internal object VimListenerManager {
 | 
			
		||||
  class VimFileEditorManagerListener : FileEditorManagerListener {
 | 
			
		||||
    override fun selectionChanged(event: FileEditorManagerEvent) {
 | 
			
		||||
      if (!VimPlugin.isEnabled()) return
 | 
			
		||||
      
 | 
			
		||||
      val newEditor = event.newEditor
 | 
			
		||||
      if (newEditor is TextEditor) {
 | 
			
		||||
        val editor = newEditor.editor
 | 
			
		||||
        if (editor.isInsertMode) {
 | 
			
		||||
          VimStateMachine.getInstance(editor).mode = Mode.NORMAL()
 | 
			
		||||
          KeyHandler.getInstance().reset(editor.vim)
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
      
 | 
			
		||||
      MotionGroup.fileEditorManagerSelectionChangedCallback(event)
 | 
			
		||||
      FileGroup.fileEditorManagerSelectionChangedCallback(event)
 | 
			
		||||
      SearchGroup.fileEditorManagerSelectionChangedCallback(event)
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@
 | 
			
		||||
  <!-- Please search for "[VERSION UPDATE]" in project in case you update the since-build version -->
 | 
			
		||||
  <!-- Check for [Version Update] tag in YouTrack as well -->
 | 
			
		||||
  <!-- Also, please update the value in build.gradle.kts file-->
 | 
			
		||||
  <idea-version since-build="232"/>
 | 
			
		||||
  <idea-version since-build="231.7515.13"/>
 | 
			
		||||
 | 
			
		||||
  <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform (including CWM) -->
 | 
			
		||||
  <depends>com.intellij.modules.platform</depends>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user