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

Optimize imports

Browse Source
This commit is contained in:
Alex Plate 2025-01-10 12:18:32 +03:00
parent 378611fe8f
commit 36556d559f
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
51 changed files with 88 additions and 78 deletions

4
src/main/java/com/maddyhome/idea/vim/extension/argtextobj/VimArgTextObjExtension.java
View File

@ -12,7 +12,9 @@ import com.intellij.openapi.editor.Document;
import com.maddyhome.idea.vim.KeyHandler;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.api.*;
import com.maddyhome.idea.vim.command.*;
import com.maddyhome.idea.vim.command.MappingMode;
import com.maddyhome.idea.vim.command.OperatorArguments;
import com.maddyhome.idea.vim.command.TextObjectVisualType;
import com.maddyhome.idea.vim.common.TextRange;
import com.maddyhome.idea.vim.extension.ExtensionHandler;
import com.maddyhome.idea.vim.extension.VimExtension;

4
src/main/java/com/maddyhome/idea/vim/extension/textobjentire/VimTextObjEntireExtension.java
View File

@ -14,7 +14,9 @@ import com.maddyhome.idea.vim.api.ExecutionContext;
import com.maddyhome.idea.vim.api.ImmutableVimCaret;
import com.maddyhome.idea.vim.api.VimEditor;
import com.maddyhome.idea.vim.api.VimInjectorKt;
import com.maddyhome.idea.vim.command.*;
import com.maddyhome.idea.vim.command.MappingMode;
import com.maddyhome.idea.vim.command.OperatorArguments;
import com.maddyhome.idea.vim.command.TextObjectVisualType;
import com.maddyhome.idea.vim.common.TextRange;
import com.maddyhome.idea.vim.extension.ExtensionHandler;
import com.maddyhome.idea.vim.extension.VimExtension;

4
src/main/java/com/maddyhome/idea/vim/extension/textobjindent/VimIndentObject.java
View File

@ -14,7 +14,9 @@ import com.maddyhome.idea.vim.api.ExecutionContext;
import com.maddyhome.idea.vim.api.ImmutableVimCaret;
import com.maddyhome.idea.vim.api.VimEditor;
import com.maddyhome.idea.vim.api.VimInjectorKt;
import com.maddyhome.idea.vim.command.*;
import com.maddyhome.idea.vim.command.MappingMode;
import com.maddyhome.idea.vim.command.OperatorArguments;
import com.maddyhome.idea.vim.command.TextObjectVisualType;
import com.maddyhome.idea.vim.common.TextRange;
import com.maddyhome.idea.vim.extension.ExtensionHandler;
import com.maddyhome.idea.vim.extension.VimExtension;

3
src/main/java/com/maddyhome/idea/vim/group/EditorGroup.java
View File

@ -23,7 +23,6 @@ import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
import com.intellij.openapi.project.Project;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.api.*;
import com.maddyhome.idea.vim.ex.ExOutputModel;
import com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt;
import com.maddyhome.idea.vim.helper.EditorHelper;
import com.maddyhome.idea.vim.helper.UserDataManager;
@ -43,7 +42,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.intellij.openapi.editor.EditorSettings.*;
import static com.intellij.openapi.editor.EditorSettings.LineNumerationType;
import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
import static com.maddyhome.idea.vim.api.VimInjectorKt.options;
import static com.maddyhome.idea.vim.newapi.IjVimInjectorKt.ijOptions;

5
src/main/java/com/maddyhome/idea/vim/group/HistoryGroup.java
View File

@ -14,7 +14,10 @@ import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.diagnostic.Logger;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.history.*;
import com.maddyhome.idea.vim.history.HistoryBlock;
import com.maddyhome.idea.vim.history.HistoryEntry;
import com.maddyhome.idea.vim.history.VimHistory;
import com.maddyhome.idea.vim.history.VimHistoryBase;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

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

@ -39,8 +39,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.util.List;
import java.util.*;
import java.util.List;
import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
import static java.util.stream.Collectors.toList;

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

