mirror of
				https://github.com/chylex/IntelliJ-IdeaVim.git
				synced 2025-11-04 10:40:10 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			customized
			...
			customized
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						295f0b6c53
	
				 | 
					
					
						|||
| 
						
						
							
						
						2643301ea9
	
				 | 
					
					
						|||
| 
						
						
							
						
						51f15782af
	
				 | 
					
					
						
@@ -20,7 +20,7 @@ ideaVersion=2024.3
 | 
				
			|||||||
# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 | 
					# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 | 
				
			||||||
ideaType=IC
 | 
					ideaType=IC
 | 
				
			||||||
instrumentPluginCode=true
 | 
					instrumentPluginCode=true
 | 
				
			||||||
version=chylex-1
 | 
					version=chylex-45
 | 
				
			||||||
javaVersion=21
 | 
					javaVersion=21
 | 
				
			||||||
remoteRobotVersion=0.11.23
 | 
					remoteRobotVersion=0.11.23
 | 
				
			||||||
antlrVersion=4.10.1
 | 
					antlrVersion=4.10.1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -182,6 +182,9 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (editor.inInsertMode) {
 | 
					    if (editor.inInsertMode) {
 | 
				
			||||||
 | 
					      if (keyCode == KeyEvent.VK_ENTER) {
 | 
				
			||||||
 | 
					        return ActionEnableStatus.no("Enter action in insert mode", LogLevel.INFO)
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
      if (keyCode == KeyEvent.VK_TAB) {
 | 
					      if (keyCode == KeyEvent.VK_TAB) {
 | 
				
			||||||
        // TODO: This stops VimEditorTab seeing <Tab> in insert mode and correctly scrolling the view
 | 
					        // TODO: This stops VimEditorTab seeing <Tab> in insert mode and correctly scrolling the view
 | 
				
			||||||
        // There are multiple actions registered for VK_TAB. The important items, in order, are this, the Live
 | 
					        // There are multiple actions registered for VK_TAB. The important items, in order, are this, the Live
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,6 +38,7 @@ import com.maddyhome.idea.vim.api.VimActionExecutor
 | 
				
			|||||||
import com.maddyhome.idea.vim.api.VimEditor
 | 
					import com.maddyhome.idea.vim.api.VimEditor
 | 
				
			||||||
import com.maddyhome.idea.vim.command.OperatorArguments
 | 
					import com.maddyhome.idea.vim.command.OperatorArguments
 | 
				
			||||||
import com.maddyhome.idea.vim.handler.EditorActionHandlerBase
 | 
					import com.maddyhome.idea.vim.handler.EditorActionHandlerBase
 | 
				
			||||||
 | 
					import com.maddyhome.idea.vim.ide.isRider
 | 
				
			||||||
import com.maddyhome.idea.vim.newapi.IjNativeAction
 | 
					import com.maddyhome.idea.vim.newapi.IjNativeAction
 | 
				
			||||||
import com.maddyhome.idea.vim.newapi.ij
 | 
					import com.maddyhome.idea.vim.newapi.ij
 | 
				
			||||||
import com.maddyhome.idea.vim.newapi.runFromVimKey
 | 
					import com.maddyhome.idea.vim.newapi.runFromVimKey
 | 
				
			||||||
@@ -76,7 +77,7 @@ internal class IjActionExecutor : VimActionExecutor {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    val ijAction = (action as IjNativeAction).action
 | 
					    val ijAction = (action as IjNativeAction).action
 | 
				
			||||||
    if (Registry.`is`("ideavim.old.action.execution", true)) {
 | 
					    if (Registry.`is`("ideavim.old.action.execution", true) || isRider()) {
 | 
				
			||||||
      return manualActionExecution(context, ijAction)
 | 
					      return manualActionExecution(context, ijAction)
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      try {
 | 
					      try {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,6 +31,12 @@ class MotionCamelLeftAction : MotionActionHandler.ForEachCaret() {
 | 
				
			|||||||
    argument: Argument?,
 | 
					    argument: Argument?,
 | 
				
			||||||
    operatorArguments: OperatorArguments,
 | 
					    operatorArguments: OperatorArguments,
 | 
				
			||||||
  ): Motion {
 | 
					  ): Motion {
 | 
				
			||||||
 | 
					    if (caret.hasSelection() && caret.offset > caret.vimSelectionStart) {
 | 
				
			||||||
 | 
					      val target = injector.searchHelper.findPreviousCamelEnd(editor.text(), caret.offset, operatorArguments.count1)
 | 
				
			||||||
 | 
					      if (target != null && target > caret.vimSelectionStart) {
 | 
				
			||||||
 | 
					        return target.toMotionOrError()
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    return injector.searchHelper.findPreviousCamelStart(editor.text(), caret.offset, operatorArguments.count1)
 | 
					    return injector.searchHelper.findPreviousCamelStart(editor.text(), caret.offset, operatorArguments.count1)
 | 
				
			||||||
      ?.toMotionOrError() ?: Motion.Error
 | 
					      ?.toMotionOrError() ?: Motion.Error
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
@@ -47,6 +53,10 @@ class MotionCamelRightAction : MotionActionHandler.ForEachCaret() {
 | 
				
			|||||||
    argument: Argument?,
 | 
					    argument: Argument?,
 | 
				
			||||||
    operatorArguments: OperatorArguments,
 | 
					    operatorArguments: OperatorArguments,
 | 
				
			||||||
  ): Motion {
 | 
					  ): Motion {
 | 
				
			||||||
 | 
					    if (caret.hasSelection() && caret.offset >= caret.vimSelectionStart) {
 | 
				
			||||||
 | 
					      return injector.searchHelper.findNextCamelEnd(editor.text(), caret.offset + 1, operatorArguments.count1)
 | 
				
			||||||
 | 
					        ?.toMotionOrError() ?: Motion.Error
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    return injector.searchHelper.findNextCamelStart(editor.text(), caret.offset + 1, operatorArguments.count1)
 | 
					    return injector.searchHelper.findNextCamelStart(editor.text(), caret.offset + 1, operatorArguments.count1)
 | 
				
			||||||
      ?.toMotionOrError() ?: Motion.Error
 | 
					      ?.toMotionOrError() ?: Motion.Error
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user