From fb4f51a9edb825164d4fbc773e40d6686582ede8 Mon Sep 17 00:00:00 2001 From: Patrick Creighton Date: Fri, 8 Mar 2024 13:44:12 -0800 Subject: [PATCH] Cleanup and merge vscode settings --- .gitignore | 1 - .vscode/cspell.json | 49 ----------------------------------------- .vscode/extensions.json | 12 ---------- .vscode/launch.json | 40 --------------------------------- .vscode/settings.json | 45 ------------------------------------- sailbot.code-workspace | 29 +++++++++++++++++++++--- 6 files changed, 26 insertions(+), 150 deletions(-) delete mode 100644 .vscode/cspell.json delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index d6d8bb203..49222a8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ __pycache__/ /boat_simulator_output/ # docs -!/src/docs # Python virtual environment .venv/ venv/ diff --git a/.vscode/cspell.json b/.vscode/cspell.json deleted file mode 100644 index 2816ad4c1..000000000 --- a/.vscode/cspell.json +++ /dev/null @@ -1,49 +0,0 @@ -// cSpell Settings -{ - // Version of the setting file. Always 0.2 - "version": "0.2", - // language - current active spelling language - "language": "en", - // words - list of words to be always considered correct - "words": [ - "Clangd", - "completionist", - "conda", - "cout", - "endl", - "gaurav", - "gtest", - "ighxy", - "iostream", - "mkdocs", - "mypy", - "OMPL", - "Protobuf", - "Raye", - "roscd", - "roslaunch", - "rosrun", - "srcnew", - "srcraye", - "struct", - "Structs", - "uncrustify", - "virtualenv", - "xcalc", - "xhost", - "xinit", - "xinitrc", - "xorg" - ], - // flagWords - list of words to be always considered incorrect - // This is useful for offensive words and common spelling errors. - // For example "hte" should be "the" - "flagWords": [ - "hte" - ], - "allowCompoundWords": true, - "ignorePaths": [ - "mkdocs.yml", - ".git" - ] -} diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 12842d8f1..000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "recommendations": [ - "bierner.markdown-preview-github-styles", - "christian-kohler.path-intellisense", - "davidanson.vscode-markdownlint", - "eamodio.gitlens", - "ms-python.python", - "redhat.vscode-yaml", - "streetsidesoftware.code-spell-checker", - "ms-python.flake8" - ] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 3ead12e8b..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Run Application", - "type": "python", - "request": "launch", - "module": "mkdocs", - "args": [ - "serve" - ], - "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart" - }, - { - "name": "Launch Chrome", - "request": "launch", - "type": "chrome", - "url": "http://localhost:8000", - }, - { - "name": "Launch Edge", - "request": "launch", - "type": "msedge", - "url": "http://localhost:8000" - } - ], - "compounds": [ - { - "name": "Launch Application in Chrome", - "configurations": ["Run Application", "Launch Chrome"], - "stopAll": true - }, - { - "name": "Launch Application in Edge", - "configurations": ["Run Application", "Launch Edge"], - "stopAll": true - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3587c5cfc..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "cSpell.enabled": true, - "[markdown]": { - "editor.unicodeHighlight.ambiguousCharacters": false, - "editor.unicodeHighlight.invisibleCharacters": false, - "editor.wordWrap": "on", - "editor.quickSuggestions": { - "other": "off", - "comments": "off", - "strings": "off" - }, - "editor.rulers": [120], - "editor.renderWhitespace": "trailing", - "cSpell.fixSpellingWithRenameProvider": true, - "cSpell.advanced.feature.useReferenceProviderWithRename": true, - "cSpell.advanced.feature.useReferenceProviderRemove": "/^#+\\s/" - }, - "yaml.schemas": { - "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml" - }, - "yaml.customTags": [ - "tag:yaml.org,2002:python/name:materialx.emoji.twemoji", - "tag:yaml.org,2002:python/name:materialx.emoji.to_svg", - "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format" - ], - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#0394bb", - "activityBar.background": "#0394bb", - "activityBar.foreground": "#e7e7e7", - "activityBar.inactiveForeground": "#e7e7e799", - "activityBarBadge.background": "#9d037c", - "activityBarBadge.foreground": "#e7e7e7", - "commandCenter.border": "#e7e7e799", - "sash.hoverBorder": "#0394bb", - "statusBar.background": "#026c89", - "statusBar.foreground": "#e7e7e7", - "statusBarItem.hoverBackground": "#0394bb", - "statusBarItem.remoteBackground": "#026c89", - "statusBarItem.remoteForeground": "#e7e7e7", - "titleBar.activeBackground": "#026c89", - "titleBar.activeForeground": "#e7e7e7", - "titleBar.inactiveBackground": "#026c8999", - "titleBar.inactiveForeground": "#e7e7e799" - } -} diff --git a/sailbot.code-workspace b/sailbot.code-workspace index 8ef82b1dd..7d4c06398 100644 --- a/sailbot.code-workspace +++ b/sailbot.code-workspace @@ -58,7 +58,11 @@ "autopep", "bsoncxx", "buildx", + "Clangd", "cmake", + "completionist", + "conda", + "cout", "cppcheck", "cppdbg", "cpplint", @@ -66,8 +70,12 @@ "deque", "devcontainer", "dtype", + "endl", "gaurav", + "gtest", + "ighxy", "ints", + "iostream", "isort", "kmph", "mkdocs", @@ -76,6 +84,7 @@ "noqa", "OMPL", "pallete", + "Protobuf", "protofiles", "pytest", "Raye", @@ -83,17 +92,28 @@ "rclpy", "rcutils", "repos", + "roscd", "rosdep", "rosdistro", "rosidl", + "roslaunch", + "rosrun", "RTPS", "srcnew", "srcraye", + "struct", + "Structs", "ubcsailbot", "uncrustify", + "virtualenv", "Wextra", "Wpedantic", - "xmllint" + "xcalc", + "xhost", + "xinit", + "xinitrc", + "xmllint", + "xorg" ], "editor.inlayHints.enabled": "off", "editor.renderWhitespace": "trailing", @@ -258,8 +278,11 @@ "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml" }, "yaml.customTags": [ - "tag:yaml.org,2002:python/name:materialx.emoji.twemoji", - "tag:yaml.org,2002:python/name:materialx.emoji.to_svg", + "!ENV scalar", + "!ENV sequence", + "!relative scalar", + "tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg", + "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji", "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format" ],