@ -14,7 +14,6 @@ import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.diagnostic.Logger;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.api.VimInjectorKt;
import com.maddyhome.idea.vim.newapi.IjVimInjectorKt;
import com.maddyhome.idea.vim.register.Register;
import com.maddyhome.idea.vim.register.VimRegisterGroupBase;
@ -26,7 +25,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;

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

@ -31,8 +31,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.List;
import java.util.*;
import java.util.List;
public class WindowGroup extends WindowGroupBase {
@Override

2
src/main/java/com/maddyhome/idea/vim/group/visual/VimVisualTimer.kt
View File

@ -9,6 +9,8 @@
package com.maddyhome.idea.vim.group.visual
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.group.visual.VimVisualTimer.mode
import com.maddyhome.idea.vim.group.visual.VimVisualTimer.singleTask
import com.maddyhome.idea.vim.newapi.globalIjOptions
import com.maddyhome.idea.vim.state.mode.Mode
import java.awt.event.ActionEvent

1
src/main/java/com/maddyhome/idea/vim/newapi/IjClipboardManager.kt
View File

@ -25,7 +25,6 @@ import com.intellij.util.ui.EmptyClipboardOwner
import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimClipboardManager
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.getText
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.common.VimCopiedText

2
src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt
View File

@ -8,7 +8,6 @@
package com.maddyhome.idea.vim.newapi
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.PersistentStateComponent
import com.intellij.openapi.components.RoamingType
import com.intellij.openapi.components.State
@ -33,7 +32,6 @@ import com.maddyhome.idea.vim.helper.shouldIgnoreCase
import com.maddyhome.idea.vim.helper.updateSearchHighlights
import com.maddyhome.idea.vim.helper.vimLastHighlighters
import com.maddyhome.idea.vim.options.GlobalOptionChangeListener
import com.maddyhome.idea.vim.vimscript.model.functions.handlers.SubmatchFunctionHandler
import org.jdom.Element
import org.jetbrains.annotations.Contract
import org.jetbrains.annotations.TestOnly

5
src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java
View File

@ -23,7 +23,10 @@ import com.maddyhome.idea.vim.EventFacade;
import com.maddyhome.idea.vim.KeyHandler;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.action.VimShortcutKeyAction;
import com.maddyhome.idea.vim.api.*;
import com.maddyhome.idea.vim.api.VimCommandLine;
import com.maddyhome.idea.vim.api.VimCommandLineCaret;
import com.maddyhome.idea.vim.api.VimEditor;
import com.maddyhome.idea.vim.api.VimKeyGroupBase;
import com.maddyhome.idea.vim.ex.ranges.LineRange;
import com.maddyhome.idea.vim.helper.SearchHighlightsHelper;
import com.maddyhome.idea.vim.helper.UiHelper;

8
src/main/java/com/maddyhome/idea/vim/ui/ex/ExTextField.java
View File

@ -32,14 +32,18 @@ import javax.swing.*;
import javax.swing.plaf.basic.BasicTextFieldUI;
import javax.swing.text.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.geom.Area;
import java.awt.geom.Rectangle2D;
import java.util.Date;
import java.util.List;
import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
import static java.lang.Math.*;
import static java.lang.Math.ceil;
import static java.lang.Math.max;
/**
* Provides a custom keymap for the text field. The keymap is the VIM Ex command keymapping

2
src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/services/VimVariableServiceTest.kt
View File

@ -8,10 +8,8 @@
package org.jetbrains.plugins.ideavim.ex.implementation.services
import com.maddyhome.idea.vim.api.injector
import org.jetbrains.plugins.ideavim.VimTestCase
import org.junit.jupiter.api.Test
import kotlin.test.assertEquals
class VimVariableServiceTest : VimTestCase() {
@Test

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/BreakUndoSequenceAction.kt
View File

@ -20,7 +20,7 @@ import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
import java.util.EnumSet
import java.util.*
@CommandOrMotion(keys = ["<C-G>u"], modes = [Mode.INSERT])
class BreakUndoSequenceAction : VimActionHandler.SingleExecution() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.kt
View File

@ -20,7 +20,7 @@ import com.maddyhome.idea.vim.command.CommandFlags.FLAG_NO_REPEAT_INSERT
import com.maddyhome.idea.vim.command.DuplicableOperatorAction
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.helper.enumSetOf
import java.util.EnumSet
import java.util.*
@CommandOrMotion(keys = ["c"], modes = [Mode.NORMAL])
class ChangeMotionAction : ChangeInInsertSequenceAction(), DuplicableOperatorAction {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.kt
View File

@ -19,11 +19,11 @@ import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MOT_LINEWISE
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.*
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.kt
View File

@ -19,11 +19,11 @@ import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MOT_LINEWISE
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.*
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.kt
View File

@ -18,11 +18,11 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.*
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.kt
View File

@ -18,11 +18,11 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.*
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/copy/YankVisualLinesAction.kt
View File

@ -16,11 +16,11 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.*
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/ToggleInsertModeAction.kt
View File

@ -18,7 +18,7 @@ import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import java.util.EnumSet
import java.util.*
@CommandOrMotion(keys = ["<Insert>"], modes = [Mode.CMD_LINE])
class ToggleInsertModeAction : VimActionHandler.SingleExecution() {

4
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/gn/VisualSelectSearch.kt
View File

@ -16,12 +16,12 @@ import com.maddyhome.idea.vim.command.Argument
import com.maddyhome.idea.vim.command.CommandFlags
import com.maddyhome.idea.vim.command.MotionType
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.handler.Motion
import com.maddyhome.idea.vim.handler.MotionActionHandler
import com.maddyhome.idea.vim.handler.toMotionOrError
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.helper.noneOfEnum
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.state.mode.inVisualMode
import java.util.*
import kotlin.math.max

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/leftright/MotionEndAction.kt
View File

@ -21,9 +21,9 @@ import com.maddyhome.idea.vim.command.MotionType
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.handler.Motion
import com.maddyhome.idea.vim.handler.NonShiftedSpecialKeyHandler
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
import com.maddyhome.idea.vim.state.mode.inSelectMode
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
@CommandOrMotion(keys = ["<End>"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.SELECT, Mode.OP_PENDING])
class MotionEndAction : NonShiftedSpecialKeyHandler() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/leftright/MotionLastColumnAction.kt
View File

@ -23,8 +23,8 @@ import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.handler.Motion
import com.maddyhome.idea.vim.handler.MotionActionHandler
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.helper.isEndAllowed
import com.maddyhome.idea.vim.state.mode.inVisualMode
import java.util.*
abstract class MotionLastColumnBaseAction(private val isMotionForOperator: Boolean = false)

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/leftright/MotionShiftEndAction.kt
View File

@ -18,9 +18,9 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.api.options
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.handler.ShiftedSpecialKeyHandler
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
import com.maddyhome.idea.vim.state.mode.inSelectMode
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
@CommandOrMotion(keys = ["<S-End>"], modes = [Mode.INSERT, Mode.NORMAL, Mode.VISUAL, Mode.SELECT])
class MotionShiftEndAction : ShiftedSpecialKeyHandler() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/select/SelectEnableLineModeAction.kt
View File

@ -17,9 +17,9 @@ import com.maddyhome.idea.vim.api.getLineStartForOffset
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.group.visual.vimSetSystemSelectionSilently
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.state.mode.SelectionType
/**
* @author Alex Plate

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/updown/MotionGotoLineLastEndAction.kt
View File

@ -24,8 +24,8 @@ import com.maddyhome.idea.vim.handler.Motion
import com.maddyhome.idea.vim.handler.MotionActionHandler
import com.maddyhome.idea.vim.handler.toMotion
import com.maddyhome.idea.vim.helper.enumSetOf
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
import java.util.*
@CommandOrMotion(keys = ["<C-End>"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/visual/VisualToggleBlockModeAction.kt
View File

@ -15,9 +15,9 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.api.options
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.options.OptionConstants
import com.maddyhome.idea.vim.state.mode.SelectionType
@CommandOrMotion(keys = ["<C-q>", "<C-v>"], modes = [Mode.NORMAL, Mode.VISUAL])
class VisualToggleBlockModeAction : VimActionHandler.SingleExecution() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/visual/VisualToggleCharacterModeAction.kt
View File

@ -15,9 +15,9 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.api.options
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.options.OptionConstants
import com.maddyhome.idea.vim.state.mode.SelectionType
@CommandOrMotion(keys = ["v"], modes = [Mode.NORMAL, Mode.VISUAL])
class VisualToggleCharacterModeAction : VimActionHandler.SingleExecution() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/visual/VisualToggleLineModeAction.kt
View File

@ -17,10 +17,10 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.api.options
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.group.visual.vimSetSelection
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.options.OptionConstants
import com.maddyhome.idea.vim.state.mode.SelectionType
@CommandOrMotion(keys = ["V"], modes = [Mode.NORMAL, Mode.VISUAL])
class VisualToggleLineModeAction : VimActionHandler.ConditionalMulticaret() {

1
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimDigraphGroupBase.kt
View File

@ -16,7 +16,6 @@ import com.maddyhome.idea.vim.helper.EngineStringHelper
import org.jetbrains.annotations.TestOnly
import java.util.*
import javax.swing.KeyStroke
import kotlin.Char
import kotlin.math.ceil
private val logger = vimLogger<VimDigraphGroup>()

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/handler/SpecialKeyHandlers.kt
View File

@ -20,9 +20,9 @@ import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.helper.exitVisualMode
import com.maddyhome.idea.vim.options.OptionConstants
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
import com.maddyhome.idea.vim.state.mode.inSelectMode
import com.maddyhome.idea.vim.state.mode.inVisualMode
import com.maddyhome.idea.vim.state.mode.isInsertionAllowed
/**
* @author Alex Plate

1
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/macro/VimMacroBase.kt
View File

@ -16,7 +16,6 @@ import com.maddyhome.idea.vim.diagnostic.VimLogger
import com.maddyhome.idea.vim.diagnostic.debug
import com.maddyhome.idea.vim.diagnostic.trace
import com.maddyhome.idea.vim.diagnostic.vimLogger
import javax.swing.KeyStroke
abstract class VimMacroBase : VimMacro {
override var lastRegister: Char = 0.toChar()

3
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/options/OptionDeclaredScope.kt
View File

@ -8,6 +8,9 @@
package com.maddyhome.idea.vim.options
import com.maddyhome.idea.vim.options.OptionDeclaredScope.LOCAL_TO_WINDOW
/**
* Represents the declared scope for an option, e.g. global, global-local or local to window or buffer.
*

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/PutData.kt
View File

@ -10,9 +10,9 @@ package com.maddyhome.idea.vim.put
import com.maddyhome.idea.vim.api.VimCaret
import com.maddyhome.idea.vim.common.VimCopiedText
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.group.visual.VimSelection
import com.maddyhome.idea.vim.register.Register
import com.maddyhome.idea.vim.state.mode.SelectionType
/**
* [putToLine] has affect only of [insertTextBeforeCaret] is false and [visualSelection] is null

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/VimPut.kt
View File

@ -11,8 +11,8 @@ package com.maddyhome.idea.vim.put
import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimCaret
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.helper.RWLockLabel
import com.maddyhome.idea.vim.state.mode.SelectionType
interface VimPut {
fun doIndent(editor: VimEditor, caret: VimCaret, context: ExecutionContext, startOffset: Int, endOffset: Int): Int

4
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/regexp/parser/VimRegexParser.kt
View File

@ -8,11 +8,11 @@
package com.maddyhome.idea.vim.regexp.parser
import com.maddyhome.idea.vim.parser.generated.RegexLexer
import com.maddyhome.idea.vim.parser.generated.RegexParser
import com.maddyhome.idea.vim.regexp.parser.error.BailErrorLexer
import com.maddyhome.idea.vim.regexp.parser.error.VimRegexParserErrorStrategy
import com.maddyhome.idea.vim.regexp.parser.error.VimRegexParserException
import com.maddyhome.idea.vim.parser.generated.RegexLexer
import com.maddyhome.idea.vim.parser.generated.RegexParser
import org.antlr.v4.runtime.CharStreams
import org.antlr.v4.runtime.CommonTokenStream

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/regexp/parser/error/BailErrorLexer.kt
View File

@ -8,8 +8,8 @@
package com.maddyhome.idea.vim.regexp.parser.error
import com.maddyhome.idea.vim.regexp.VimRegexErrors
import com.maddyhome.idea.vim.parser.generated.RegexLexer
import com.maddyhome.idea.vim.regexp.VimRegexErrors
import org.antlr.v4.runtime.CharStream
import org.antlr.v4.runtime.LexerNoViableAltException

4
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/regexp/parser/visitors/PatternVisitor.kt
View File

@ -10,6 +10,8 @@ package com.maddyhome.idea.vim.regexp.parser.visitors
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.options.helpers.KeywordOptionHelper
import com.maddyhome.idea.vim.parser.generated.RegexParser
import com.maddyhome.idea.vim.parser.generated.RegexParserBaseVisitor
import com.maddyhome.idea.vim.regexp.engine.nfa.NFA
import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.AfterColumnCursorMatcher
import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.AfterColumnMatcher
@ -41,8 +43,6 @@ import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.StartOfFileMatcher
import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.StartOfLineMatcher
import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.StartOfWordMatcher
import com.maddyhome.idea.vim.regexp.engine.nfa.matcher.VisualAreaMatcher
import com.maddyhome.idea.vim.parser.generated.RegexParser
import com.maddyhome.idea.vim.parser.generated.RegexParserBaseVisitor
/**
* A tree visitor for converting a parsed Vim pattern into an internal

1
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/CopyTextCommand.kt
View File

@ -11,7 +11,6 @@ package com.maddyhome.idea.vim.vimscript.model.commands
import com.intellij.vim.annotations.ExCommand
import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.getText
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.ex.ranges.Range

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/NormalCommand.kt
View File

@ -15,10 +15,10 @@ import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.VimMarkService
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.state.mode.Mode
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.ex.ranges.Range
import com.maddyhome.idea.vim.helper.exitVisualMode
import com.maddyhome.idea.vim.state.mode.Mode
import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
// todo make it for each caret

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/PutLinesCommand.kt
View File

@ -13,9 +13,9 @@ import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.ex.ranges.Range
import com.maddyhome.idea.vim.put.PutData
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/RegistersCommand.kt
View File

@ -13,8 +13,8 @@ import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.ex.ranges.Range
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
/**

4
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/parser/visitors/ExecutableVisitor.kt
View File

@ -8,6 +8,8 @@
package com.maddyhome.idea.vim.vimscript.parser.visitors
import com.maddyhome.idea.vim.parser.generated.VimscriptBaseVisitor
import com.maddyhome.idea.vim.parser.generated.VimscriptParser
import com.maddyhome.idea.vim.vimscript.model.Executable
import com.maddyhome.idea.vim.vimscript.model.expressions.Expression
import com.maddyhome.idea.vim.vimscript.model.expressions.OneElementSublistExpression
@ -30,8 +32,6 @@ import com.maddyhome.idea.vim.vimscript.model.statements.loops.ContinueStatement
import com.maddyhome.idea.vim.vimscript.model.statements.loops.ForLoop
import com.maddyhome.idea.vim.vimscript.model.statements.loops.ForLoopWithList
import com.maddyhome.idea.vim.vimscript.model.statements.loops.WhileLoop
import com.maddyhome.idea.vim.parser.generated.VimscriptBaseVisitor
import com.maddyhome.idea.vim.parser.generated.VimscriptParser
object ExecutableVisitor : VimscriptBaseVisitor<Executable>() {

42
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/parser/visitors/ExpressionVisitor.kt
View File

@ -9,6 +9,27 @@
package com.maddyhome.idea.vim.vimscript.parser.visitors
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.parser.generated.VimscriptBaseVisitor
import com.maddyhome.idea.vim.parser.generated.VimscriptParser
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.BlobExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.DictionaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.EnvVariableExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FalsyExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FloatExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FunctionCallExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.IntExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.ListExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.LiteralDictionaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.OneElementSublistExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.OptionExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.RegisterExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.StringExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.SublistExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.TernaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.UnaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.VariableContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.VariableExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.WrappedExpressionContext
import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDictionary
import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt
import com.maddyhome.idea.vim.vimscript.model.expressions.BinExpression
@ -34,27 +55,6 @@ import com.maddyhome.idea.vim.vimscript.model.expressions.UnaryExpression
import com.maddyhome.idea.vim.vimscript.model.expressions.Variable
import com.maddyhome.idea.vim.vimscript.model.expressions.operators.BinaryOperator
import com.maddyhome.idea.vim.vimscript.model.expressions.operators.UnaryOperator
import com.maddyhome.idea.vim.parser.generated.VimscriptBaseVisitor
import com.maddyhome.idea.vim.parser.generated.VimscriptParser
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.BlobExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.DictionaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.EnvVariableExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FalsyExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FloatExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.FunctionCallExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.IntExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.ListExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.LiteralDictionaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.OneElementSublistExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.OptionExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.RegisterExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.StringExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.SublistExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.TernaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.UnaryExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.VariableContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.VariableExpressionContext
import com.maddyhome.idea.vim.parser.generated.VimscriptParser.WrappedExpressionContext
import org.antlr.v4.runtime.ParserRuleContext
object ExpressionVisitor : VimscriptBaseVisitor<Expression>() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/parser/visitors/ScriptVisitor.kt
View File

@ -8,9 +8,9 @@
package com.maddyhome.idea.vim.vimscript.parser.visitors
import com.maddyhome.idea.vim.vimscript.model.Script
import com.maddyhome.idea.vim.parser.generated.VimscriptBaseVisitor
import com.maddyhome.idea.vim.parser.generated.VimscriptParser
import com.maddyhome.idea.vim.vimscript.model.Script
object ScriptVisitor : VimscriptBaseVisitor<Script>() {

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/yank/VimYankGroup.kt
View File

@ -12,8 +12,8 @@ import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.command.Argument
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.state.mode.SelectionType
interface VimYankGroup {
/**

2
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/yank/YankGroupBase.kt
View File

@ -18,8 +18,8 @@ import com.maddyhome.idea.vim.api.getLineStartForOffset
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Argument
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.state.mode.SelectionType
import org.jetbrains.annotations.Contract
import kotlin.math.min

2
vim-engine/src/test/kotlin/com/maddyhome/idea/vim/common/GraphemesTest.kt
View File

@ -1,8 +1,8 @@
package com.maddyhome.idea.vim.common
import org.junit.jupiter.api.Test
import java.nio.file.Files
import java.nio.file.Paths
import org.junit.jupiter.api.Test
import kotlin.math.max
import kotlin.math.min
import kotlin.test.assertEquals

2
vim-engine/src/test/kotlin/com/maddyhome/idea/vim/regexp/api/VimRegexTest.kt
View File

@ -19,7 +19,7 @@ import com.maddyhome.idea.vim.regexp.VimRegexTestUtils.mockEditorFromText
import com.maddyhome.idea.vim.regexp.match.VimMatchResult
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test
import java.util.EnumSet
import java.util.*
import kotlin.test.assertEquals
import kotlin.test.fail