ls: make sure current builder is available in JSON output #3179
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
While lsBuilder has a field called Current that gets lost because the embedded struct implements custom MarshalJSON method. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
crazy-max
reviewed
May 13, 2025
Comment on lines
+216
to
+226
| // can't marshal c.Builder directly because Builder type has custom MarshalJSON | ||
| dt, err := json.Marshal(c.Builder.Builder) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var m map[string]any | ||
| if err := json.Unmarshal(dt, &m); err != nil { | ||
| return nil, err | ||
| } | ||
| m["Current"] = c.Builder.Current | ||
| return json.Marshal(m) |
There was a problem hiding this comment.
Oh interesting, this happens when marshaling structs that embed pointers. What do you think of this:
func (c *lsContext) MarshalJSON() ([]byte, error) {
type Alias builder.Builder
return json.Marshal(&struct {
*Alias
Current bool
}{
Alias: (*Alias)(c.Builder.Builder),
Current: c.Builder.Current,
})
}There was a problem hiding this comment.
This doesn't work though. If you the original Builder.MarshalJSON does not get called anymore. https://go.dev/play/p/eJgDvB1mVAh
crazy-max
approved these changes
May 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #3175
While lsBuilder has a field called Current that gets lost because the embedded struct implements custom MarshalJSON method.
This was the best workaround hack I could come up with. Didn't know about this behavior, but here is the sample case https://go.dev/play/p/XH8oRG_wGEU