Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions cmd/internal/agentcontainer/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,11 @@ func (cmd *SetupContainerCmd) setupVSCode(
) error {
log.Debugf("setup %s", flavor.DisplayName())
vsCodeConfiguration := config.GetVSCodeConfiguration(setupInfo.MergedConfig)
log.Debugf("vscode settings: %v", vsCodeConfiguration.Settings)
formattedSettings, err := formatVSCodeSettings(vsCodeConfiguration.Settings)
if err != nil {
return err
}
log.Debugf("vscode settings:\n%s", formattedSettings)
settings := ""
if len(vsCodeConfiguration.Settings) > 0 {
out, err := json.Marshal(vsCodeConfiguration.Settings)
Expand All @@ -762,7 +766,7 @@ func (cmd *SetupContainerCmd) setupVSCode(
}

user := config.GetRemoteUser(setupInfo)
err := vscode.NewVSCodeServer(vscode.ServerOptions{
err = vscode.NewVSCodeServer(vscode.ServerOptions{
Extensions: vsCodeConfiguration.Extensions,
Settings: settings,
UserName: user,
Expand Down Expand Up @@ -805,6 +809,15 @@ func (cmd *SetupContainerCmd) setupVSCode(
})
}

func formatVSCodeSettings(settings map[string]any) (string, error) {
formatted, err := json.MarshalIndent(settings, "", " ")
if err != nil {
return "", err
}

return string(formatted), nil
}

// setupBrowserIDE installs and starts any of the browser-based IDEs
// (openvscode, code-server, VS Code Web). The per-IDE differences live in the
// browserIDEs registry, so the install/extensions/start flow is written once.
Expand Down
34 changes: 34 additions & 0 deletions cmd/internal/agentcontainer/setup_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,40 @@ func TestCompressSetupInfoPreservesSubstitutedValues(t *testing.T) {
assert.Equal(t, "/home/testuser", *gotHome)
}

func TestFormatVSCodeSettings(t *testing.T) {
settings := map[string]any{
"python": map[string]any{
"editor.defaultFormatter": "ms-python.autopep8",
},
"editor": map[string]any{
"codeActionsOnSave": []any{"source.organizeImports", "source.fixAll"},
},
}

formatted, err := formatVSCodeSettings(settings)
require.NoError(t, err)
assert.Equal(t, `{
"editor": {
"codeActionsOnSave": [
"source.organizeImports",
"source.fixAll"
]
},
"python": {
"editor.defaultFormatter": "ms-python.autopep8"
}
}`, formatted)

repeated, err := formatVSCodeSettings(settings)
require.NoError(t, err)
assert.Equal(t, formatted, repeated)
}

func TestFormatVSCodeSettingsReturnsSerializationError(t *testing.T) {
_, err := formatVSCodeSettings(map[string]any{"unsupported": func() {}})
require.Error(t, err)
}

func TestSecretsEnvRoundTripPreservesMultilineValues(t *testing.T) {
entries := []string{
"TLS_KEY=-----BEGIN KEY-----\nline1\nline2\n-----END KEY-----",
Expand Down
Loading