feat: missing command text + json schema update

doc updated

docs/docs/segment-dotnet.md

@@ -27,5 +27,6 @@ Display the currently active .NET SDK version.
 
 - display_version: `boolean` - display the active version or not; useful if all you need is an icon indicating `dotnet`
   is present - defaults to `true`
+- missing_command_text: `string` - text to display when the command is missing - default to ``
 - unsupported_version_icon: `string` - text/icon that is displayed when the active .NET SDK version (e.g., one specified
   by `global.json`) is not installed/supported - defaults to `\u2327` (X in a rectangle box)

docs/docs/segment-golang.md

@@ -26,6 +26,7 @@ Display the currently active golang version when a folder contains `.go` files.
 ## Properties
 
 - display_version: `boolean` - display the golang version - defaults to `true`
+- missing_command_text: `string` - text to display when the command is missing - default to ``
 - display_mode: `string` - determines when the segment is displayed
   - `always`: The segment is always displayed
   - `context`: The segment is only displayed when *.go or go.mod files are present (default)

docs/docs/segment-julia.md

@@ -26,6 +26,7 @@ Display the currently active julia version when a folder contains `.jl` files.
 ## Properties
 
 - display_version: `boolean` - display the julia version - defaults to `true`
+- missing_command_text: `string` - text to display when the command is missing - default to ``
 - display_mode: `string` - determines when the segment is displayed
   - `always`: The segment is always displayed
   - `context`: The segment is only displayed when *.jl files are present (default)

docs/docs/segment-node.md

@@ -26,6 +26,7 @@ Display the currently active node version when a folder contains `.js` or `.ts`
 ## Properties
 
 - display_version: `boolean` - display the node version - defaults to `true`
+- missing_command_text: `string` - text to display when the command is missing - default to ``
 - display_mode: `string` - determines when the segment is displayed
   - `always`: The segment is always displayed
   - `context`: The segment is only displayed when *.js, *.ts or package.json files are present (default)

docs/docs/segment-python.md

@@ -27,6 +27,8 @@ Supports conda, virtualenv and pyenv.
 ## Properties
 
 - display_virtual_env: `boolean` - show the name of the virtualenv or not - defaults to `true`
+- display_version: `boolean` - display the python version - defaults to `true`
+- missing_command_text: `string` - text to display when the command is missing - default to ``
 - display_mode: `string` - determines when the segment is displayed
   - `always`: The segment is always displayed
   - `context`: The segment is only displayed when *.py or *.ipynb files are present (default)

src/segment_dotnet_test.go

@@ -42,7 +42,7 @@ func TestEnabledDotnetNotFound(t *testing.T) {
 		enabled: false,
 	}
 	dotnet := bootStrapDotnetTest(args)
