From 87af97fccca4ab67fbb69a6f6b3be44ec86e145a Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:21:20 +0100 Subject: [PATCH] fix: move customizations.vscode.settings to the correct level (#329) Fixes VS Code Settings not taken over from metadata in image label #317 --- .../devcontainer-metadata-vscode.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.devcontainer/devcontainer-metadata-vscode.json b/.devcontainer/devcontainer-metadata-vscode.json index 2c868881..d710c847 100644 --- a/.devcontainer/devcontainer-metadata-vscode.json +++ b/.devcontainer/devcontainer-metadata-vscode.json @@ -13,20 +13,20 @@ "ms-vsliveshare.vsliveshare@1.0.5905", "SonarSource.sonarlint-vscode@4.3.0", "xaver.clang-format@1.9.0" - ] - }, - "settings": { - "C_Cpp.intelliSenseEngine": "disabled", - "C_Cpp.formatting": "clangFormat", - "clangd.arguments": [ - "--query-driver=/opt/**/arm-none-eabi-*", - "--compile-commands-dir=${userHome}/.amp" ], - "cmake.copyCompileCommands": "${userHome}/.amp/compile_commands.json", - "cmake.options.statusBarVisibility": "compact", - "cortex-debug.gdbPath": "gdb-multiarch", - "cortex-debug.objdumpPath": "arm-none-eabi-objdump", - "sonarlint.pathToCompileCommands": "${userHome}/.amp/compile_commands.json" + "settings": { + "C_Cpp.intelliSenseEngine": "disabled", + "C_Cpp.formatting": "clangFormat", + "clangd.arguments": [ + "--query-driver=/opt/**/arm-none-eabi-*", + "--compile-commands-dir=${userHome}/.amp" + ], + "cmake.copyCompileCommands": "${userHome}/.amp/compile_commands.json", + "cmake.options.statusBarVisibility": "compact", + "cortex-debug.gdbPath": "gdb-multiarch", + "cortex-debug.objdumpPath": "arm-none-eabi-objdump", + "sonarlint.pathToCompileCommands": "/root/.amp/compile_commands.json" + } } } }