refactor prompt, show current context

clusterise · Jul 3, 2018 · 16097da · 16097da
1 parent 6422558
commit 16097da
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/main/builtin-namespace.go b/main/builtin-namespace.go
@@ -64,7 +64,7 @@ func pickNamespace() error {
 			variables[key] = ns
 			printIndexedLine(key, ns)
 		}
-		return prompt("# namespace")
+		return prompt()
 	})
 }
 

diff --git a/main/main.go b/main/main.go
@@ -22,8 +22,21 @@ var (
 	verbose   bool
 )
 
-func prompt(text string) (string, error) {
-	fmt.Print(color.New(color.Bold).Sprintf(text + " "))
+func prompt() (string, error) {
+	color.New(color.Bold).Print("# ")
+
+	if context != "" {
+		color.New(color.FgBlack, color.Italic).Print(context)
+		fmt.Print(" ")
+	}
+
+	if namespace != "" {
+		color.New(color.Bold).Print(namespace)
+	} else {
+		color.New(color.Bold).Print("namespace")
+	}
+	fmt.Print(" ")
+
 	line, err := input.ReadString('\n')
 	if err != nil {
 		return "", err
@@ -38,7 +51,7 @@ func printIndexedLine(index, line string) {
 }
 
 func repl() error {
-	command, err := prompt("# " + namespace)
+	command, err := prompt()
 	if err != nil {
 		return err
 	}