ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Remove our yaml fork

Browse Source 
Switch back to the official go-yaml package.
This commit is contained in:
Stefan Haller
2024-03-29 17:17:53 +01:00
parent 93aee0dca0
commit 8487bc397d
22 changed files with 4 additions and 9880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/config/app_config.go
View File

@@ -8,8 +8,7 @@ import (
"github.com/adrg/xdg"
"github.com/jesseduffield/lazygit/pkg/utils/yaml_utils"
yaml "github.com/jesseduffield/yaml"
yaml3 "gopkg.in/yaml.v3"
"gopkg.in/yaml.v3"
)
// AppConfig contains the base configuration fields required for lazygit.
@@ -200,8 +199,8 @@ func migrateUserConfig(path string, content []byte) ([]byte, error) {
}
func changeNullKeybindingsToDisabled(changedContent []byte) ([]byte, error) {
return yaml_utils.Walk(changedContent, func(node *yaml3.Node, path string) bool {
if strings.HasPrefix(path, "keybinding.") && node.Kind == yaml3.ScalarNode && node.Tag == "!!null" {
return yaml_utils.Walk(changedContent, func(node *yaml.Node, path string) bool {
if strings.HasPrefix(path, "keybinding.") && node.Kind == yaml.ScalarNode && node.Tag == "!!null" {
node.Value = "<disabled>"
node.Tag = "!!str"
return true

2
pkg/config/dummies.go
View File

@@ -1,7 +1,7 @@
package config
import (
yaml "github.com/jesseduffield/yaml"
"gopkg.in/yaml.v3"
)
// NewDummyAppConfig creates a new dummy AppConfig for testing