Skip to content

Commit c583766

Browse files
committed
Merge branch 'topic/fix-settings-tmpl' into 'master'
Fix JSON syntax in VS Code settings template See merge request eng/ide/ada_language_server!1281
2 parents 1594065 + 43cc8d5 commit c583766

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.vscode/extensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"recommendations": [
33
"ms-python.black-formatter",
44
"ms-python.flake8",
5+
"ms-python.mypy-type-checker",
56
"editorconfig.editorconfig",
67
"dbaeumer.vscode-eslint",
78
"esbenp.prettier-vscode",

.vscode/settings.json.tmpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
{
2+
"files.associations": {
3+
// Treat the settings template file as JSON so it benefits from linting
4+
// and formatting
5+
"*.json.tmpl": "jsonc"
6+
},
27
"ada.projectFile": "gnat/lsp_server.gpr",
38
"ada.scenarioVariables": {
49
// Use static linking in local development to enable running the
510
// ada_language_server executable after relocation into the VS Code
611
// extension.
712
"LIBRARY_TYPE": "static"
13+
},
814
"ada.onTypeFormatting.indentOnly": true,
915
"[ada]": {
1016
"editor.autoIndent": "none",
1117
"editor.formatOnType": false,
1218
"editor.tabSize": 3
1319
},
1420
"python.analysis.extraPaths": ["testsuite"],
15-
"python.linting.enabled": true,
16-
"python.linting.mypyEnabled": true,
17-
"python.linting.flake8Enabled": true,
1821
"flake8.args": ["--max-line-length", "88"],
19-
"python.formatting.provider": "black",
2022
"[python]": {
2123
// Use the same line length as black and flake8
2224
"vim.textwidth": 88

0 commit comments

Comments
 (0)