refactor debug command and use code from arguments, remove useless vars

Author: umbynos

cli/debug/debug.go

@@ -35,14 +35,12 @@ import (
 )
 
 var (
-	fqbn        string
+	fqbn        arguments.Fqbn
 	port        arguments.Port
-	verbose     bool
-	verify      bool
 	interpreter string
 	importDir   string
 	printInfo   bool
-	programmer  string
+	programmer  arguments.Programmer
 	tr          = i18n.Tr
 )
 
@@ -54,26 +52,20 @@ func NewCommand() *cobra.Command {
 		Long:    tr("Debug Arduino sketches. (this command opens an interactive gdb session)"),
 		Example: "  " + os.Args[0] + " debug -b arduino:samd:mkr1000 -P atmel_ice /home/user/Arduino/MySketch",
 		Args:    cobra.MaximumNArgs(1),
-		Run:     run,
+		Run:     runDebugCommand,
 	}
 
-	debugCommand.Flags().StringVarP(&fqbn, "fqbn", "b", "", tr("Fully Qualified Board Name, e.g.: arduino:avr:uno"))
-	debugCommand.RegisterFlagCompletionFunc("fqbn", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledBoards(), cobra.ShellCompDirectiveDefault
-	})
+	fqbn.AddToCommand(debugCommand)
 	port.AddToCommand(debugCommand)
-	debugCommand.Flags().StringVarP(&programmer, "programmer", "P", "", tr("Programmer to use for debugging"))
-	debugCommand.RegisterFlagCompletionFunc("programmer", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledProgrammers(), cobra.ShellCompDirectiveDefault
-	})
+	programmer.AddToCommand(debugCommand)
 	debugCommand.Flags().StringVar(&interpreter, "interpreter", "console", tr("Debug interpreter e.g.: %s", "console, mi, mi1, mi2, mi3"))
 	debugCommand.Flags().StringVarP(&importDir, "input-dir", "", "", tr("Directory containing binaries for debug."))
 	debugCommand.Flags().BoolVarP(&printInfo, "info", "I", false, tr("Show metadata about the debug session instead of starting the debugger."))
 
 	return debugCommand
 }
 
