Skip to content

fix: improve VSCode-web settings merge with existing configurations #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: improve VSCode-web settings merge with existing configurations #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5750468
fix: improve VSCode-web settings merge with existing configurations
blink-so[bot] Jul 23, 2025
68bab0a
Merge branch 'main' into fix/vscode-web-settings-merge
matifali Jul 24, 2025
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
25 changes: 21 additions & 4 deletions registry/coder/modules/vscode-web/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,27 @@ run_vscode_web() {
"$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH_ARG" "$DISABLE_TRUST_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
}

# Check if the settings file exists...
if [ ! -f ~/.vscode-server/data/Machine/settings.json ]; then
echo "⚙️ Creating settings file..."
mkdir -p ~/.vscode-server/data/Machine
# Merge settings with any existing settings file
echo "⚙️ Configuring VS Code settings..."
mkdir -p ~/.vscode-server/data/Machine

SETTINGS_FILE="~/.vscode-server/data/Machine/settings.json"
if [ -f ~/.vscode-server/data/Machine/settings.json ]; then
# Merge with existing settings using jq if available
if command -v jq > /dev/null 2>&1; then
echo "📝 Merging with existing settings..."
# Create a temporary file with the new settings
echo "${SETTINGS}" > /tmp/new_settings.json
# Merge existing settings with new settings (new settings take precedence)
jq -s '.[0] * .[1]' ~/.vscode-server/data/Machine/settings.json /tmp/new_settings.json > /tmp/merged_settings.json
mv /tmp/merged_settings.json ~/.vscode-server/data/Machine/settings.json
rm -f /tmp/new_settings.json
else
echo "⚠️ jq not available, overwriting existing settings..."
echo "${SETTINGS}" > ~/.vscode-server/data/Machine/settings.json
fi
else
echo "📝 Creating new settings file..."
echo "${SETTINGS}" > ~/.vscode-server/data/Machine/settings.json
fi

Expand Down