1
0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-05-10 03:34:06 +02:00

Replace behaviour to the american-style behavior

This commit is contained in:
Alex Plate 2019-07-17 14:39:09 +03:00
parent 8750c30b7d
commit 68ae03ef85
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
18 changed files with 59 additions and 59 deletions

View File

@ -97,7 +97,7 @@ To Be Released
* Incremental search highlights all matches in file, not just first
* Added incremental search highlights for `:substitute` command
* Fix exception when trying to highlight last CR in file
* Improve behaviour of `<BS>` in command line entry
* Improve behavior of `<BS>` in command line entry
* [VIM-1626](https://youtrack.jetbrains.com/issue/VIM-1626) Add `ideajoin` option
* [VIM-959](https://youtrack.jetbrains.com/issue/VIM-959) Add `ideamarks` option
* [VIM-608](https://youtrack.jetbrains.com/issue/VIM-608) Automatic upload files on explicit save
@ -551,7 +551,7 @@ Bug fixes:
* VIM-312 Fixed range and caret position after `dw` on the last single-word
line, `w` command argument for the last word in file
* Fixed `w` motion at the last word
* VIM-85 Bug fix for gi behaviour
* VIM-85 Bug fix for gi behavior
* Always move cursor at the beginning of the deleted range
* VIM-275 Fixed edge cases for `i{` motion
* VIM-314 Made `i{` motion characterwise, not linewise/characterwise in visual

View File

@ -26,7 +26,7 @@ You can start by:
- Picking relatively simple tasks that are tagged with
[#patch_welcome](https://youtrack.jetbrains.com/issues/VIM?q=%23patch_welcome%20%23Unresolved%20sort%20by:%20votes%20)
in the issue tracker.
- Read about `@VimBehaviourDiffers` annotation and fix corresponding functionality.
- Read about `@VimBehaviorDiffers` annotation and fix corresponding functionality.
### Development Environment
@ -93,7 +93,7 @@ in the issue tracker.
### Testing
1. Read about `@VimBehaviourDiffers` annotation.
1. Read about `@VimBehaviorDiffers` annotation.
2. Please avoid senseless text like "dhjkwaldjwa", "asdasdasd",
"123 123 123 123", etc. Try to select a text that you can simply

View File

@ -159,7 +159,7 @@ Changes to the IDE
### Undo/Redo
The IdeaVim plugin uses the undo/redo functionality of the IntelliJ platform,
so the behaviour of the `u` and `<C-R>` commands may differ from the original
so the behavior of the `u` and `<C-R>` commands may differ from the original
Vim. Vim compatibility of undo/redo may be improved in future releases.
See also [unresolved undo issues](http://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+u).

View File

@ -663,7 +663,7 @@ public class MotionGroup {
if (diff != 0) {
// If we need to scroll the current line more than half a screen worth of lines then we just centre the new
// current line. This mimics vim behaviour of e.g. 100G in a 300 line file with a screen size of 25 centering line
// current line. This mimics vim behavior of e.g. 100G in a 300 line file with a screen size of 25 centering line
// 100. It also handles so=999 keeping the current line centred.
// It doesn't handle keeping the line centred when scroll offset is less than a full page height, as the new line
// might be within e.g. top + scroll offset, so we test for that separately.

View File

@ -26,7 +26,7 @@ import java.util.*
/**
* This annotation is created for test functions (methods).
* It means that original vim behaviour has small differences from behaviour of IdeaVim.
* It means that original vim behavior has small differences from behavior of IdeaVim.
* [shouldBeFixed] flag indicates whether the given functionality should be fixed
* or the given behavior is normal for IdeaVim and should be leaved as is.
*
@ -42,19 +42,19 @@ import java.util.*
* Hello3
*
* Why this annotation exists?
* After creating some functionality you can understand that IdeaVim has a bit different behaviour, but you
* After creating some functionality you can understand that IdeaVim has a bit different behavior, but you
* cannot fix it right now because of any reasons (bugs in IDE,
* the impossibility of this functionality in IDEA (*[shouldBeFixed] == false*), leak of time for fixing).
* In that case, you should NOT remove the corresponding test or leave it without any marks that this test
* not fully convenient with vim, but leave the test with IdeaVim's behaviour and put this annotation
* not fully convenient with vim, but leave the test with IdeaVim's behavior and put this annotation
* with description of how original vim works.
*
* Note that using this annotation should be avoided as much as possible and behaviour of IdeaVim should be as close
* Note that using this annotation should be avoided as much as possible and behavior of IdeaVim should be as close
* to vim as possible.
*/
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.FUNCTION)
annotation class VimBehaviourDiffers(
annotation class VimBehaviorDiffers(
val originalVimAfter: String = "",
val description: String = "",
val shouldBeFixed: Boolean = true

View File

@ -58,7 +58,7 @@ public class ExTextField extends JTextField {
@Override
public void mouseClicked(MouseEvent e) {
// If we're in the middle of an action (e.g. entering a register to paste, or inserting a digraph), cancel it if
// the mouse is clicked anywhere. Vim's behaviour is to use the mouse click as an event, which can lead to
// the mouse is clicked anywhere. Vim's behavior is to use the mouse click as an event, which can lead to
// something like : !%!C, which I don't believe is documented, or useful
if (currentAction != null) {
clearCurrentAction();

View File

@ -20,7 +20,7 @@ package org.jetbrains.plugins.ideavim.action.change
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
class RepeatChangeActionTest : VimTestCase() {
@ -232,7 +232,7 @@ class RepeatChangeActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers("""
@VimBehaviorDiffers("""
A Discovery
XXXXXnd it in a legendary land

View File

@ -22,7 +22,7 @@ package org.jetbrains.plugins.ideavim.action.change.change
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
class ChangeVisualActionTest : VimTestCase() {
@ -66,7 +66,7 @@ class ChangeVisualActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.INSERT, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I found it in a legendary land
@ -98,7 +98,7 @@ class ChangeVisualActionTest : VimTestCase() {
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I found it in a legendary land

View File

@ -22,7 +22,7 @@ package org.jetbrains.plugins.ideavim.action.change.delete
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
class DeleteVisualLinesEndActionTest : VimTestCase() {
@ -46,7 +46,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}all rocks and lavender and tufted grass,
@ -93,7 +93,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers("""
@VimBehaviorDiffers("""
A Discovery
I found it in a legendary land
@ -165,7 +165,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers("""
@VimBehaviorDiffers("""
A Discovery
I found it in a legendary land
@ -265,7 +265,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}all rocks and lavender and tufted grass,
@ -312,7 +312,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers("""
@VimBehaviorDiffers("""
A Discovery
I found it in a legendary land
@ -342,7 +342,7 @@ class DeleteVisualLinesEndActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
@VimBehaviourDiffers("""
@VimBehaviorDiffers("""
A Discovery
I found it in a legendary land

View File

@ -37,7 +37,7 @@ class InsertDeleteInsertedTextActionTest : VimTestCase() {
}
// VIM-1655
// VimBehaviourDiffers. Inserted text is not deleted after <C-U>
// VimBehaviorDiffers. Inserted text is not deleted after <C-U>
fun `test deleted text is not yanked after replace`() {
doTest(parseKeys("yiw", "eR", "Hello", "<C-U>", "<ESC>p"), """
A Discovery

View File

@ -24,7 +24,7 @@ package org.jetbrains.plugins.ideavim.action.copy
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
import org.jetbrains.plugins.ideavim.rangeOf
import org.junit.Test
@ -514,7 +514,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I found it in a legendary land
@ -547,7 +547,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}Discovery
@ -580,7 +580,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}Discovery
@ -664,7 +664,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I found it in a legendary land
@ -697,7 +697,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}A Discovery
@ -730,7 +730,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${c}A Discovery
@ -802,7 +802,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I |found| it in a legendary land
@ -857,7 +857,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I |found| it in a legendary land
@ -915,7 +915,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
$c|found|
@ -1089,7 +1089,7 @@ class PutVisualTextActionTest : VimTestCase() {
// ----- Case 8: Copied | Linewise | --- pasted | Blockwise | ---| small p |--------------------
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I it in a legendary land
@ -1149,7 +1149,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I it in a legendary land
@ -1186,7 +1186,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I it in a legendary land
@ -1221,7 +1221,7 @@ class PutVisualTextActionTest : VimTestCase() {
myFixture.checkResult(after)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I

View File

@ -23,7 +23,7 @@ import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
import org.junit.Ignore
@ -87,7 +87,7 @@ class PutVisualTextMoveCursorActionTest : VimTestCase() {
myFixture.checkResult(newFile)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
ound it in a legendary land

View File

@ -23,7 +23,7 @@ package org.jetbrains.plugins.ideavim.action.copy
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import junit.framework.TestCase
import org.jetbrains.plugins.ideavim.VimTestCase
import javax.swing.KeyStroke
@ -42,7 +42,7 @@ class YankVisualActionTest : VimTestCase() {
"found", SelectionType.CHARACTER_WISE)
}
@VimBehaviourDiffers("\n")
@VimBehaviorDiffers("\n")
fun `test yank empty line`() {
doTest(parseKeys("v", "y"),
"""
@ -56,7 +56,7 @@ class YankVisualActionTest : VimTestCase() {
"", SelectionType.CHARACTER_WISE)
}
@VimBehaviourDiffers("land\n")
@VimBehaviorDiffers("land\n")
fun `test yank to the end`() {
doTest(parseKeys("viwl", "y"),
"""

View File

@ -22,7 +22,7 @@ package org.jetbrains.plugins.ideavim.action.motion.leftright
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
class MotionLastColumnActionTest : VimTestCase() {
@ -89,7 +89,7 @@ class MotionLastColumnActionTest : VimTestCase() {
doTest(keys, before, after, CommandState.Mode.VISUAL, CommandState.SubMode.VISUAL_BLOCK)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I ${s}found it in a legendary lan${c}d${se}

View File

@ -20,7 +20,7 @@ package org.jetbrains.plugins.ideavim.action.motion.select
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
/**
@ -232,7 +232,7 @@ class SelectKeyHandlerTest : VimTestCase() {
CommandState.SubMode.NONE)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
Hello
Hellofound it in a legendary land

View File

@ -22,7 +22,7 @@ package org.jetbrains.plugins.ideavim.action.motion.select
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
class SelectToggleVisualModeHandlerTest : VimTestCase() {
@ -246,7 +246,7 @@ class SelectToggleVisualModeHandlerTest : VimTestCase() {
CommandState.SubMode.VISUAL_CHARACTER)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${s}${c}I${se} found it in a legendary land
@ -274,7 +274,7 @@ class SelectToggleVisualModeHandlerTest : VimTestCase() {
CommandState.SubMode.VISUAL_CHARACTER)
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
${s}I found it in a legendary land

View File

@ -20,7 +20,7 @@ package org.jetbrains.plugins.ideavim.ex
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.helper.StringHelper
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import com.maddyhome.idea.vim.option.OptionsManager
import com.maddyhome.idea.vim.ui.ExDocument
import com.maddyhome.idea.vim.ui.ExEntryPanel
@ -196,7 +196,7 @@ class ExEntryTest : VimTestCase() {
assertExText("rch")
}
@VimBehaviourDiffers(description = "Vim reorders history even when cancelling entry")
@VimBehaviorDiffers(description = "Vim reorders history even when cancelling entry")
fun `test command history`() {
typeExInput(":set digraph<CR>")
typeExInput(":digraph<CR>")
@ -211,7 +211,7 @@ class ExEntryTest : VimTestCase() {
deactivateExEntry()
// TODO: Vim behaviour reorders the history even when cancelling history
// TODO: Vim behavior reorders the history even when cancelling history
// typeExInput(":<Up>")
// assertExText("set digraph")
// typeText("<Up>")
@ -294,7 +294,7 @@ class ExEntryTest : VimTestCase() {
assertExText("something cool")
}
@VimBehaviourDiffers(description = "Vim reorders history even when cancelling entry")
@VimBehaviorDiffers(description = "Vim reorders history even when cancelling entry")
fun `test matching search history`() {
typeExInput("/something cool<CR>")
typeExInput("/not cool<CR>")
@ -307,7 +307,7 @@ class ExEntryTest : VimTestCase() {
deactivateExEntry()
// TODO: Vim behaviour reorders the history even when cancelling history
// TODO: Vim behavior reorders the history even when cancelling history
// typeExInput(":<Up>")
// assertEquals("set digraph", exEntryPanel.text)
// typeText("<Up>")
@ -361,7 +361,7 @@ class ExEntryTest : VimTestCase() {
assertExOffset(0)
}
@VimBehaviourDiffers(description = "Moving one word right positions caret at end of previous word")
@VimBehaviorDiffers(description = "Moving one word right positions caret at end of previous word")
fun `test move caret one WORD right`() {
typeExInput(":set incsearch")
caret.dot = 0

View File

@ -23,7 +23,7 @@ package org.jetbrains.plugins.ideavim.group.motion
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.helper.VimBehaviourDiffers
import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
import org.jetbrains.plugins.ideavim.VimTestCase
/**
@ -76,7 +76,7 @@ class VisualMotionGroup_ControlNonVimSelection_Test : VimTestCase() {
assertCaretsColour()
}
@VimBehaviourDiffers(originalVimAfter = """
@VimBehaviorDiffers(originalVimAfter = """
A Discovery
I ${s}found i${c}t$se in a legendary land