VIM-4134 Extract frontend-only dependencies from common module

Author: 1grzyb1

build.gradle.kts

@@ -87,8 +87,9 @@ dependencies {
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
   compileOnly("org.jetbrains:annotations:26.0.2-1")
 
-  // Test fixtures need access to the plugin classes (now in ideavim-common)
+  // Test fixtures need access to the plugin classes (now in ideavim-common and ideavim-frontend)
   testFixturesApi(project(":modules:ideavim-common"))
+  testFixturesApi(project(":modules:ideavim-frontend"))
 
   intellijPlatform {
     // Snapshots don't use installers
@@ -374,22 +375,29 @@ afterEvaluate {
   tasks.named("kspTestKotlin").configure { enabled = false }
 }
 
-// Allow test and testFixtures sources to access `internal` members from :modules:ideavim-common.
-// This is needed because all plugin source code was moved to the common module during the plugin split,
-// but tests remain in the root project. Kotlin's -Xfriend-paths compiler flag grants internal visibility
-// across module boundaries for testing purposes.
+// Allow test and testFixtures sources to access `internal` members from :modules:ideavim-common
+// and :modules:ideavim-frontend.
+// This is needed because plugin source code was split across common and frontend modules during the
+// plugin split, but tests remain in the root project. Kotlin's -Xfriend-paths compiler flag grants
+// internal visibility across module boundaries for testing purposes.
 // We add both the class directory and the JAR because the IntelliJ Platform Gradle plugin may resolve
 // classes from the composed/instrumented JAR rather than raw class files.
 val commonProject = project(":modules:ideavim-common")
 val commonClassesDir = commonProject.layout.buildDirectory.dir("classes/kotlin/main").get().asFile
 val commonLibsDir = commonProject.layout.buildDirectory.dir("libs").get().asFile
+val frontendProject = project(":modules:ideavim-frontend")
+val frontendClassesDir = frontendProject.layout.buildDirectory.dir("classes/kotlin/main").get().asFile
 tasks.named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileTestKotlin") {
   friendPaths.from(commonClassesDir)
   friendPaths.from(commonProject.layout.buildDirectory.dir("libs"))
+  friendPaths.from(frontendClassesDir)
+  friendPaths.from(frontendProject.layout.buildDirectory.dir("libs"))
 }
 tasks.named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileTestFixturesKotlin") {
   friendPaths.from(commonClassesDir)
   friendPaths.from(commonProject.layout.buildDirectory.dir("libs"))
+  friendPaths.from(frontendClassesDir)
+  friendPaths.from(frontendProject.layout.buildDirectory.dir("libs"))
 }
 
 

modules/ideavim-backend/src/main/resources/IdeaVIM.ideavim-backend.xml

@@ -62,37 +62,4 @@
     <!-- NERDTree startup (ProjectView integration) -->
     <postStartupActivity implementation="com.maddyhome.idea.vim.extension.nerdtree.NerdTree$NerdStartupActivity"/>
   </extensions>
