chore: formatting nits

main
Sean McBride 4 years ago
parent e32339bbc1
commit 5e810df0a1

@ -2,18 +2,14 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.166.1/containers/docker-existing-dockerfile // https://github.com/microsoft/vscode-dev-containers/tree/v0.166.1/containers/docker-existing-dockerfile
{ {
"name": "Dockerfile", "name": "Dockerfile",
// Sets the run context to one level up instead of the .devcontainer folder. // Sets the run context to one level up instead of the .devcontainer folder.
"context": "..", "context": "..",
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
"dockerFile": "../Dockerfile.x86_64", "dockerFile": "../Dockerfile.x86_64",
// Set *default* container specific settings.json values on container create. // Set *default* container specific settings.json values on container create.
"settings": { "settings": {
"terminal.integrated.shell.linux": null "terminal.integrated.shell.linux": "bash"
}, },
// Add the IDs of extensions you want installed when the container is created. // Add the IDs of extensions you want installed when the container is created.
"extensions": [ "extensions": [
"editorconfig.editorconfig", "editorconfig.editorconfig",
@ -23,7 +19,8 @@
"13xforever.language-x86-64-assembly", "13xforever.language-x86-64-assembly",
"ms-vscode.cpptools", "ms-vscode.cpptools",
"ms-vscode.cpptools-themes", "ms-vscode.cpptools-themes",
"jeff-hykin.better-cpp-syntax" "jeff-hykin.better-cpp-syntax",
"mads-hartmann.bash-ide-vscode"
], ],
"workspaceMount": "source=${localWorkspaceFolder},target=/sledge,type=bind,consistency=cached", "workspaceMount": "source=${localWorkspaceFolder},target=/sledge,type=bind,consistency=cached",
"workspaceFolder": "/sledge", "workspaceFolder": "/sledge",

@ -23,3 +23,15 @@ ignore = true
[thirdparty/**] [thirdparty/**]
ignore = true ignore = true
[*.json]
indent_style = tab
indent_size = 4
[dockerfile]
indent_style = tab
indent_size = 4
[Dockerfile.*]
indent_style = tab
indent_size = 4

@ -10,7 +10,11 @@
"${workspaceFolder}/runtime/thirdparty/http-parser/", "${workspaceFolder}/runtime/thirdparty/http-parser/",
"${workspaceFolder}/runtime/thirdparty/jsmn/" "${workspaceFolder}/runtime/thirdparty/jsmn/"
], ],
"defines": ["USE_MEM_VM", "x86_64", "_GNU_SOURCE"], "defines": [
"USE_MEM_VM",
"x86_64",
"_GNU_SOURCE"
],
"cStandard": "c17", "cStandard": "c17",
"compilerPath": "/usr/bin/clang" "compilerPath": "/usr/bin/clang"
} }

@ -70,12 +70,44 @@
"awsm/wasmception": true, "awsm/wasmception": true,
"**/.vscode": true "**/.vscode": true
}, },
"shellformat.effectLanguages": [
"shellscript",
"dockerfile",
"ignore",
"gitignore",
],
"shellformat.path": "/usr/local/bin/shfmt",
"shellformat.flag": "-ln=bash -i 0 -bn -ci -sr -kp", "shellformat.flag": "-ln=bash -i 0 -bn -ci -sr -kp",
"terminal.integrated.profiles.linux": { "terminal.integrated.shell.linux": "bash",
"bash": { "[jsonc]": {
"path": "bash" "editor.defaultFormatter": "vscode.json-language-features"
} },
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"[shellscript]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
}, },
"terminal.integrated.shell.linux": "bash" "[dockerfile]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
},
"[ignore]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
},
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/.git/**": true,
"**/awsm/target/**": true,
"**/runtime/thirdparty/**": true,
"**/runtime/thirdparty/ck/**": true,
"**/runtime/thirdparty/http-parser/**": true,
"**/runtime/thirdparty/jsmn/**": true,
"**/runtime/thirdparty/dist/**": true,
"*.o": true,
"**/res/**": true,
"**/concurrency/res/**/**": true,
"**/deadline/res/**/**": true,
"**/preemption/res/**/**": true,
}
} }

Loading…
Cancel
Save