refactor: remove error_icon property

JanDeDobbeleer · JanDeDobbeleer · commit 592f4147a2b0 · 2020-10-05T17:19:05.000+02:00
diff --git a/Themes/agnoster.json b/Themes/agnoster.json
@@ -71,7 +71,7 @@
           "foreground": "#ffffff",
           "background": "#ff8080",
           "properties": {
-            "error_icon": ""
+            "prefix": ""
           }
         }
       ]
diff --git a/Themes/avit.json b/Themes/avit.json
@@ -41,7 +41,7 @@
           "style": "plain",
           "foreground": "#C94A16",
           "properties": {
-            "error_icon": "x"
+            "prefix": "x"
           }
         }
       ]
diff --git a/Themes/darkblood.json b/Themes/darkblood.json
@@ -46,8 +46,7 @@
           "style": "plain",
           "foreground": "#ffffff",
           "properties": {
-            "error_icon": "x",
-            "prefix": "<#CB4B16>[</>",
+            "prefix": "<#CB4B16>[x</>",
             "postfix": "<#CB4B16>]</>"
           }
         }
diff --git a/Themes/emodipt.json b/Themes/emodipt.json
@@ -52,7 +52,7 @@
           "style": "plain",
           "foreground": "#C94A16",
           "properties": {
-            "error_icon": "x"
+            "prefix": "x"
           }
         },
         {
diff --git a/Themes/fish.json b/Themes/fish.json
@@ -9,7 +9,7 @@
           "style": "plain",
           "foreground": "#ffffff",
           "properties": {
-            "error_icon": " ",
+            "prefix": " ",
             "postfix": ""
           }
         },
diff --git a/Themes/honukai.json b/Themes/honukai.json
@@ -89,8 +89,7 @@
           "style": "plain",
           "foreground": "#CB4B16",
           "properties": {
-            "prefix": "",
-            "error_icon": ""
+            "prefix": ""
           }
         },
         {
diff --git a/Themes/jandedobbeleer.json b/Themes/jandedobbeleer.json
@@ -91,12 +91,11 @@
           "leading_diamond": "",
           "trailing_diamond": "",
           "properties": {
-            "error_icon": "",
             "display_exit_code": false,
             "always_enabled": true,
             "error_color": "#e91e63",
             "color_background": true,
-            "prefix": "<#193549> </>"
+            "prefix": "<#193549></> "
           }
         }
       ]
diff --git a/Themes/material.json b/Themes/material.json
@@ -36,7 +36,7 @@
           "style": "plain",
           "foreground": "#DCB977",
           "properties": {
-            "error_icon": "✗",
+            "prefix": "✗",
             "display_exit_code": false
           }
         },
diff --git a/Themes/paradox.json b/Themes/paradox.json
@@ -71,7 +71,7 @@
           "foreground": "#ffffff",
           "background": "#ff8080",
           "properties": {
-            "error_icon": ""
+            "prefix": ""
           }
         }
       ]
diff --git a/Themes/pararussel.json b/Themes/pararussel.json
@@ -37,7 +37,7 @@
           "style": "plain",
           "foreground": "#DCB977",
           "properties": {
-            "error_icon": "✗",
+            "prefix": "✗",
             "display_exit_code": false
           }
         }
diff --git a/Themes/powerlevel10k_classic.json b/Themes/powerlevel10k_classic.json
@@ -92,8 +92,7 @@
           "style": "plain",
           "foreground": "#D4E157",
           "properties": {
-            "prefix": "",
-            "error_icon": "❯",
+            "prefix": "❯",
             "always_enabled": true,
             "error_color": "#FF5252",
             "display_exit_code": false
diff --git a/Themes/powerline.json b/Themes/powerline.json
@@ -64,7 +64,7 @@
           "foreground": "#ffffff",
           "background": "#ff8080",
           "properties": {
-            "error_icon": ""
+            "prefix": ""
           }
         }
       ]
diff --git a/Themes/robbyrussel.json b/Themes/robbyrussel.json
@@ -37,7 +37,7 @@
           "style": "plain",
           "foreground": "#DCB977",
           "properties": {
-            "error_icon": "✗",
+            "prefix": "✗",
             "display_exit_code": false
           }
         }
diff --git a/Themes/sorin.json b/Themes/sorin.json
@@ -9,7 +9,7 @@
           "style": "plain",
           "foreground": "#CB4B16",
           "properties": {
-            "error_icon": ""
+            "prefix": ""
           }
         },
         {
diff --git a/Themes/star.json b/Themes/star.json
@@ -47,7 +47,7 @@
           "style": "plain",
           "foreground": "#C94A16",
           "properties": {
-            "error_icon": "x"
+            "prefix": "x"
           }
         }
       ]
