chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-05-29 19:34:09 +02:00
Code

Minor code cleanup. No logic changes

Browse Source
This commit is contained in:
Matt Ellis 2025-01-15 14:47:09 +00:00 committed by Alex Pláte
parent 2da77f0f11
commit 76f7d81129
1 changed files with 15 additions and 35 deletions

50
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimSearchHelperBase.kt
View File

@ -1392,39 +1392,29 @@ abstract class VimSearchHelperBase : VimSearchHelper {
logger.debug("hasSelection=$hasSelection") logger.debug("hasSelection=$hasSelection")
val chars: CharSequence = editor.text() val chars: CharSequence = editor.text()
//int min = EditorHelper.getLineStartOffset(editor, EditorHelper.getCurrentLogicalLine(editor));
//int max = EditorHelper.getLineEndOffset(editor, EditorHelper.getCurrentLogicalLine(editor), true);
val min = 0
val max: Int = editor.fileSize().toInt() val max: Int = editor.fileSize().toInt()
if (max == 0) return TextRange(0, 0) if (max == 0) return TextRange(0, 0)
logger.debug("min=$min")
logger.debug("max=$max") logger.debug("max=$max")
val pos: Int = caret.offset val pos: Int = caret.offset
if (chars.length <= pos) return TextRange(chars.length - 1, chars.length - 1) if (chars.length <= pos) return TextRange(chars.length - 1, chars.length - 1)
val startSpace = charType(editor, chars[pos], isBig) === CharacterHelper.CharacterType.WHITESPACE val startSpace = charType(editor, chars[pos], isBig) === CharacterHelper.CharacterType.WHITESPACE
// Find word start // Find word start
val onWordStart = pos == min || val onWordStart = pos == 0 || charType(editor, chars[pos - 1], isBig) !== charType(editor, chars[pos], isBig)
charType(editor, chars[pos - 1], isBig) !==
charType(editor, chars[pos], isBig)
var start = pos var start = pos
logger.debug("pos=$pos") logger.debug("pos=$pos")
logger.debug("onWordStart=$onWordStart") logger.debug("onWordStart=$onWordStart")
if (!onWordStart && !(startSpace && isOuter) || hasSelection || count > 1 && dir == -1) { if ((!onWordStart && !(startSpace && isOuter)) || hasSelection || (count > 1 && dir == -1)) {
start = if (dir == 1) { start = if (dir == 1) {
findNextWord(editor, pos, -1, isBig, !isOuter) findNextWord(editor, pos, -1, isBig, !isOuter)
} else { } else {
findNextWord( val c = -(count - if (onWordStart && !hasSelection) 1 else 0)
editor, findNextWord(editor, pos, c, isBig, !isOuter)
pos,
-(count - if (onWordStart && !hasSelection) 1 else 0),
isBig,
!isOuter
)
} }
start = editor.normalizeOffset(start, false) start = editor.normalizeOffset(start, false)
} }
@ -1432,18 +1422,14 @@ abstract class VimSearchHelperBase : VimSearchHelper {
logger.debug("start=$start") logger.debug("start=$start")
// Find word end // Find word end
val onWordEnd = pos >= max - 1 || charType(editor, chars[pos + 1], isBig) !== charType(editor, chars[pos], isBig)
// Find word end
val onWordEnd = pos >= max - 1 ||
charType(editor, chars[pos + 1], isBig) !==
charType(editor, chars[pos], isBig)
logger.debug("onWordEnd=$onWordEnd") logger.debug("onWordEnd=$onWordEnd")
var end = pos var end = pos
if (!onWordEnd || hasSelection || count > 1 && dir == 1 || startSpace && isOuter) { if (!onWordEnd || hasSelection || (count > 1 && dir == 1) || (startSpace && isOuter)) {
end = if (dir == 1) { end = if (dir == 1) {
val c = count - if (onWordEnd && !hasSelection && (!(startSpace && isOuter) || startSpace && !isOuter)) 1 else 0 val c = count - if (onWordEnd && !hasSelection && (!(startSpace && isOuter) || (startSpace && !isOuter))) 1 else 0
findNextWordEnd(editor, pos, c, isBig, !isOuter) findNextWordEnd(editor, pos, c, isBig, !isOuter)
} else { } else {
findNextWordEnd(editor, pos, 1, isBig, !isOuter) findNextWordEnd(editor, pos, 1, isBig, !isOuter)
@ -1452,7 +1438,7 @@ abstract class VimSearchHelperBase : VimSearchHelper {
logger.debug("end=$end") logger.debug("end=$end")
var goBack = startSpace && !hasSelection || !startSpace && hasSelection && !onWordStart var goBack = (startSpace && !hasSelection) || (!startSpace && hasSelection && !onWordStart)
if (dir == 1 && isOuter) { if (dir == 1 && isOuter) {
var firstEnd = end var firstEnd = end
if (count > 1) { if (count > 1) {
@ -1465,14 +1451,14 @@ abstract class VimSearchHelperBase : VimSearchHelper {
} }
} }
if (dir == -1 && isOuter && startSpace) { if (dir == -1 && isOuter && startSpace) {
if (pos > min) { if (pos > 0) {
if (charType(editor, chars[pos - 1], false) !== CharacterHelper.CharacterType.WHITESPACE) { if (charType(editor, chars[pos - 1], false) !== CharacterHelper.CharacterType.WHITESPACE) {
goBack = true goBack = true
} }
} }
} }
var goForward = dir == 1 && isOuter && (!startSpace && !onWordEnd || startSpace && onWordEnd && hasSelection) var goForward = dir == 1 && isOuter && ((!startSpace && !onWordEnd) || (startSpace && onWordEnd && hasSelection))
if (!goForward && dir == 1 && isOuter) { if (!goForward && dir == 1 && isOuter) {
var firstEnd = end var firstEnd = end
if (count > 1) { if (count > 1) {
@ -1486,9 +1472,7 @@ abstract class VimSearchHelperBase : VimSearchHelper {
} }
if (!goForward && dir == 1 && isOuter && !startSpace && !hasSelection) { if (!goForward && dir == 1 && isOuter && !startSpace && !hasSelection) {
if (end < max - 1) { if (end < max - 1) {
if (charType(editor, chars[end + 1], !isBig) !== if (charType(editor, chars[end + 1], !isBig) !== charType(editor, chars[end], !isBig)) {
charType(editor, chars[end], !isBig)
) {
goForward = true goForward = true
} }
} }
@ -1499,18 +1483,14 @@ abstract class VimSearchHelperBase : VimSearchHelper {
if (goForward) { if (goForward) {
if (editor.anyNonWhitespace(end, 1)) { if (editor.anyNonWhitespace(end, 1)) {
while (end + 1 < max && while (end + 1 < max && charType(editor, chars[end + 1], false) === CharacterHelper.CharacterType.WHITESPACE) {
charType(editor, chars[end + 1], false) === CharacterHelper.CharacterType.WHITESPACE
) {
end++ end++
} }
} }
} }
if (goBack) { if (goBack) {
if (editor.anyNonWhitespace(start, -1)) { if (editor.anyNonWhitespace(start, -1)) {
while (start > min && while (start > 0 && charType(editor, chars[start - 1], false) === CharacterHelper.CharacterType.WHITESPACE) {
charType(editor, chars[start - 1], false) === CharacterHelper.CharacterType.WHITESPACE
) {
start-- start--
} }
} }
@ -1519,7 +1499,7 @@ abstract class VimSearchHelperBase : VimSearchHelper {
logger.debug("start=$start") logger.debug("start=$start")
logger.debug("end=$end") logger.debug("end=$end")
// End offset is exclusive // Text range's end offset is exclusive
return TextRange(start, end + 1) return TextRange(start, end + 1)
} }