Skip to content

Commit 0726e30

Browse files
atiqsamtiaJanDeDobbeleer
authored andcommitted
feat: add fvm support
1 parent abdc6e4 commit 0726e30

File tree

6 files changed

+22
-2
lines changed

6 files changed

+22
-2
lines changed

src/segments/dart.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ func (d *Dart) Enabled() bool {
1717
d.extensions = dartExtensions
1818
d.folders = dartFolders
1919
d.commands = []*cmd{
20+
{
21+
executable: "fvm",
22+
args: []string{"dart", "--version"},
23+
regex: `Dart SDK version: (?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+).(?P<patch>[0-9]+)))`,
24+
},
2025
{
2126
executable: "dart",
2227
args: []string{"--version"},

src/segments/dart_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ func TestDart(t *testing.T) {
2222
versionOutput: tc.Version,
2323
extension: "*.dart",
2424
}
25+
2526
env, props := getMockedLanguageEnv(params)
27+
env.On("HasCommand", "fvm").Return(false)
28+
2629
d := &Dart{}
2730
d.Init(props, env)
31+
2832
assert.True(t, d.Enabled(), fmt.Sprintf("Failed in case: %s", tc.Case))
2933
assert.Equal(t, tc.ExpectedString, renderTemplate(env, d.Template(), d), fmt.Sprintf("Failed in case: %s", tc.Case))
3034
}

src/segments/flutter.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ func (f *Flutter) Enabled() bool {
1212
f.extensions = dartExtensions
1313
f.folders = dartFolders
1414
f.commands = []*cmd{
15+
{
16+
executable: "fvm",
17+
args: []string{"flutter", "--version"},
18+
regex: `Flutter (?P<version>((?P<major>[0-9]+).(?P<minor>[0-9]+).(?P<patch>[0-9]+)))`,
19+
},
1520
{
1621
executable: "flutter",
1722
args: []string{"--version"},

src/segments/flutter_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ func TestFlutter(t *testing.T) {
2222
versionOutput: tc.Version,
2323
extension: "*.dart",
2424
}
25+
2526
env, props := getMockedLanguageEnv(params)
27+
env.On("HasCommand", "fvm").Return(false)
28+
2629
d := &Flutter{}
2730
d.Init(props, env)
31+
2832
assert.True(t, d.Enabled(), fmt.Sprintf("Failed in case: %s", tc.Case))
2933
assert.Equal(t, tc.ExpectedString, renderTemplate(env, d.Template(), d), fmt.Sprintf("Failed in case: %s", tc.Case))
3034
}

website/docs/segments/cli/flutter.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sidebar_label: Flutter
66

77
## What
88

9-
Display the currently active [flutter] version.
9+
Display the currently active [flutter] version. Supports [fvm].
1010

1111
## Sample Configuration
1212

@@ -57,6 +57,7 @@ import Config from "@site/src/components/Config.js";
5757
| `.URL` | `string` | URL of the version info / release notes |
5858
| `.Error` | `string` | error encountered when fetching the version string |
5959

60+
[fvm]: https://fvm.app/
6061
[go-text-template]: https://golang.org/pkg/text/template/
6162
[templates]: /docs/configuration/templates
6263
[flutter]: https://flutter.dev/

website/docs/segments/languages/dart.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sidebar_label: Dart
66

77
## What
88

9-
Display the currently active dart version.
9+
Display the currently active dart version. Supports [fvm].
1010

1111
## Sample Configuration
1212

@@ -57,6 +57,7 @@ import Config from "@site/src/components/Config.js";
5757
| `.URL` | `string` | URL of the version info / release notes |
5858
| `.Error` | `string` | error encountered when fetching the version string |
5959

60+
[fvm]: https://fvm.app/
6061
[go-text-template]: https://golang.org/pkg/text/template/
6162
[templates]: /docs/configuration/templates
6263
[time.ParseDuration]: https://golang.org/pkg/time/#ParseDuration

0 commit comments

Comments
 (0)