diff --git a/Themes/zash.json b/Themes/zash.json
@@ -49,7 +49,7 @@
           "style": "plain",
           "foreground": "#DCB977",
           "properties": {
-            "error_icon": "✗",
+            "prefix": "✗",
             "display_exit_code": false,
             "postfix": ""
           }
diff --git a/segment_exit.go b/segment_exit.go
@@ -8,8 +8,6 @@ type exit struct {
 }
 
 const (
-	//ErrorIcon represents icon to display in case of error
-	ErrorIcon Property = "error_icon"
 	//DisplayExitCode shows or hides the error code
 	DisplayExitCode Property = "display_exit_code"
 	//AlwaysEnabled decides whether or not to always display the exitcode info
@@ -35,7 +33,6 @@ func (e *exit) init(props *properties, env environmentInfo) {
 }
 
 func (e *exit) getFormattedText() string {
-	errorIcon := e.props.getString(ErrorIcon, "X")
 	exitCode := e.getMeaningFromExitCode()
 	colorBackground := e.props.getBool(ColorBackground, false)
 	if e.env.lastErrorCode() != 0 && !colorBackground {
@@ -44,7 +41,7 @@ func (e *exit) getFormattedText() string {
 	if e.env.lastErrorCode() != 0 && colorBackground {
 		e.props.background = e.props.getColor(ErrorColor, e.props.background)
 	}
-	return fmt.Sprintf("%s%s", errorIcon, exitCode)
+	return exitCode
 }
 
 func (e *exit) getMeaningFromExitCode() string {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`"foreground": "#ffffff",`
`72`	`72`	`"background": "#ff8080",`
`73`	`73`	`"properties": {`
`74`		`- "error_icon": ""`
	`74`	`+ "prefix": ""`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`"style": "plain",`
`42`	`42`	`"foreground": "#C94A16",`
`43`	`43`	`"properties": {`
`44`		`- "error_icon": "x"`
	`44`	`+ "prefix": "x"`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@`
`46`	`46`	`"style": "plain",`
`47`	`47`	`"foreground": "#ffffff",`
`48`	`48`	`"properties": {`
`49`		`- "error_icon": "x",`
`50`		`- "prefix": "<#CB4B16>[</>",`
	`49`	`+ "prefix": "<#CB4B16>[x</>",`
`51`	`50`	`"postfix": "<#CB4B16>]</>"`
`52`	`51`	`}`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"style": "plain",`
`53`	`53`	`"foreground": "#C94A16",`
`54`	`54`	`"properties": {`
`55`		`- "error_icon": "x"`
	`55`	`+ "prefix": "x"`
`56`	`56`	`}`
`57`	`57`	`},`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"style": "plain",`
`10`	`10`	`"foreground": "#ffffff",`
`11`	`11`	`"properties": {`
`12`		`- "error_icon": " ",`
	`12`	`+ "prefix": " ",`
`13`	`13`	`"postfix": ""`
`14`	`14`	`}`
`15`	`15`	`},`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@`
`89`	`89`	`"style": "plain",`
`90`	`90`	`"foreground": "#CB4B16",`
`91`	`91`	`"properties": {`
`92`		`- "prefix": "",`
`93`		`- "error_icon": ""`
	`92`	`+ "prefix": ""`
`94`	`93`	`}`
`95`	`94`	`},`
`96`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,11 @@`
`91`	`91`	`"leading_diamond": "",`
`92`	`92`	`"trailing_diamond": "",`
`93`	`93`	`"properties": {`
`94`		`- "error_icon": "",`
`95`	`94`	`"display_exit_code": false,`
`96`	`95`	`"always_enabled": true,`
`97`	`96`	`"error_color": "#e91e63",`
`98`	`97`	`"color_background": true,`
`99`		`- "prefix": "<#193549> </>"`
	`98`	`+ "prefix": "<#193549></> "`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`	`]`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`"style": "plain",`
`37`	`37`	`"foreground": "#DCB977",`
`38`	`38`	`"properties": {`
`39`		`- "error_icon": "✗",`
	`39`	`+ "prefix": "✗",`
`40`	`40`	`"display_exit_code": false`
`41`	`41`	`}`
`42`	`42`	`},`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`"style": "plain",`
`38`	`38`	`"foreground": "#DCB977",`
`39`	`39`	`"properties": {`
`40`		`- "error_icon": "✗",`
	`40`	`+ "prefix": "✗",`
`41`	`41`	`"display_exit_code": false`
`42`	`42`	`}`
`43`	`43`	`}`