chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-03-07 12:32:52 +01:00
Code

Fix problems after rebase

Browse Source
This commit is contained in:
Alex Plate 2019-04-12 18:55:33 +03:00
parent 03a934a8e9
commit b69d7f9729
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
3 changed files with 16 additions and 12 deletions
src/com/maddyhome/idea/vim/group
ChangeGroup.java
test/org/jetbrains/plugins/ideavim/action/motion
leftright
MotionRightActionTest.kt
updown
MotionPercentOrMatchActionTest.kt

2
src/com/maddyhome/idea/vim/group/ChangeGroup.java
View File

@ -20,6 +20,8 @@ package com.maddyhome.idea.vim.group;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.intellij.codeInsight.template.Template;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DataContext;

13
test/org/jetbrains/plugins/ideavim/action/motion/leftright/MotionRightActionTest.kt
View File

@ -1,5 +1,6 @@
package org.jetbrains.plugins.ideavim.action.motion.leftright
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import org.jetbrains.plugins.ideavim.VimTestCase
@ -19,7 +20,7 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test simple motion with repeat`() {
@ -37,7 +38,7 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test simple motion to the end`() {
@ -55,7 +56,7 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `ignore test simple motion non-ascii`() {
@ -73,7 +74,7 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `ignore test simple motion emoji`() {
@ -91,7 +92,7 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test simple motion tab`() {
@ -109,6 +110,6 @@ class MotionRightActionTest : VimTestCase() {
all rocks and lavender and tufted grass,
where it was settled on some sodden sand
hard by the torrent of a mountain pass.
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
}

13
test/org/jetbrains/plugins/ideavim/action/motion/updown/MotionPercentOrMatchActionTest.kt
View File

@ -18,6 +18,7 @@
package org.jetbrains.plugins.ideavim.action.motion.updown
import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import org.jetbrains.plugins.ideavim.VimTestCase
@ -151,7 +152,7 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
}
}
<caret>}
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test motion outside text`() {
@ -170,26 +171,26 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
""${'"'}
""${'"'}
)
""".trimIndent())
""".trimIndent(), CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test motion in text`() {
doTest(parseKeys("%"), """ "I found <caret>it in a (legendary) land" """,
""" "I found it in a (legendary<caret>) land" """)
""" "I found it in a (legendary<caret>) land" """, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test motion in text with quotes`() {
doTest(parseKeys("%"), """ "I found <caret>it in \"a (legendary) land" """,
""" "I found it in \"a (legendary<caret>) land" """)
""" "I found it in \"a (legendary<caret>) land" """, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test motion in text with quotes start before quote`() {
doTest(parseKeys("%"), """ <caret> "I found it in \"a (legendary) land" """,
""" "I found it in \"a (legendary<caret>) land" """)
""" "I found it in \"a (legendary<caret>) land" """, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
fun `test motion in text with quotes and double escape`() {
doTest(parseKeys("%"), """ "I found <caret>it in \\\"a (legendary) land" """,
""" "I found it in \\\"a (legendary<caret>) land" """)
""" "I found it in \\\"a (legendary<caret>) land" """, CommandState.Mode.COMMAND, CommandState.SubMode.NONE)
}
}