-	assert.False(t, dotnet.enabled())
+	assert.True(t, dotnet.enabled())
 }
 
 func TestDotnetVersionNotDisplayed(t *testing.T) {

src/segment_language.go

@@ -23,6 +23,10 @@ const (
 	DisplayModeContext string = "context"
 	// DisplayModeNever hides the segment
 	DisplayModeNever string = "never"
+	// MissingCommandProperty sets the text to display when the command is not present in the system
+	MissingCommandTextProperty Property = "missing_command_text"
+	// MissingCommand displays empty string by default
+	MissingCommandText string = ""
 )
 
 func (l *language) string() string {
@@ -32,18 +36,13 @@ func (l *language) string() string {
 	}
 
 	// call getVersion if displayVersion set in config
-	if l.props.getBool(DisplayVersion, true) && l.getVersion() {
+	if l.props.getBool(DisplayVersion, true) && l.hasCommand() && l.getVersion() {
 		return l.version
 	}
 	return ""
 }
 
 func (l *language) enabled() bool {
-	// check if one of the defined commands exists in the system
-	if !l.hasCommand() {
-		return false
-	}
-
 	displayMode := l.props.getString(DisplayModeProperty, DisplayModeContext)
 	displayVersion := l.props.getBool(DisplayVersion, true)
 

src/segment_language_test.go

@@ -13,15 +13,16 @@ const (
 )
 
 type languageArgs struct {
-	version           string
-	displayVersion    bool
-	displayMode       string
-	extensions        []string
-	enabledExtensions []string
-	commands          []string
-	enabledCommands   []string
-	versionParam      string
-	versionRegex      string
+	version            string
+	displayVersion     bool
+	displayMode        string
+	extensions         []string
+	enabledExtensions  []string
+	commands           []string
+	enabledCommands    []string
+	versionParam       string
+	versionRegex       string
+	missingCommandText string
 }
 
 func (l *languageArgs) hasvalue(value string, list []string) bool {
@@ -48,6 +49,9 @@ func bootStrapLanguageTest(args *languageArgs) *language {
 			DisplayModeProperty: args.displayMode,
 		},
 	}
+	if args.missingCommandText != "" {
+		props.values[MissingCommandTextProperty] = args.missingCommandText
+	}
 	l := &language{
 		props:        props,
 		env:          env,
@@ -91,7 +95,7 @@ func TestLanguageFilesFoundButNoCommandAndNoVersion(t *testing.T) {
 		enabledExtensions: []string{uni},
 	}
 	lang := bootStrapLanguageTest(args)
-	assert.False(t, lang.enabled(), "unicorn is not available")
+	assert.True(t, lang.enabled(), "unicorn is not available")
 }
 
 func TestLanguageDisabledNoFiles(t *testing.T) {
@@ -184,3 +188,36 @@ func TestLanguageEnabledNoVersion(t *testing.T) {
 	assert.True(t, lang.enabled())
 	assert.Equal(t, "", lang.string(), "unicorn is available and uni and corn files are found")
 }
+
+func TestLanguageEnabledMissingCommand(t *testing.T) {
+	args := &languageArgs{
+		versionParam:      "--version",
+		commands:          []string{""},
+		enabledCommands:   []string{"unicorn"},
+		extensions:        []string{uni, corn},
+		versionRegex:      "(?P<version>.*)",
+		version:           universion,
+		enabledExtensions: []string{uni, corn},
+		displayVersion:    false,
+	}
+	lang := bootStrapLanguageTest(args)
+	assert.True(t, lang.enabled())
+	assert.Equal(t, "", lang.string(), "unicorn is available and uni and corn files are found")
+}
+
+func TestLanguageEnabledMissingCommandCustomText(t *testing.T) {
+	args := &languageArgs{
+		versionParam:       "--version",
+		commands:           []string{""},
+		enabledCommands:    []string{"unicorn"},
+		extensions:         []string{uni, corn},
+		versionRegex:       "(?P<version>.*)",
+		version:            universion,
+		enabledExtensions:  []string{uni, corn},
+		displayVersion:     false,
+		missingCommandText: "missing",
+	}
+	lang := bootStrapLanguageTest(args)
+	assert.True(t, lang.enabled())
+	assert.Equal(t, args.missingCommandText, lang.string(), "unicorn is available and uni and corn files are found")
+}

themes/schema.json

@@ -17,6 +17,19 @@
       "description": "Show or hide the version number",
       "default": true
     },
+    "display_mode": {
+      "type": "string",
+      "title": "Display Mode",
+      "description": "Determines whether the segment is displayed always or only if a file matching the extensions are present in the current folder",
+      "enum": ["always", "context", "never"],
+      "default": "context"
+    },
+    "missing_command_text": {
+      "type": "string",
+      "title": "Missing command text",
+      "description": "The string to display when the command is not available",
+      "default": ""
+    },
     "block": {
       "type": "object",
       "description": "https://ohmyposh.dev/docs/configure#block",
@@ -357,6 +370,12 @@
                   },
                   "display_version": {
                     "$ref": "#/definitions/display_version"
+                  },
+                  "display_mode": {
+                    "$ref": "#/definitions/display_mode"
+                  },
+                  "missing_command_text": {
+                    "$ref": "#/definitions/missing_command_text"
                   }
                 }
               }
@@ -613,6 +632,12 @@
                 "properties": {
                   "display_version": {
                     "$ref": "#/definitions/display_version"
+                  },
+                  "display_mode": {
+                    "$ref": "#/definitions/display_mode"
+                  },
+                  "missing_command_text": {
+                    "$ref": "#/definitions/missing_command_text"
                   }
                 }
               }
@@ -633,6 +658,12 @@
                 "properties": {
                   "display_version": {
                     "$ref": "#/definitions/display_version"
+                  },
+                  "display_mode": {
+                    "$ref": "#/definitions/display_mode"
+                  },
+                  "missing_command_text": {
+                    "$ref": "#/definitions/missing_command_text"
                   }
                 }
               }
@@ -664,6 +695,12 @@
                 "properties": {
                   "display_version": {
                     "$ref": "#/definitions/display_version"
+                  },
+                  "display_mode": {
+                    "$ref": "#/definitions/display_mode"
+                  },
+                  "missing_command_text": {
+                    "$ref": "#/definitions/missing_command_text"
                   }
                 }
               }
@@ -914,11 +951,10 @@
                     "default": true
                   },
                   "display_mode": {
-                    "type": "string",
-                    "title": "Display Mode",
-                    "description": "Determines whether the segment is displayed always or only if *.py or *.ipynb file are present in the current folder",
-                    "enum": ["always", "context", "never"],
-                    "default": "context"
+                    "$ref": "#/definitions/display_mode"
+                  },
+                  "missing_command_text": {
+                    "$ref": "#/definitions/missing_command_text"
                   }
                 }
               }