-
-  <!-- PSI/file-dependent vim extensions -->
-  <extensions defaultExtensionNs="IdeaVIM">
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.nerdtree.NerdTree" name="NERDTree">
-      <aliases>
-        <alias name="https://github.com/preservim/nerdtree"/>
-        <alias name="preservim/nerdtree"/>
-        <alias name="https://github.com/scrooloose/nerdtree"/>
-        <alias name="scrooloose/nerdtree"/>
-        <alias name="nerdtree"/>
-      </aliases>
-    </vimExtension>
-
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.commentary.CommentaryExtension" name="commentary">
-      <aliases>
-        <alias name="https://github.com/tpope/vim-commentary"/>
-        <alias name="tpope/vim-commentary"/>
-        <alias name="vim-commentary"/>
-        <alias name="https://www.vim.org/scripts/script.php?script_id=3695"/>
-        <alias name="https://github.com/tomtom/tcomment_vim"/>
-        <alias name="tomtom/tcomment_vim"/>
-        <alias name="tcomment_vim"/>
-        <alias name="https://www.vim.org/scripts/script.php?script_id=1173"/>
-      </aliases>
-    </vimExtension>
-
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.matchit.Matchit" name="matchit">
-      <aliases>
-        <alias name="vim-matchit"/>
-        <alias name="chrisbra/matchit"/>
-      </aliases>
-    </vimExtension>
-  </extensions>
 </idea-plugin>

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/PyNotebooksCloseWorkaround.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim
+
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ProjectManagerListener
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.newapi.IjVimEditor
+import com.maddyhome.idea.vim.newapi.globalIjOptions
+import com.maddyhome.idea.vim.newapi.initInjector
+
+// This is a temporal workaround for VIM-2487
+internal class PyNotebooksCloseWorkaround : ProjectManagerListener {
+  override fun projectClosingBeforeSave(project: Project) {
+    initInjector()
+    // TODO: Confirm context in CWM scenario
+    if (injector.globalIjOptions().closenotebooks) {
+      injector.editorGroup.getEditors().forEach { vimEditor ->
+        val editor = (vimEditor as IjVimEditor).editor
+        val virtualFile = EditorHelper.getVirtualFile(editor)
+        if (virtualFile?.extension == "ipynb") {
+          val fileEditorManager = FileEditorManagerEx.getInstanceEx(project)
+          fileEditorManager.closeFile(virtualFile)
+        }
+      }
+    }
+  }
+}

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/RegisterActions.kt

@@ -1,12 +1,14 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
  * https://opensource.org/licenses/MIT.
  */
 package com.maddyhome.idea.vim
 
