Skip to content

Commit d160068

Browse files
authored
Merge pull request #160 from a5chin/fix/sqlfluff-extension
Fix SQLFluff extension
2 parents de62fbb + 3387370 commit d160068

File tree

5 files changed

+9
-31
lines changed

5 files changed

+9
-31
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"extensions": [
3333
"astral-sh.ty",
3434
"charliermarsh.ruff",
35-
"dorzey.vscode-sqlfluff",
3635
"exiasr.hadolint",
3736
"kevinrose.vsc-python-indent",
3837
"mosapride.zenkaku",
@@ -42,6 +41,7 @@
4241
"njpwerner.autodocstring",
4342
"redhat.vscode-yaml",
4443
"shardulm94.trailing-spaces",
44+
"sqlfluff.vscode-sqlfluff",
4545
"streetsidesoftware.code-spell-checker",
4646
"tamasfe.even-better-toml",
4747
"yzhang.markdown-all-in-one"
@@ -52,7 +52,7 @@
5252
"DISPLAY": "dummy",
5353
"UV_PROJECT_ENVIRONMENT": "${containerWorkspaceFolder}/.venv"
5454
},
55-
"updateContentCommand": "sudo chown -R vscode /home/${remoteUser}/.cache /home/${remoteUser}/.ssh ${containerWorkspaceFolder}/.venv",
55+
"updateContentCommand": "sudo chown -R vscode /home/vscode/.cache /home/vscode/.ssh ${containerWorkspaceFolder}/.venv",
5656
"postCreateCommand": "uv sync --frozen",
5757
"postStartCommand": "uv run pre-commit install"
5858
}

.vscode/cspell.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"dmypy",
3131
"dockerfiles",
3232
"donotpresent",
33-
"dorzey",
3433
"exiasr",
3534
"fastapi",
3635
"fontawesome",

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"astral-sh.ty",
44
"charliermarsh.ruff",
55
"codezombiech.gitignore",
6-
"dorzey.vscode-sqlfluff",
76
"eamodio.gitlens",
87
"exiasr.hadolint",
98
"kevinrose.vsc-python-indent",
@@ -17,6 +16,7 @@
1716
"pkief.material-icon-theme",
1817
"redhat.vscode-yaml",
1918
"shardulm94.trailing-spaces",
19+
"sqlfluff.vscode-sqlfluff",
2020
"streetsidesoftware.code-spell-checker",
2121
"tamasfe.even-better-toml",
2222
"usernamehw.errorlens",

.vscode/settings.json

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"editor.autoIndent": "advanced",
3+
"editor.formatOnSave": true,
4+
"editor.insertSpaces": true,
25
"files.insertFinalNewline": true,
36
"files.trimTrailingWhitespace": true,
47
"notebook.codeActionsOnSave": {
@@ -25,36 +28,19 @@
2528
}
2629
},
2730
"[dockercompose]": {
28-
"editor.autoIndent": "advanced",
2931
"editor.defaultFormatter": "redhat.vscode-yaml",
30-
"editor.formatOnSave": true,
31-
"editor.insertSpaces": true,
32-
"editor.quickSuggestions": {
33-
"other": true,
34-
"comments": false,
35-
"strings": true
36-
},
3732
"editor.tabSize": 4
3833
},
3934
"[dockerfile]": {
4035
"editor.defaultFormatter": "ms-azuretools.vscode-docker",
41-
"editor.formatOnSave": true
36+
"editor.tabSize": 4
4237
},
4338
"[github-actions-workflow]": {
44-
"editor.autoIndent": "advanced",
4539
"editor.defaultFormatter": "redhat.vscode-yaml",
46-
"editor.insertSpaces": true,
47-
"editor.quickSuggestions": {
48-
"other": true,
49-
"comments": false,
50-
"strings": true
51-
},
5240
"editor.tabSize": 2
5341
},
5442
"[json][jsonc]": {
5543
"editor.defaultFormatter": "vscode.json-language-features",
56-
"editor.formatOnSave": true,
57-
"editor.insertSpaces": true,
5844
"editor.tabSize": 4
5945
},
6046
"[python]": {
@@ -63,25 +49,18 @@
6349
"source.organizeImports": "explicit"
6450
},
6551
"editor.defaultFormatter": "charliermarsh.ruff",
66-
"editor.formatOnSave": true,
6752
"editor.tabSize": 4
6853
},
6954
"[sql]": {
70-
"editor.defaultFormatter": "dorzey.vscode-sqlfluff",
71-
"editor.formatOnSave": true,
55+
"editor.defaultFormatter": "sqlfluff.vscode-sqlfluff",
7256
"editor.tabSize": 2
7357
},
7458
"[toml]": {
7559
"editor.defaultFormatter": "tamasfe.even-better-toml",
76-
"editor.formatOnSave": true,
77-
"editor.insertSpaces": true,
7860
"editor.tabSize": 4
7961
},
8062
"[yaml]": {
81-
"editor.autoIndent": "advanced",
8263
"editor.defaultFormatter": "redhat.vscode-yaml",
83-
"editor.formatOnSave": true,
84-
"editor.insertSpaces": true,
8564
"editor.tabSize": 2
8665
}
8766
}

docs/configurations/uv.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Set the `UV_PROJECT_ENVIRONMENT` not to create a virtual environment in the proj
4040
"extensions": [
4141
"astral-sh.ty",
4242
"charliermarsh.ruff",
43-
"dorzey.vscode-sqlfluff",
4443
"exiasr.hadolint",
4544
"kevinrose.vsc-python-indent",
4645
"mosapride.zenkaku",
@@ -51,6 +50,7 @@ Set the `UV_PROJECT_ENVIRONMENT` not to create a virtual environment in the proj
5150
"njpwerner.autodocstring",
5251
"redhat.vscode-yaml",
5352
"shardulm94.trailing-spaces",
53+
"sqlfluff.vscode-sqlfluff",
5454
"streetsidesoftware.code-spell-checker",
5555
"tamasfe.even-better-toml",
5656
"yzhang.markdown-all-in-one"

0 commit comments

Comments
 (0)