-func run(command *cobra.Command, args []string) {
+func runDebugCommand(command *cobra.Command, args []string) {
 	instance := instance.CreateAndInit()
 
 	path := ""
@@ -83,12 +75,12 @@ func run(command *cobra.Command, args []string) {
 	sketchPath, _, discoveryPort := arguments.SketchPathCalculation(path, port, instance, false)
 	debugConfigRequested := &dbg.DebugConfigRequest{
 		Instance:    instance,
-		Fqbn:        fqbn,
+		Fqbn:        fqbn.GetFQBN(),
 		SketchPath:  sketchPath.String(),
 		Port:        discoveryPort.ToRPC(),
 		Interpreter: interpreter,
 		ImportDir:   importDir,
-		Programmer:  programmer,
+		Programmer:  programmer.GetProgrammer(),
 	}
 
 	if printInfo {

i18n/data/en.po

@@ -415,7 +415,7 @@ msgstr "Config file written to: %s"
 msgid "Configuration of the port."
 msgstr "Configuration of the port."
 
-#: cli/debug/debug.go:148
+#: cli/debug/debug.go:140
 msgid "Configuration options for %s"
 msgstr "Configuration options for %s"
 
@@ -484,15 +484,15 @@ msgstr "Creates or updates the configuration file in the data directory or custo
 msgid "DEPRECATED"
 msgstr "DEPRECATED"
 
-#: cli/debug/debug.go:53
+#: cli/debug/debug.go:51
 msgid "Debug Arduino sketches."
 msgstr "Debug Arduino sketches."
 
-#: cli/debug/debug.go:54
+#: cli/debug/debug.go:52
 msgid "Debug Arduino sketches. (this command opens an interactive gdb session)"
 msgstr "Debug Arduino sketches. (this command opens an interactive gdb session)"
 
-#: cli/debug/debug.go:69
+#: cli/debug/debug.go:61
 msgid "Debug interpreter e.g.: %s"
 msgstr "Debug interpreter e.g.: %s"
 
@@ -541,7 +541,7 @@ msgstr "Detecting libraries used..."
 msgid "Detects and displays a list of boards connected to the current computer."
 msgstr "Detects and displays a list of boards connected to the current computer."
 
-#: cli/debug/debug.go:70
+#: cli/debug/debug.go:62
 msgid "Directory containing binaries for debug."
 msgstr "Directory containing binaries for debug."
 
@@ -715,7 +715,7 @@ msgstr "Error downloading platform %s"
 msgid "Error downloading tool %s"
 msgstr "Error downloading tool %s"
 
-#: cli/debug/debug.go:110
+#: cli/debug/debug.go:102
 msgid "Error during Debug: %v"
 msgstr "Error during Debug: %v"
 
@@ -756,7 +756,7 @@ msgstr "Error extracting library_index.json.gz"
 msgid "Error finding build artifacts"
 msgstr "Error finding build artifacts"
 
-#: cli/debug/debug.go:97
+#: cli/debug/debug.go:89
 msgid "Error getting Debug info: %v"
 msgstr "Error getting Debug info: %v"
 
@@ -1000,7 +1000,7 @@ msgstr "Examples for library %s"
 msgid "Examples:"
 msgstr "Examples:"
 
-#: cli/debug/debug.go:129
+#: cli/debug/debug.go:121
 msgid "Executable to debug"
 msgstr "Executable to debug"
 
@@ -1087,16 +1087,15 @@ msgid "Force skip of post-install scripts (if the CLI is running interactively).
 msgstr "Force skip of post-install scripts (if the CLI is running interactively)."
 
 #: cli/arguments/port.go:80
-#: cli/debug/debug.go:60
 #: cli/monitor/monitor.go:63
 msgid "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 msgstr "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 
-#: cli/debug/debug.go:143
+#: cli/debug/debug.go:135
 msgid "GDB Server path"
 msgstr "GDB Server path"
 
-#: cli/debug/debug.go:142
+#: cli/debug/debug.go:134
 msgid "GDB Server type"
 msgstr "GDB Server type"
 
@@ -1769,10 +1768,6 @@ msgstr "Programmer '%s' not found"
 msgid "Programmer name"
 msgstr "Programmer name"
 
-#: cli/debug/debug.go:65
-msgid "Programmer to use for debugging"
-msgstr "Programmer to use for debugging"
-
 #: cli/board/details.go:195
 msgid "Programmers:"
 msgstr "Programmers:"
@@ -1916,7 +1911,7 @@ msgstr "Show library names only."
 msgid "Show list of available programmers"
 msgstr "Show list of available programmers"
 
-#: cli/debug/debug.go:71
+#: cli/debug/debug.go:63
 msgid "Show metadata about the debug session instead of starting the debugger."
 msgstr "Show metadata about the debug session instead of starting the debugger."
 
@@ -2082,19 +2077,19 @@ msgstr "Tool %s uninstalled"
 msgid "Toolchain '%s' is not supported"
 msgstr "Toolchain '%s' is not supported"
 
-#: cli/debug/debug.go:137
+#: cli/debug/debug.go:129
 msgid "Toolchain custom configurations"
 msgstr "Toolchain custom configurations"
 
-#: cli/debug/debug.go:131
+#: cli/debug/debug.go:123
 msgid "Toolchain path"
 msgstr "Toolchain path"
 
-#: cli/debug/debug.go:132
+#: cli/debug/debug.go:124
 msgid "Toolchain prefix"
 msgstr "Toolchain prefix"
 
-#: cli/debug/debug.go:130
+#: cli/debug/debug.go:122
 msgid "Toolchain type"
 msgstr "Toolchain type"