fix: Call finalize of parent and child commands

Author: Kirdock

command.go

@@ -964,10 +964,6 @@ func (c *Command) execute(a []string) (err error) {
 
 	argWoFlags := c.Flags().Args()
 
-	if c.Finalize != nil {
-		defer c.Finalize(c, argWoFlags)
-	}
-
 	if c.DisableFlagParsing {
 		argWoFlags = a
 	}
@@ -988,6 +984,13 @@ func (c *Command) execute(a []string) (err error) {
 			parents = append(parents, p)
 		}
 	}
+	defer func() {
+		for _, p := range parents {
+			if p.Finalize != nil {
+				p.Finalize(c, argWoFlags)
+			}
+		}
+	}()
 	for _, p := range parents {
 		if p.PersistentPreRunE != nil {
 			if err := p.PersistentPreRunE(c, argWoFlags); err != nil {

command_test.go

@@ -2953,24 +2953,36 @@ func TestHelpFuncExecuted(t *testing.T) {
 	checkStringContains(t, output, helpText)
 }
 
-func TestFinalizeCalledOnPanic(t *testing.T) {
-	finalizeCalls := 0
+func TestFinalizeOfChildAndParentCalledOnPanic(t *testing.T) {
+	parentFinalizeCalls := 0
+	childFinalizeCalls := 0
 	defer func() {
 		if recover() == nil {
 			t.Error("The code should have panicked due to panicking run")
 		}
-		if finalizeCalls != 1 {
-			t.Errorf("finalize() called %d times, want 1", finalizeCalls)
+		if parentFinalizeCalls != 1 {
+			t.Errorf("finalize() of parent command called %d times, want 1", parentFinalizeCalls)
+		}
+		if childFinalizeCalls != 1 {
+			t.Errorf("finalize() of child command called %d times, want 1", childFinalizeCalls)
 		}
 	}()
 	rootCmd := &Command{
 		Use: "root",
+		Run: emptyRun,
+		Finalize: func(cmd *Command, args []string) {
+			parentFinalizeCalls++
+		},
+	}
+	subCmd := &Command{
+		Use: "sub",
 		Run: func(cmd *Command, args []string) {
 			panic("should panic")
 		},
 		Finalize: func(cmd *Command, args []string) {
-			finalizeCalls++
+			childFinalizeCalls++
 		},
 	}
-	executeCommand(rootCmd)
+	rootCmd.AddCommand(subCmd)
+	executeCommand(rootCmd, "sub")
 }