fixup! Add merge options menu

Author: stefanhaller

pkg/gui/controllers/files_controller.go

@@ -178,12 +178,13 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
 			Description:       self.c.Tr.OpenDiffTool,
 		},
 		{
-			Key:             opts.GetKey(opts.Config.Files.OpenMergeOptions),
-			Handler:         self.withItems(self.openMergeConflictMenu),
-			Description:     self.c.Tr.ViewMergeConflictOptions,
-			Tooltip:         self.c.Tr.ViewMergeConflictOptionsTooltip,
-			OpensMenu:       true,
-			DisplayOnScreen: true,
+			Key:               opts.GetKey(opts.Config.Files.OpenMergeOptions),
+			Handler:           self.withItems(self.openMergeConflictMenu),
+			Description:       self.c.Tr.ViewMergeConflictOptions,
+			Tooltip:           self.c.Tr.ViewMergeConflictOptionsTooltip,
+			GetDisabledReason: self.require(self.itemsSelected(self.canOpenMergeConflictMenu)),
+			OpensMenu:         true,
+			DisplayOnScreen:   true,
 		},
 		{
 			Key:         opts.GetKey(opts.Config.Files.Fetch),
@@ -1040,6 +1041,20 @@ func (self *FilesController) openMergeConflictMenu(nodes []*filetree.FileNode) e
 	return self.c.Helpers().WorkingTree.CreateMergeConflictMenu(filepaths)
 }
 
+func (self *FilesController) canOpenMergeConflictMenu(nodes []*filetree.FileNode) *types.DisabledReason {
+	normalizedNodes := normalisedSelectedNodes(nodes)
+
+	hasFileNodesWithConflicts := lo.SomeBy(normalizedNodes, func(node *filetree.FileNode) bool {
+		return node.File != nil && node.File.HasInlineMergeConflicts
+	})
+
+	if !hasFileNodesWithConflicts {
+		return &types.DisabledReason{Text: self.c.Tr.NoFilesWithMergeConflicts}
+	}
+
+	return nil
+}
+
 func (self *FilesController) openCopyMenu() error {
 	node := self.context().GetSelected()
 

pkg/i18n/english.go

@@ -899,6 +899,7 @@ type TranslationSet struct {
 	BreakingChangesByVersion                 map[string]string
 	ViewMergeConflictOptions                 string
 	ViewMergeConflictOptionsTooltip          string
+	NoFilesWithMergeConflicts                string
 	MergeConflictOptionsTitle                string
 	UseCurrentChanges                        string
 	UseIncomingChanges                       string
@@ -1976,6 +1977,7 @@ func EnglishTranslationSet() *TranslationSet {
 		SelectCommitsOfCurrentBranch:             "Select commits of current branch",
 		ViewMergeConflictOptions:                 "View merge conflict options",
 		ViewMergeConflictOptionsTooltip:          "View options for resolving merge conflicts.",
+		NoFilesWithMergeConflicts:                "There are no files with merge conflicts.",
 		MergeConflictOptionsTitle:                "Resolve merge conflicts",
 		UseCurrentChanges:                        "Use current changes",
 		UseIncomingChanges:                       "Use incoming changes",