Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fleet #899

Merged
merged 10 commits into from
Jun 28, 2024
Merged

Fleet #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bea88e
Remove SearchGroup from GlobalCommand
lippfi Jun 3, 2024
477e4b6
Move DocumentSearchListener to IjVimSearchGroup
lippfi Jun 3, 2024
06de316
Remove deprecated SearchGroup.java
lippfi Jun 3, 2024
4dcb290
Add VimRangeMarker
lippfi Jun 4, 2024
0079eb2
Move GlobalCommand to vim-engine
lippfi Jun 4, 2024
3b0df0f
Move Vimscript visitors to vim-engine
lippfi Jun 4, 2024
4db19be
Move VimscriptParser to vim-engine
lippfi Jun 4, 2024
79b6ed0
Fix test compilation
lippfi Jun 6, 2024
f234472
Fix(VIM-3501): Global commands applied to the following lines if matc…
lippfi Jun 27, 2024
97403e7
Post review improvements
lippfi Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/java/com/maddyhome/idea/vim/VimPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.maddyhome.idea.vim.helper.MacKeyRepeat;
import com.maddyhome.idea.vim.listener.VimListenerManager;
import com.maddyhome.idea.vim.newapi.IjVimInjector;
import com.maddyhome.idea.vim.newapi.IjVimSearchGroup;
import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
import com.maddyhome.idea.vim.vimscript.services.VariableService;
import com.maddyhome.idea.vim.yank.YankGroupBase;
Expand Down Expand Up @@ -123,12 +124,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
return (FileGroup)VimInjectorKt.getInjector().getFile();
}

public static @NotNull SearchGroup getSearch() {
return ApplicationManager.getApplication().getService(SearchGroup.class);
public static @NotNull IjVimSearchGroup getSearch() {
return ApplicationManager.getApplication().getService(IjVimSearchGroup.class);
}

public static @Nullable SearchGroup getSearchIfCreated() {
return ApplicationManager.getApplication().getServiceIfCreated(SearchGroup.class);
public static @Nullable IjVimSearchGroup getSearchIfCreated() {
return ApplicationManager.getApplication().getServiceIfCreated(IjVimSearchGroup.class);
}

public static @NotNull ProcessGroup getProcess() {
Expand Down Expand Up @@ -345,7 +346,7 @@ private void turnOnPlugin() {
}

private void turnOffPlugin(boolean unsubscribe) {
SearchGroup searchGroup = getSearchIfCreated();
IjVimSearchGroup searchGroup = getSearchIfCreated();
if (searchGroup != null) {
searchGroup.turnOff();
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/maddyhome/idea/vim/group/IjOptionProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesB
public var commandOrMotionAnnotation: Boolean by optionProperty(IjOptions.commandOrMotionAnnotation)
public var oldundo: Boolean by optionProperty(IjOptions.oldundo)
public var unifyjumps: Boolean by optionProperty(IjOptions.unifyjumps)
public var useNewRegex: Boolean by optionProperty(IjOptions.useNewRegex)
public var vimscriptFunctionAnnotation: Boolean by optionProperty(IjOptions.vimscriptFunctionAnnotation)
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/maddyhome/idea/vim/group/IjOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ public object IjOptions {
public val commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isHidden = true))
public val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", false, isHidden = true))
public val unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true, isHidden = true))
public val useNewRegex: ToggleOption = addOption(ToggleOption("usenewregex", GLOBAL, "usenewregex", true, isHidden = true))
public val vimscriptFunctionAnnotation: ToggleOption = addOption(ToggleOption("vimscriptfunctionannotation", GLOBAL, "vimscriptfunctionannotation", true, isHidden = true))

// This needs to be Option<out VimDataType> so that it can work with derived option types, such as NumberOption, which
Expand Down
Loading
Loading