move --livevim into resultset

The 'search' command alias was missing --livevim.  I realised that the flag
really needs to be in the common rendering.  It's a bit off because the source
data loading still needs to be supported in each command which uses it, but
the relevant commands all do.

Author: philpennock

commands/browse/browse.go

@@ -23,7 +23,6 @@ var flags struct {
 	blockname  string
 	limitAbort int
 	listblocks bool
-	livevim    bool
 	startrune  int
 	stoprune   int
 }
@@ -54,7 +53,7 @@ Use "known -bv/-bn" to list known blocks for "browse -b".
 		}
 
 		srcs := sources.NewFast()
-		if flags.livevim {
+		if resultset.ResultCmdFlags.LiveVim {
 			srcs.LoadLiveVim()
 		}
 
@@ -165,7 +164,6 @@ func init() {
 	browseCmd.Flags().IntVarP(&flags.limitAbort, "limit-abort", "A", 3000, "abort if would show more than this many entries")
 	browseCmd.Flags().BoolVarP(&flags.listblocks, "list-blocks", "B", false, "list all available block names")
 	browseCmd.Flags().MarkHidden("list-blocks") // moved to `known` sub-command
-	browseCmd.Flags().BoolVarP(&flags.livevim, "livevim", "l", false, "load full vim data")
 	browseCmd.Flags().IntVarP(&flags.startrune, "from", "f", 0, "show range starting at this value")
 	browseCmd.Flags().IntVarP(&flags.stoprune, "to", "t", 0, "show range ending at this value")
 	resultset.RegisterCmdFlags(browseCmd, false) // verbose v | net-verbose N | internal-debug; ; don't enable oneline

commands/code/code.go

@@ -25,7 +25,6 @@ import (
 var flags struct {
 	base      intconvBase
 	clipboard bool
-	livevim   bool
 	utf8hex   bool
 }
 
@@ -50,7 +49,7 @@ var codeCmd = &cobra.Command{
 		}
 
 		srcs := sources.NewFast()
-		if flags.livevim {
+		if resultset.ResultCmdFlags.LiveVim {
 			srcs.LoadLiveVim()
 		}
 
@@ -157,7 +156,6 @@ var codeCmd = &cobra.Command{
 
 func init() {
 	codeCmd.Flags().BoolVarP(&flags.clipboard, "clipboard", "c", false, "copy resulting chars to clipboard too")
-	codeCmd.Flags().BoolVarP(&flags.livevim, "livevim", "l", false, "load full vim data (for verbose)")
 	codeCmd.Flags().BoolVarP(&flags.utf8hex, "utf8hex", "H", false, "take UTF-8 Hex-encoded codepoint")
 	codeCmd.Flags().VarP(&flags.base, "base", "b", "numeric base for code-ponts [default: usual parse rules]")
 	resultset.RegisterCmdFlags(codeCmd, true) // verbose v | net-verbose N | internal-debug; enable oneline

commands/name/name.go

@@ -23,7 +23,6 @@ import (
 var flags struct {
 	encoding      string
 	listEncodings bool
-	livevim       bool
 	punyIn        bool
 	hexInput      bool
 }
@@ -53,7 +52,7 @@ var nameCmd = &cobra.Command{
 		}
 
 		srcs := sources.NewFast()
-		if flags.livevim {
+		if resultset.ResultCmdFlags.LiveVim {
 			srcs.LoadLiveVim()
 		}
 		approxCharCount := 0
@@ -105,10 +104,6 @@ func init() {
 	nameCmd.Flags().BoolVarP(&flags.listEncodings, "list-encodings", "", false, "list -e encodings & exit")
 	nameCmd.Flags().BoolVarP(&flags.punyIn, "punycode-input", "p", false, "decode punycode on cmdline")
 	resultset.RegisterCmdFlags(nameCmd, false) // verbose v | net-verbose N | internal-debug; don't enable oneline
-	if resultset.CanTable() {
-		nameCmd.Flags().BoolVarP(&flags.livevim, "livevim", "l", false, "load full vim data (for verbose)")
-	}
-	// FIXME: support verbose results without tables
 
 	root.AddCommand(nameCmd)
 }

commands/named/named.go

@@ -23,7 +23,6 @@ import (
 var flags struct {
 	clipboard  bool
 	join       bool
-	livevim    bool
 	search     bool
 	unsorted   bool
 	htmlEntity bool
@@ -62,7 +61,7 @@ var namedCmd = &cobra.Command{
 		if flags.search {
 			srcs.LoadUnicodeSearch()
 		}
-		if flags.livevim {
+		if resultset.ResultCmdFlags.LiveVim {
 			srcs.LoadLiveVim()
 		}
 		results := resultset.New(srcs, len(args))
@@ -152,7 +151,6 @@ var namedCmd = &cobra.Command{
 func init() {
 	namedCmd.Flags().BoolVarP(&flags.clipboard, "clipboard", "c", false, "copy resulting chars to clipboard too")
 	namedCmd.Flags().BoolVarP(&flags.join, "join", "j", false, "all args are for one char name")
-	namedCmd.Flags().BoolVarP(&flags.livevim, "livevim", "l", false, "load full vim data (for verbose)")
 	namedCmd.Flags().BoolVarP(&flags.search, "search", "/", false, "search for words, not full name")
 	namedCmd.Flags().BoolVarP(&flags.unsorted, "unsorted", "u", false, "do not sort search results")
 	namedCmd.Flags().BoolVarP(&flags.htmlEntity, "html-entity", "H", false, "input words are HTML entity names")

resultset/cmdrender.go

@@ -23,6 +23,7 @@ var ResultCmdFlags struct {
 	Text            bool
 	Left            bool
 	Right           bool
+	LiveVim         bool
 	OmitColumns     string
 }
 
@@ -39,6 +40,7 @@ func RegisterCmdFlags(cmd *cobra.Command, supportOneline bool) {
 	cmd.Flags().BoolVarP(&ResultCmdFlags.JSON, "json", "J", false, "show JSON output")
 	cmd.Flags().BoolVarP(&ResultCmdFlags.NetVerbose, "net-verbose", "N", false, "show net-biased information (punycode, etc)")
 	cmd.Flags().BoolVarP(&ResultCmdFlags.Verbose, "verbose", "v", false, "show information about the character")
+	cmd.Flags().BoolVarP(&ResultCmdFlags.LiveVim, "livevim", "l", false, "load full vim data (for verbose)")
 	cmd.Flags().StringVarP(&ResultCmdFlags.OmitColumns, "omit", "", "", "skip these columns entirely when printing (comma-separated list)")
 	cmd.Flags().BoolVarP(&ResultCmdFlags.Emoji, "emoji-presentation", "E", false, "force emoji presentation")
 	cmd.Flags().BoolVarP(&ResultCmdFlags.Text, "text-presentation", "T", false, "force text presentation")