Skip to content

Commit

Permalink
Merge branch 'topic/vscode-shell-scripts' into 'master'
Browse files Browse the repository at this point in the history
Change VS Code shell formatting because Prettier doesn't support it

See merge request eng/ide/ada_language_server!1627
  • Loading branch information
eliericha committed Jul 18, 2024
2 parents 1d1201c + 5105604 commit 52a5dc1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"davidanson.vscode-markdownlint",
"adacore.ada",
"ms-vscode.extension-test-runner",
"timonwong.shellcheck"
"timonwong.shellcheck",
"foxundermoon.shell-format"
]
}
2 changes: 1 addition & 1 deletion .vscode/settings.json.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"[shellscript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "foxundermoon.shell-format"
},
"terminal.integrated.env.osx": {
// Dependencies can be provided under the subprojects/ directory. They
Expand Down

0 comments on commit 52a5dc1

Please sign in to comment.