refactor: EditorActionMapping.ForImport change to DisableImport, this simplify codes and make config meaning is more specific

xinnjie · xinnjie · commit 4d748bc6aa94 · 2025-10-22T22:52:12.000+08:00
diff --git a/action-support-matrix.md b/action-support-matrix.md
@@ -13,11 +13,11 @@
 |--------|--------|-----|----------|-------|-------------|-----------|
 | Go to bracket | ✅ | ✅ | ✅ | N/A | Go to bracket | actions.go.bracket |
 | Call hierarchy | ✅ | ❌ (not supported yet, see [`Support 'Show Call Hierarchy' as an LSP action` issue](https://github.com/zed-industries/zed/issues/14203)) | ✅ | N/A | Show call hierarchy | actions.go.callHierarchy |
-| Go to definition | ✅ | ✅ | N/A | N/A | Go to definition | actions.go.definition |
+| Go to definition | ✅ | ✅ | ❌ (There is not `Go to definition` in intellij, use `Go to declaration` instead) | N/A | Go to definition | actions.go.definition |
 | Go to declaration | ✅ | ✅ | ✅ | N/A | Go to declaration or usages | actions.go.goToDeclaration |
 | Go to super | ✅ | ❌ (not supported yet, no issue tracked) | ✅ | N/A | Go to super class/super method | actions.go.goToSuper |
 | Go to test | ✅ | ❌ (not supported yet, see [`Go to test` discussion](https://github.com/zed-industries/zed/discussions/40859)) | ✅ | N/A | Go to test | actions.go.goToTest |
-| Go to implementations | ✅ | ✅ | ✅ | N/A | Go to implementations | actions.go.implementations |
+| Go to implementations | ✅ | ✅ | ✅ | N/A | Go to implementations, For an interface, this shows all the implementors of that interface and for abstract methods, this shows all concrete implementations of that method. | actions.go.implementations |
 | Peek declaration | ✅ | ✅ | ✅ | N/A | Peek declaration | actions.go.peekDeclaration |
 | Reference peek | ✅ | ❌ (Peek is not supported yet, see [`Peek or Preview Definitions Inline` discussion](https://github.com/zed-industries/zed/discussions/28282)) | ✅ | N/A | Show usages / reference search | actions.go.referencePeek |
 | Go to references | ✅ | ✅ | ✅ | N/A | Go to references | actions.go.references |
@@ -30,7 +30,7 @@
 |--------|--------|-----|----------|-------|-------------|-----------|
 | Code action | ✅ | ✅ | ✅ | ✅ | Code Action... | actions.refactor.codeAction |
 | Organize imports | ✅ | ✅ | ✅ | N/A | Organize Imports | actions.refactor.organizeImports |
-| Quick fix | ✅ | ❌ (not supported yet, no issue tracked) | N/A | N/A | Quick Fix... | actions.refactor.quickFix |
+| Quick fix | ✅ | ❌ (not supported yet, no issue tracked) | ✅ | N/A | Quick Fix... | actions.refactor.quickFix |
 | Refactor code | ✅ | ❌ (not supported yet, see [Code refactoring in Zed ](https://github.com/zed-industries/zed/discussions/8623)) | ✅ | ✅ | Refactor This... | actions.refactor.refactor |
 | Rename symbol | ✅ | ✅ | ✅ | ✅ | Rename | actions.refactor.rename |
 
@@ -183,8 +183,8 @@
 | Action | VSCode | Zed | IntelliJ | Helix | Description | Action ID |
 |--------|--------|-----|----------|-------|-------------|-----------|
 | Delete previous word | ✅ | ✅ | ✅ | N/A | Delete to the start of the previous word | actions.edit.deleteWordLeft |
-| Delete previous subword | ✅ | ✅ | N/A | N/A | Delete to the start of the previous subword (hump) | actions.edit.deleteWordPartLeft |
-| Delete next subword | ✅ | ✅ | N/A | N/A | Delete to the end of the next subword (hump) | actions.edit.deleteWordPartRight |
+| Delete previous subword | ✅ | ✅ | ❌ (behaviour is controlled by `CamelHumps` setting) | N/A | Delete to the start of the previous subword (hump) | actions.edit.deleteWordPartLeft |
+| Delete next subword | ✅ | ✅ | ❌ (behaviour is controlled by `CamelHumps` setting) | N/A | Delete to the end of the next subword (hump) | actions.edit.deleteWordPartRight |
 
 ## File
 
@@ -224,7 +224,7 @@
 |--------|--------|-----|----------|-------|-------------|-----------|
 | Go back | ✅ | ✅ | ✅ | N/A | Go to previous cursor location | actions.go.back |
 | Go forward | ✅ | ✅ | ✅ | N/A | Go to next cursor location | actions.go.forward |
-| Go to last edit location | ✅ | N/A | ✅ | N/A | Go to last edit location | actions.go.lastEditLocation |
+| Go to last edit location | ✅ | ❌ (not supported yet, see [Implement "Go To Last Edit Location" issue](https://github.com/zed-industries/zed/issues/19731)) | ✅ | N/A | Go to last edit location | actions.go.lastEditLocation |
 
 ## Navigation.Problems
 
diff --git a/config/action_mappings/clipboard.yaml b/config/action_mappings/clipboard.yaml
@@ -6,12 +6,13 @@ mappings:
     vscode:
       - command: "editor.action.clipboardCutAction"
         when: "editorTextFocus"
-        forImport: true
       # cut in file explorer
       - command: "filesExplorer.cut"
         when: "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus"
+        disableImport: true
       # underlying cut
       - command: "execCut"
+        disableImport: true
     zed:
       - action: "editor::Cut"
         context: "Editor"
@@ -29,15 +30,17 @@ mappings:
     vscode:
       - command: "editor.action.clipboardCopyAction"
         when: "editorTextFocus"
-        forImport: true
       # copy in file explorer
       - command: "filesExplorer.copy"
+        disableImport: true
         when: "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !inputFocus"
       # copy in problem view
       - command: "problems.action.copy"
         when: "problemsVisibility && !relatedInformationFocus && focusedView == 'workbench.panel.markers.view'"
+        disableImport: true
       # underlying copy
       - command: "execCopy"
+        disableImport: true
     zed:
       - action: "editor::Copy"
         context: "Editor"
@@ -61,12 +64,13 @@ mappings:
     vscode:
       - command: "editor.action.clipboardPasteAction"
         when: "editorTextFocus && !editorReadonly"
-        forImport: true
       # paste in file explorer
       - command: "filesExplorer.paste"
         when: "filesExplorerFocus && foldersViewVisible && !explorerResourceReadonly && !inputFocus"
+        disableImport: true
       # underlying paste
       - command: "execPaste"
+        disableImport: true
     zed:
       - action: "editor::Paste"
         context: "Editor"
diff --git a/config/action_mappings/diff.yaml b/config/action_mappings/diff.yaml
@@ -32,6 +32,7 @@ mappings:
       when: "textCompareEditorVisible"
     intellij:
       action: "PreviousDiff"
+    # TODO(xinnjie): compare editor not available in zed?
     zed:
       action: "editor::GoToPreviousChange"
       context: "Editor && mode == full"
diff --git a/config/action_mappings/editor_format.yaml b/config/action_mappings/editor_format.yaml
@@ -6,9 +6,9 @@ mappings:
     vscode:
       - command: "editor.action.formatDocument"
         when: "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor"
-        forImport: true
       - command: "notebook.format"
         when: "notebookEditable && !editorTextFocus && activeEditor == 'workbench.editor.notebook'"
+        disableImport: true
     zed:
       action: "editor::Format"
       context: "Editor"
@@ -21,9 +21,9 @@ mappings:
     vscode:
       - command: "editor.action.formatSelection"
         when: "editorHasDocumentSelectionFormattingProvider && editorTextFocus && !editorReadonly"
-        forImport: true
       - command: "notebook.formatCell"
         when: "editorHasDocumentFormattingProvider && editorTextFocus && inCompositeEditor && notebookEditable && !editorReadonly && activeEditor == 'workbench.editor.notebook'"
+        disableImport: true
     zed:
       action: "editor::FormatSelections"
       context: "Editor"
diff --git a/config/action_mappings/editor_refactor.yaml b/config/action_mappings/editor_refactor.yaml
@@ -6,10 +6,11 @@ mappings:
     vscode:
       - command: "editor.action.rename"
         when: "editorHasRenameProvider && editorTextFocus && !editorReadonly"
-        forImport: true
       - command: "editor.action.changeAll"
         when: "!editorHasRenameProvider &&editorTextFocus && !editorReadonly"
+        disableImport: true
       - command: "renameFile"
+        disableImport: true
         when: "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus"
     intellij:
       action: "RenameElement"
@@ -56,7 +57,8 @@ mappings:
       command: "editor.action.quickFix"
       when: "editorHasCodeActionsProvider && textInputFocus && !editorReadonly"
     intellij:
-      notSupported: true
+      action: "ShowIntentionActions"
+      disableImport: true
     zed:
       notSupported: true
       notSupportedReason: "not supported yet, no issue tracked"
@@ -71,6 +73,7 @@ mappings:
       when: "editorHasCodeActionsProvider && editorTextFocus && !editorReadonly"
     intellij:
       action: "ShowIntentionActions"
+      disableImport: true
     zed:
       action: "editor::ToggleCodeActions"
       context: "Editor"
diff --git a/config/action_mappings/editor_word.yaml b/config/action_mappings/editor_word.yaml
@@ -9,9 +9,9 @@ mappings:
     zed:
       action: "editor::DeleteToNextSubwordEnd"
       context: "Editor"
-    # intellij need to turn on `CamelHumps` setting
     intellij:
       notSupported: true
+      notSupportedReason: "behaviour is controlled by `CamelHumps` setting"
   - id: "actions.edit.deleteWordLeft"
     name: "Delete previous word"
     description: "Delete to the start of the previous word"
@@ -34,6 +34,6 @@ mappings:
     zed:
       action: "editor::DeleteToPreviousSubwordStart"
       context: "Editor"
-    # intellij need to turn on `CamelHumps` setting
     intellij:
       notSupported: true
+      notSupportedReason: "behaviour is controlled by `CamelHumps` setting"
diff --git a/config/action_mappings/go_code.yaml b/config/action_mappings/go_code.yaml
@@ -25,7 +25,7 @@ mappings:
       context: "Editor"
   - id: "actions.go.implementations"
     name: "Go to implementations"
-    description: "Go to implementations"
+    description: "Go to implementations, For an interface, this shows all the implementors of that interface and for abstract methods, this shows all concrete implementations of that method."
     category: "Code.Go"
     vscode:
       command: "editor.action.goToImplementation"
@@ -69,6 +69,9 @@ mappings:
     zed:
       action: "editor::GoToDefinition"
       context: "Editor"
+    intellij:
+      notSupported: true
+      notSupportedReason: "There is not `Go to definition` in intellij, use `Go to declaration` instead"
   - id: "actions.go.typeDefinition"
     name: "Go to type definition"
     description: "Go to type definition"
diff --git a/config/action_mappings/go_history.yaml b/config/action_mappings/go_history.yaml
@@ -29,5 +29,6 @@ mappings:
       command: "workbench.action.navigateToLastEditLocation"
     zed:
       notSupported: true
+      notSupportedReason: "not supported yet, see [Implement \"Go To Last Edit Location\" issue](https://github.com/zed-industries/zed/issues/19731)"
     intellij:
       action: "JumpToLastChange"
diff --git a/config/action_mappings/mapping_for_vscode_forimport_test.yaml b/config/action_mappings/mapping_for_vscode_forimport_test.yaml
@@ -1,40 +1,40 @@
-# Additional mappings for ForImport importer tests
+# Additional mappings for DisableImport importer tests
 mappings:
-  # ForImport preference among command+args ignoring when
+  # DisableImport preference among command+args ignoring when
   - id: "actions.test.forimport.withArgs.A"
-    description: "ForImport args candidate A"
+    description: "DisableImport args candidate A (disabled)"
     category: "Testing"
     vscode:
       - command: "cmd.forimp.args"
         when: "W_A"
         args:
           x: 1
+        disableImport: true
   - id: "actions.test.forimport.withArgs.B"
-    description: "ForImport args candidate B (preferred)"
+    description: "DisableImport args candidate B (enabled, preferred)"
     category: "Testing"
     vscode:
       - command: "cmd.forimp.args"
         when: "W_B"
         args:
           x: 1
-        forImport: true
-  # ForImport preference in command-only fallback (no args)
+  # DisableImport preference in command-only fallback (no args)
   - id: "actions.test.forimport.cmdOnly.A"
-    description: "ForImport cmd-only candidate A"
+    description: "DisableImport cmd-only candidate A (disabled)"
     category: "Testing"
     vscode:
       - command: "cmd.forimp.noargs"
         when: "Y_A"
+        disableImport: true
   - id: "actions.test.forimport.cmdOnly.B"
-    description: "ForImport cmd-only candidate B (preferred)"
+    description: "DisableImport cmd-only candidate B (enabled, preferred)"
     category: "Testing"
     vscode:
       - command: "cmd.forimp.noargs"
         when: "Y_B"
-        forImport: true
-  # Single-entry implicit ForImport vs multi-entry
+  # Single-entry implicit enabled vs multi-entry
   - id: "actions.test.forimport.singleImplicit"
-    description: "Single-entry mapping implicitly preferred"
+    description: "Single-entry mapping implicitly enabled"
     category: "Testing"
     vscode:
       command: "cmd.forimp.single"
@@ -45,6 +45,6 @@ mappings:
     vscode:
       - command: "could.be.imported"
         when: "SomeCondition"
-        forImport: true
       - command: "should.not.import.command"
         when: "OtherCondition"
+        disableImport: true
diff --git a/config/action_mappings/tab_switcher.yaml b/config/action_mappings/tab_switcher.yaml
@@ -6,10 +6,11 @@ mappings:
     vscode:
       - command: "workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup"
         when: "editorFocus"
-        forImport: true
       - command: "workbench.action.quickOpenNavigateNextInEditorPicker"
         when: "inEditorsPicker && inQuickOpen"
+        disableImport: true
       - command: "workbench.action.quickOpenNavigateNext"
+        disableImport: true
         when: "inQuickOpen"
       - command: "workbench.action.terminal.focusNext"
         when: "terminalFocus"
@@ -25,10 +26,11 @@ mappings:
     vscode:
       - command: "workbench.action.quickOpenLeastRecentlyUsedEditorInGroup"
         when: "editorFocus"
-        forImport: true
       - command: "workbench.action.quickOpenNavigatePreviousInEditorPicker"
         when: "inEditorsPicker && inQuickOpen"
+        disableImport: true
       - command: "workbench.action.terminal.focusPrevious"
+        disableImport: true
         when: "terminalFocus"
     zed:
       action: "tab_switcher::Toggle"
diff --git a/config/action_mappings/view_panels.yaml b/config/action_mappings/view_panels.yaml
@@ -6,10 +6,9 @@ mappings:
     vscode:
       - command: "workbench.view.explorer"
         when: "viewContainer.workbench.view.explorer.enabled"
-        forImport: true
       - command: "workbench.action.toggleSidebarVisibility"
         when: "explorerViewletFocus"
-        forImport: false
+        disableImport: true
     zed:
       action: "project_panel::ToggleFocus"
       context: "Workspace"
@@ -25,10 +24,9 @@ mappings:
     vscode:
       - command: "workbench.view.search"
         when: "workbench.view.search.active && neverMatch =~ /doesNotMatch/"
-        forImport: true
       - command: "workbench.action.toggleSidebarVisibility"
         when: "searchViewletVisible"
-        forImport: false
+        disableImport: true
     zed:
       action: "project_search::ToggleFocus"
       context: "Workspace"
@@ -44,10 +42,9 @@ mappings:
     vscode:
       - command: "workbench.view.scm"
         when: "workbench.scm.active"
-        forImport: true
       - command: "workbench.action.toggleSidebarVisibility"
         when: "activeViewlet == 'workbench.view.scm'"
-        forImport: false
+        disableImport: true
     zed:
       action: "git_panel::ToggleFocus"
       context: "Workspace"
@@ -134,10 +131,9 @@ mappings:
     vscode:
       - command: "workbench.view.debug"
         when: "viewContainer.workbench.view.debug.enabled"
-        forImport: true
       - command: "workbench.action.toggleSidebarVisibility"
         when: "activeViewlet == 'workbench.view.debug'"
-        forImport: false
+        disableImport: true
     zed:
       action: "debug_panel::ToggleFocus"
       context: "Workspace"
diff --git a/internal/import_e2e_test.go b/internal/import_e2e_test.go
@@ -33,13 +33,13 @@ func TestImportEndToEnd_Import_VSCode_FormatSelection_NoChange(t *testing.T) {
 				Category:    "Editor",
 				VSCode: mappings.VscodeConfigs{
 					{
-						EditorActionMapping: mappings.EditorActionMapping{ForImport: true},
-						Command:             "editor.action.formatSelection",
-						When:                "editorHasDocumentSelectionFormattingProvider && editorTextFocus && !editorReadonly",
+						Command: "editor.action.formatSelection",
+						When:    "editorHasDocumentSelectionFormattingProvider && editorTextFocus && !editorReadonly",
 					},
 					{
-						Command: "notebook.formatCell",
-						When:    "editorHasDocumentFormattingProvider && editorTextFocus && inCompositeEditor && notebookEditable && !editorReadonly && activeEditor == 'workbench.editor.notebook'",
+						EditorActionMapping: mappings.EditorActionMapping{DisableImport: true},
+						Command:             "notebook.formatCell",
+						When:                "editorHasDocumentFormattingProvider && editorTextFocus && inCompositeEditor && notebookEditable && !editorReadonly && activeEditor == 'workbench.editor.notebook'",
 					},
 				},
 			},
diff --git a/internal/mappings/mapping_config.go b/internal/mappings/mapping_config.go
@@ -95,8 +95,8 @@ func (am *ActionMappingConfig) IsSupported(editorType pluginapi.EditorType) (boo
 
 // EditorActionMapping provides extra flags for editor-specific configurations.
 type EditorActionMapping struct {
-	// when true, this config is used for import, otherwise it is only used for export
-	ForImport bool `yaml:"forImport,omitempty"`
+	// when true, this config is only used for export, otherwise it is used for both import and export
+	DisableImport bool `yaml:"disableImport,omitempty"`
 
 	// explicitly set to true if this config is not supported by the editor
 	NotSupported bool `yaml:"notSupported,omitempty"`
diff --git a/internal/mappings/mapping_config_intellij.go b/internal/mappings/mapping_config_intellij.go
@@ -14,6 +14,10 @@ func checkIntellijDuplicateConfig(mappings map[string]ActionMappingConfig) error
 		if action == "" {
 			continue
 		}
+		// Skip configs that are disabled for import (export-only)
+		if m.IntelliJ.DisableImport {
+			continue
+		}
 		if prev, ok := seen[action]; ok {
 			if _, exists := dups[action]; !exists {
 				dups[action] = []string{prev}
diff --git a/internal/mappings/mapping_config_vscode.go b/internal/mappings/mapping_config_vscode.go
@@ -3,7 +3,6 @@ package mappings
 import (
 	"encoding/json"
 	"fmt"
-	"slices"
 
 	"gopkg.in/yaml.v3"
 )
@@ -49,12 +48,6 @@ func (v *VscodeConfigs) UnmarshalYAML(node *yaml.Node) error {
 	return nil
 }
 
-func (v *VscodeConfigs) HasExplicitForImport() bool {
-	return slices.ContainsFunc(*v, func(cfg VscodeMappingConfig) bool {
-		return cfg.ForImport
-	})
-}
-
 func checkVscodeDuplicateConfig(mappings map[string]ActionMappingConfig) error {
 	seen := make(map[struct{ Command, When, Args string }]string)
 	dups := make(map[string][]string) // key string -> list of universal action IDs
diff --git a/internal/plugins/vscode/import_test.go b/internal/plugins/vscode/import_test.go
diff --git a/internal/plugins/vscode/mapping.go b/internal/plugins/vscode/mapping.go