+import com.maddyhome.idea.vim.RegisterActions.registerActions
+import com.maddyhome.idea.vim.action.CommandProvider
 import com.maddyhome.idea.vim.action.EngineCommandProvider
 import com.maddyhome.idea.vim.action.IntellijCommandProvider
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase
@@ -15,6 +17,20 @@ import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
 object RegisterActions {
+
+  private val additionalCommandProviders = mutableListOf<CommandProvider>()
+
+  /**
+   * Registers an additional [CommandProvider] whose commands will be included
+   * during action registration. Call this before [registerActions].
+   *
+   * This allows modules like ideavim-frontend to contribute their own
+   * KSP-generated commands without a compile-time dependency from common.
+   */
+  fun registerCommandProvider(provider: CommandProvider) {
+    additionalCommandProviders.add(provider)
+  }
+
   /**
    * Register all the key/action mappings for the plugin.
    */
@@ -25,8 +41,8 @@ object RegisterActions {
   }
 
   fun findAction(id: String): EditorActionHandlerBase? {
-    val commandBean = IntellijCommandProvider.getCommands().firstOrNull { it.actionId == id }
-      ?: EngineCommandProvider.getCommands().firstOrNull { it.actionId == id } ?: return null
+    val allProviders = listOf(IntellijCommandProvider, EngineCommandProvider) + additionalCommandProviders
+    val commandBean = allProviders.flatMap { it.getCommands() }.firstOrNull { it.actionId == id } ?: return null
     return commandBean.instance
   }
 
@@ -44,6 +60,7 @@ object RegisterActions {
     val parser = VimPlugin.getKey()
     IntellijCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
     EngineCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
+    additionalCommandProviders.flatMap { it.getCommands() }.forEach { parser.registerCommandAction(it) }
   }
 
   private fun registerShortcutsWithoutActions() {

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/VimPlugin.java

@@ -54,9 +54,9 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
   private final @NotNull VimState state = new VimState();
   public Disposable onOffDisposable;
-  // Package-private for IjVimPluginActivator access
-  int previousStateVersion = 0;
-  String previousKeyMap = "";
+  // Public for cross-module access from IjVimPluginActivator (frontend module)
+  public int previousStateVersion = 0;
+  public String previousKeyMap = "";
   // It is enabled by default to avoid any special configuration after plugin installation
   private boolean enabled = true;
 
@@ -65,14 +65,14 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   }
 
   /**
-   * @return NotificationService as applicationService if project is null and projectService otherwise
+   * @return VimNotifications as applicationService if project is null and projectService otherwise
    */
-  public static @NotNull NotificationService getNotifications(@Nullable Project project) {
+  public static @NotNull VimNotifications getNotifications(@Nullable Project project) {
     if (project == null) {
-      return ApplicationManager.getApplication().getService(NotificationService.class);
+      return ApplicationManager.getApplication().getService(VimNotifications.class);
     }
     else {
-      return project.getService(NotificationService.class);
+      return project.getService(VimNotifications.class);
     }
   }
 
@@ -169,7 +169,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return VimInjectorKt.getInjector().getOptionGroup();
   }
 
-  private static @NotNull NotificationService getNotifications() {
+  private static @NotNull VimNotifications getNotifications() {
     return getNotifications(null);
   }
 

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/config/VimState.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -15,7 +15,7 @@ import kotlin.reflect.KProperty
 /**
  * @author Alex Plate
  */
-internal class VimState {
+class VimState {
   var isIdeaJoinNotified by StateProperty("idea-join")
   var isIdeaPutNotified by StateProperty("idea-put")
   var wasSubscribedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/extension/VimApi.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -13,7 +13,7 @@ import com.maddyhome.idea.vim.common.ListenerOwner
 import com.maddyhome.idea.vim.key.MappingOwner
 import com.maddyhome.idea.vim.thinapi.VimApiImpl
 
-internal fun VimExtension.api(): VimApi = VimApiImpl(
+fun VimExtension.api(): VimApi = VimApiImpl(
   ListenerOwner.Plugin.get(this.name),
   MappingOwner.Plugin.get(this.name),
 )

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt

@@ -30,7 +30,6 @@ import com.maddyhome.idea.vim.key.MappingOwner
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.ui.ModalEntry
 import com.maddyhome.idea.vim.vimscript.model.Executable
 import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 import com.maddyhome.idea.vim.vimscript.model.VimLContext
@@ -168,7 +167,7 @@ object VimExtensionFacade {
     } else {
       LOG.trace("Getting char from the modal entry...")
       var ref: KeyStroke? = null
-      ModalEntry.activate(editor.vim) { stroke: KeyStroke? ->
+      injector.modalInput.activate(editor.vim) { stroke: KeyStroke ->
         ref = stroke
         false
       }

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionRegistrar.kt

@@ -18,9 +18,9 @@ import com.maddyhome.idea.vim.key.MappingOwner.Plugin.Companion.remove
 import com.maddyhome.idea.vim.options.OptionAccessScope
 import com.maddyhome.idea.vim.options.OptionDeclaredScope
 import com.maddyhome.idea.vim.options.ToggleOption
-import com.maddyhome.idea.vim.statistic.PluginState
+import com.maddyhome.idea.vim.statistic.ExtensionTracking
 
-internal object VimExtensionRegistrar : VimExtensionRegistrator {
+object VimExtensionRegistrar : VimExtensionRegistrator {
   internal val registeredExtensions: MutableSet<String> = HashSet()
   internal val extensionAliases = HashMap<String, String>()
   private var extensionRegistered = false
@@ -67,7 +67,7 @@ internal object VimExtensionRegistrar : VimExtensionRegistrator {
     VimPlugin.getOptionGroup().addGlobalOptionChangeListener(option) {
       if (injector.optionGroup.getOptionValue(option, OptionAccessScope.GLOBAL(null)).booleanValue) {
         initExtension(extensionBean, name)
-        PluginState.Util.enabledExtensions.add(name)
+        ExtensionTracking.enabledExtensions.add(name)
       } else {
         extensionBean.instance.dispose()
       }

modules/ideavim-common/src/main/java/com/maddyhome/idea/vim/group/MacroGroup.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -26,7 +26,7 @@ import com.maddyhome.idea.vim.newapi.IjVimEditor
  * Used to handle playback of macros
  */
 @Service
-internal class MacroGroup : VimMacroBase() {
+class MacroGroup : VimMacroBase() {
 
   // If it's null, this is the top macro (as in most cases). If it's not null, this macro is executed from top macro
   private var potemkinProgress: PotemkinProgress? = null