mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 12:29:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(language): expose executable and allow different URL templates

Browse source
This commit is contained in:
jedwillick 2022-07-19 13:59:37 +10:00 committed by Jan De Dobbeleer
parent c13a5c8df8
commit 4f48c2b0d1
2 changed files with 68 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/segments/language.go
View file

@ -28,13 +28,15 @@ type version struct {
Prerelease string
BuildMetadata string
URL string
Executable string
}
type cmd struct {
executable string
args []string
regex string
getVersion getVersion
executable string
args []string
regex string
getVersion getVersion
versionURLTemplate string
}
func (c *cmd) parse(versionInfo string) (*version, error) {
@ -180,7 +182,11 @@ func (l *language) setVersion() error {
return fmt.Errorf("err parsing info from %s with %s", command.executable, versionStr)
}
l.version = *version
if command.versionURLTemplate != "" {
l.versionURLTemplate = command.versionURLTemplate
}
l.buildVersionURL()
l.version.Executable = command.executable
return nil
}
return errors.New(l.props.GetString(MissingCommandText, ""))

58
src/segments/language_test.go
View file

@ -153,6 +153,7 @@ func TestLanguageEnabledOneExtensionFound(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, universion, lang.Full, "unicorn is available and uni files are found")
assert.Equal(t, "unicorn", lang.Executable, "unicorn was used")
}
func TestLanguageDisabledInHome(t *testing.T) {
@ -191,6 +192,7 @@ func TestLanguageEnabledSecondExtensionFound(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, universion, lang.Full, "unicorn is available and corn files are found")
assert.Equal(t, "unicorn", lang.Executable, "unicorn was used")
}
func TestLanguageEnabledSecondCommand(t *testing.T) {
@ -215,6 +217,7 @@ func TestLanguageEnabledSecondCommand(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, universion, lang.Full, "unicorn is available and corn files are found")
assert.Equal(t, "corn", lang.Executable, "corn was used")
}
func TestLanguageEnabledAllExtensionsFound(t *testing.T) {
@ -234,6 +237,7 @@ func TestLanguageEnabledAllExtensionsFound(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, universion, lang.Full, "unicorn is available and uni and corn files are found")
assert.Equal(t, "unicorn", lang.Executable, "unicorn was used")
}
func TestLanguageEnabledNoVersion(t *testing.T) {
@ -257,6 +261,7 @@ func TestLanguageEnabledNoVersion(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, "", lang.Full, "unicorn is available and uni and corn files are found")
assert.Equal(t, "", lang.Executable, "no version was found")
}
func TestLanguageEnabledMissingCommand(t *testing.T) {
@ -274,6 +279,7 @@ func TestLanguageEnabledMissingCommand(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, "", lang.Full, "unicorn is unavailable and uni and corn files are found")
assert.Equal(t, "", lang.Executable, "no executable was found")
}
func TestLanguageEnabledNoVersionData(t *testing.T) {
@ -297,6 +303,7 @@ func TestLanguageEnabledNoVersionData(t *testing.T) {
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, "", lang.Full)
assert.Equal(t, "", lang.Executable, "no version was found")
}
func TestLanguageEnabledMissingCommandCustomText(t *testing.T) {
@ -438,3 +445,54 @@ func TestLanguageEnabledInHome(t *testing.T) {
assert.Equal(t, tc.ExpectedEnabled, lang.Enabled(), tc.Case)
}
}
func TestLanguageInnerHyperlink(t *testing.T) {
args := &languageArgs{
commands: []*cmd{
{
executable: "uni",
args: []string{"--version"},
regex: `(?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+).(?P<patch>[0-9]+)))`,
versionURLTemplate: "https://uni.org/release/{{ .Full }}",
},
{
executable: "corn",
args: []string{"--version"},
regex: `(?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+).(?P<patch>[0-9]+)))`,
versionURLTemplate: "https://unicor.org/doc/{{ .Full }}",
},
},
versionURLTemplate: "This gets replaced with inner template",
extensions: []string{uni, corn},
enabledExtensions: []string{corn},
enabledCommands: []string{"corn"},
version: universion,
properties: properties.Map{},
}
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, "https://unicor.org/doc/1.3.307", lang.version.URL)
}
func TestLanguageHyperlinkTemplatePropertyTakesPriority(t *testing.T) {
args := &languageArgs{
commands: []*cmd{
{
executable: "uni",
args: []string{"--version"},
regex: `(?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+).(?P<patch>[0-9]+)))`,
versionURLTemplate: "https://uni.org/release/{{ .Full }}",
},
},
extensions: []string{uni},
enabledExtensions: []string{uni},
enabledCommands: []string{"uni"},
version: universion,
properties: properties.Map{
properties.VersionURLTemplate: "https://custom/url/template/{{ .Major }}.{{ .Minor }}",
},
}
lang := bootStrapLanguageTest(args)
assert.True(t, lang.Enabled())
assert.Equal(t, "https://custom/url/template/1.3", lang.version.URL)
}