Use KeyNamerWithOriginalFieldName function in jsonschema config generation

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
+	github.com/karimkhaleel/jsonschema v0.0.0-20250323054317-7eb70f14797b
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-runewidth v0.0.16

go.sum

@@ -200,8 +200,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3 h1:s995u+gNQADMaixtNOs+jilRC/Q78q0UXSI7+4T0cDE=
-github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3/go.mod h1:MCbEh21gjOzxc31udr3u4QM9DAdf8TFJCZz3u5hYIxA=
+github.com/karimkhaleel/jsonschema v0.0.0-20250323054317-7eb70f14797b h1:fO3alvlIx8s0Ou+lkV6I46UzkUALHhdQYEWWqYMsirY=
+github.com/karimkhaleel/jsonschema v0.0.0-20250323054317-7eb70f14797b/go.mod h1:MCbEh21gjOzxc31udr3u4QM9DAdf8TFJCZz3u5hYIxA=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

pkg/config/user_config.go

@@ -504,7 +504,7 @@ type KeybindingCommitsConfig struct {
 	CherryPickCopy                 string `yaml:"cherryPickCopy"`
 	PasteCommits                   string `yaml:"pasteCommits"`
 	MarkCommitAsBaseForRebase      string `yaml:"markCommitAsBaseForRebase"`
-	CreateTag                      string `yaml:"tagCommit"`
+	TagCommit                      string `yaml:"tagCommit"`
 	CheckoutCommit                 string `yaml:"checkoutCommit"`
 	ResetCherryPick                string `yaml:"resetCherryPick"`
 	CopyCommitAttributeToClipboard string `yaml:"copyCommitAttributeToClipboard"`
@@ -963,7 +963,7 @@ func GetDefaultConfig() *UserConfig {
 				CherryPickCopy:                 "C",
 				PasteCommits:                   "V",
 				MarkCommitAsBaseForRebase:      "B",
-				CreateTag:                      "T",
+				TagCommit:                      "T",
 				CheckoutCommit:                 "<space>",
 				ResetCherryPick:                "<c-R>",
 				CopyCommitAttributeToClipboard: "y",

pkg/gui/controllers/local_commits_controller.go

@@ -255,7 +255,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
 			Tooltip:           self.c.Tr.RevertCommitTooltip,
 		},
 		{
-			Key:               opts.GetKey(opts.Config.Commits.CreateTag),
+			Key:               opts.GetKey(opts.Config.Commits.TagCommit),
 			Handler:           self.withItem(self.createTag),
 			GetDisabledReason: self.require(self.singleItemSelected()),
 			Description:       self.c.Tr.TagCommit,

pkg/integration/tests/commit/create_tag.go

@@ -21,7 +21,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("two").IsSelected(),
 				Contains("one"),
 			).
-			Press(keys.Commits.CreateTag)
+			Press(keys.Commits.TagCommit)
 
 		t.ExpectPopup().CommitMessagePanel().
 			Title(Equals("Tag name")).

pkg/integration/tests/tag/force_tag_annotated.go

@@ -22,7 +22,7 @@ var ForceTagAnnotated = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("second commit").IsSelected(),
 				Contains("new-tag").Contains("first commit"),
 			).
-			Press(keys.Commits.CreateTag).
+			Press(keys.Commits.TagCommit).
 			Tap(func() {
 				t.ExpectPopup().CommitMessagePanel().
 					Title(Equals("Tag name")).

pkg/integration/tests/tag/force_tag_lightweight.go

@@ -22,7 +22,7 @@ var ForceTagLightweight = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("second commit").IsSelected(),
 				Contains("new-tag").Contains("first commit"),
 			).
-			Press(keys.Commits.CreateTag).
+			Press(keys.Commits.TagCommit).
 			Tap(func() {
 				t.ExpectPopup().CommitMessagePanel().
 					Title(Equals("Tag name")).

pkg/jsonschema/generate.go

@@ -52,7 +52,13 @@ func getSubSchema(rootSchema, parentSchema *jsonschema.Schema, key string) *json
 }
 
 func customReflect(v *config.UserConfig) *jsonschema.Schema {
-	r := &jsonschema.Reflector{FieldNameTag: "yaml", RequiredFromJSONSchemaTags: true}
+	yamlToFieldNames := make(map[string]string)
+	keyNamer := func(yamlName string, originalFieldName string) string {
+		yamlToFieldNames[yamlName] = originalFieldName
+		return yamlName
+	}
+
+	r := &jsonschema.Reflector{FieldNameTag: "yaml", RequiredFromJSONSchemaTags: true, KeyNamerWithOriginalFieldName: keyNamer}
 	if err := r.AddGoComments("github.com/jesseduffield/lazygit/pkg/config", "../config"); err != nil {
 		panic(err)
 	}
@@ -63,15 +69,13 @@ func customReflect(v *config.UserConfig) *jsonschema.Schema {
 
 	defaultValue := reflect.ValueOf(defaultConfig).Elem()
 
-	yamlToFieldNames := lo.Invert(userConfigSchema.OriginalPropertiesMapping)
-
 	for pair := userConfigSchema.Properties.Oldest(); pair != nil; pair = pair.Next() {
 		yamlName := pair.Key
 		fieldName := yamlToFieldNames[yamlName]
 
 		subSchema := getSubSchema(schema, userConfigSchema, yamlName)
 
-		setDefaultVals(schema, subSchema, defaultValue.FieldByName(fieldName).Interface())
+		setDefaultVals(schema, subSchema, defaultValue.FieldByName(fieldName).Interface(), lo.Invert(yamlToFieldNames))
 	}
 
 	return schema
@@ -87,7 +91,7 @@ func filterOutDevComments(r *jsonschema.Reflector) {
 	}
 }
 
-func setDefaultVals(rootSchema, schema *jsonschema.Schema, defaults any) {
+func setDefaultVals(rootSchema, schema *jsonschema.Schema, defaults any, fieldToYamlNames map[string]string) {
 	t := reflect.TypeOf(defaults)
 	v := reflect.ValueOf(defaults)
 
@@ -118,15 +122,16 @@ func setDefaultVals(rootSchema, schema *jsonschema.Schema, defaults any) {
 		value := v.Field(i).Interface()
 		parentKey := t.Field(i).Name
 
-		key, ok := schema.OriginalPropertiesMapping[parentKey]
+		key, ok := fieldToYamlNames[parentKey]
 		if !ok {
+			fmt.Println(key)
 			continue
 		}
 
 		subSchema := getSubSchema(rootSchema, schema, key)
 
 		if isStruct(value) {
-			setDefaultVals(rootSchema, subSchema, value)
+			setDefaultVals(rootSchema, subSchema, value, fieldToYamlNames)
 		} else if !isZeroValue(value) {
 			subSchema.Default = value
 		}