From 607bd77eb1de78570b44a26adb1acd8e9c8766d1 Mon Sep 17 00:00:00 2001
From: Nils Dijk <nils@citusdata.com>
Date: Fri, 28 Jul 2023 13:15:24 +0000
Subject: [PATCH] embed vscode settings in newer supported section for
 devcontainer

---
 .devcontainer/.vscode/settings.json |  6 ------
 .devcontainer/Makefile              |  5 +----
 .devcontainer/devcontainer.json     | 20 +++++++++++++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 .devcontainer/.vscode/settings.json

diff --git a/.devcontainer/.vscode/settings.json b/.devcontainer/.vscode/settings.json
deleted file mode 100644
index 9f7b8468e..000000000
--- a/.devcontainer/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "files.exclude": {
-        "**/*.o": true,
-        "**/.deps/": true
-    }
-}
diff --git a/.devcontainer/Makefile b/.devcontainer/Makefile
index fd6a1aea0..b105d9172 100644
--- a/.devcontainer/Makefile
+++ b/.devcontainer/Makefile
@@ -1,5 +1,5 @@
 
-init: ../.vscode/c_cpp_properties.json ../.vscode/launch.json ../.vscode/settings.json
+init: ../.vscode/c_cpp_properties.json ../.vscode/launch.json
 
 ../.vscode:
 	mkdir ../.vscode
@@ -9,6 +9,3 @@ init: ../.vscode/c_cpp_properties.json ../.vscode/launch.json ../.vscode/setting
 
 ../.vscode/c_cpp_properties.json: ../.vscode
 	cp .vscode/c_cpp_properties.json ../.vscode/c_cpp_properties.json
-
-../.vscode/settings.json: ../.vscode
-	cp .vscode/settings.json ../.vscode/settings.json
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6321b5850..98b7ec1e2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,11 +6,21 @@
         "seccomp=unconfined",
     ],
     "forwardPorts": [9700],
-    "extensions": [
-        "ms-vscode.cpptools",
-        "ms-vsliveshare.vsliveshare",
-        "github.vscode-pull-request-github",
-    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-vscode.cpptools",
+                "ms-vsliveshare.vsliveshare",
+                "github.vscode-pull-request-github",
+            ],
+            "settings": {
+                "files.exclude": {
+                    "**/*.o": true,
+                    "**/.deps/": true,
+                }
+            },
+        }
+    },
     "mounts": [
         "type=volume,target=/data",
     ],