From 46fc5f748adcd2fc43f8fb0d2fa10ff1b64be93b Mon Sep 17 00:00:00 2001
From: Michael Mueller <michael.mueller@uos.de>
Date: Sun, 15 Sep 2024 19:51:03 +0200
Subject: [PATCH] Updated VSCode config.

---
 .vscode/c_cpp_properties.json | 27 +++++++++++++++++------
 .vscode/settings.json         | 41 ++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 0b1754143a..ef46a9e63a 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,6 +3,8 @@
         {
             "name": "EalánOS",
             "includePath": [
+                "${workspaceFolder}/depot/genodelabs/api/libc/**",
+                "${workspaceFolder}/depot/genodelabs/api/stdcxx/**",
                 "${workspaceFolder}/repos/**",
                 "${workspaceFolder}/repos/mml/**",
                 "${workspaceFolder}/repos/libports/include/**",
@@ -21,7 +23,8 @@
                 "${workspaceFolder}/repos/base/src/core/include/**",
                 "${workspaceFolder}/repos/base/src/include/**",
                 "${workspaceFolder}/repos/base/include/**",
-                "/usr/local/genode/tool/21.05/lib/gcc/x86_64-pc-elf/10.3.0/include"
+                "/usr/local/genode/tool/21.05/lib/gcc/x86_64-pc-elf/10.3.0/include",
+                "/home/mml/loopbench/**"
             ],
             "defines": [
                 "__GENODE__",
@@ -42,9 +45,18 @@
             "forcedInclude": [
                 "${workspaceFolder}/contrib/libc-c7cd230b11ca71979f32950803bc78b45adfa0ce/include/libc/stdint.h"
             ],
-            "mergeConfigurations": false,
+            "mergeConfigurations": true,
             "browse": {
-                "limitSymbolsToIncludedHeaders": true
+                "limitSymbolsToIncludedHeaders": true,
+                "path": [
+                    "${workspaceFolder}/contrib/libc-c7cd230b11ca71979f32950803bc78b45adfa0ce/include/libc/**",
+                    "${workspaceFolder}/contrib/libc-c7cd230b11ca71979f32950803bc78b45adfa0ce/include/spec/x86_64/libc",
+                    "${workspaceFolder}/contrib/libc-c7cd230b11ca71979f32950803bc78b45adfa0ce/include/libc/sys/**",
+                    "${workspaceFolder}/contrib/stdcxx-d2865c41fafbbf66051d38e7b742c4d5bc2f05a3/include/stdcxx/",
+                    "${workspaceFolder}/contrib/stdcxx-d2865c41fafbbf66051d38e7b742c4d5bc2f05a3/include/stdcxx/std",
+                    "${workspaceFolder}/contrib/stdcxx-d2865c41fafbbf66051d38e7b742c4d5bc2f05a3/include/stdcxx/c_std",
+                    "${workspaceFolder}/repos/libports/include/spec/x86_64/stdcxx"
+                ]
             }
         },
         {
@@ -54,11 +66,12 @@
                 "${workspaceFolder}/repos/base/**"
             ],
             "defines": [],
-            "compilerPath": "/usr/bin/clang",
+            "compilerPath": "/usr/local/genode/tool/21.05/bin/genode-x86-gcc",
             "cStandard": "c17",
-            "cppStandard": "c++14",
-            "intelliSenseMode": "linux-clang-x64",
-            "configurationProvider": "ms-vscode.makefile-tools"
+            "cppStandard": "c++20",
+            "intelliSenseMode": "${default}",
+            "configurationProvider": "ms-vscode.makefile-tools",
+            "mergeConfigurations": true
         }
     ],
     "version": 4
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3654d91693..04155ba200 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,20 @@
 {
     "files.associations": {
+        "*.rasi": "css",
+        "*.bbmodel": "json",
+        "*.sublime-snippet": "xml",
+        "*.hbs": "html",
+        "*.ejs": "html",
+        "*.emu": "html",
+        "lesskey": "lesskey",
+        "*.Xresources": "xdefaults",
+        "i3/config": "i3",
+        "i3/*.conf": "i3",
+        "polybar/config": "ini",
+        "polybar/*.conf": "ini",
+        "*.S": "gas",
+        "*.html.en": "html",
+        "*.html.de": "html",
         "stop_token": "cpp",
         "*.tcc": "cpp",
         "initializer_list": "cpp",
@@ -92,7 +107,21 @@
         "condition_variable": "cpp",
         "iomanip": "cpp",
         "*.run": "xml",
-        "span": "cpp"
+        "span": "cpp",
+        "config.h": "c",
+        "bench.h": "c",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "strstream": "cpp",
+        "decimal": "cpp",
+        "buffer": "cpp",
+        "netfwd": "cpp",
+        "propagate_const": "cpp",
+        "source_location": "cpp",
+        "complex": "cpp",
+        "numbers": "cpp",
+        "typeindex": "cpp",
+        "bool_set": "cpp"
     },
     "vscode-as-git-mergetool.settingsAssistantOnStartup": false,
     "makefile.makeDirectory": "build/x86_64",
@@ -123,10 +152,16 @@
     "makefile.buildLog": ".vscode/build.log",
     "definition-autocompletion.update_index_on_change": true,
     "definition-autocompletion.update_index_interval": 5,
-    "C_Cpp.intelliSenseEngineFallback": "disabled",
+    "C_Cpp.intelliSenseEngineFallback": "enabled",
     "makefile.extensionLog": ".vscode/extension.log",
     "makefile.ignoreDirectoryCommands": false,
     "html.format.wrapLineLength": 80,
     "editor.wordWrap": "bounded",
-    "editor.wordWrapColumn": 90
+    "editor.wordWrapColumn": 90,
+    "editor.fontSize": 12,
+    "terminal.integrated.shellIntegration.suggestEnabled": true,
+    "git.mergeEditor": true,
+    "merge-conflict.autoNavigateNextConflict.enabled": true,
+    "git.ignoreLimitWarning": true,
+    "customizeUI.statusBarPosition": "under-panel"
 }
\ No newline at end of file