Merge branch 'main' into bobbrow/codeql

Author: bobbrow

Extension/package.json

@@ -5988,18 +5988,21 @@
         "configurationDefaults": {
             "[cpp]": {
                 "editor.wordBasedSuggestions": "off",
-                "editor.suggest.insertMode": "replace",
-                "editor.semanticHighlighting.enabled": true
+                "editor.semanticHighlighting.enabled": true,
+                "editor.stickyScroll.defaultModel": "foldingProviderModel",
+                "editor.suggest.insertMode": "replace"
             },
             "[cuda-cpp]": {
                 "editor.wordBasedSuggestions": "off",
-                "editor.suggest.insertMode": "replace",
-                "editor.semanticHighlighting.enabled": true
+                "editor.semanticHighlighting.enabled": true,
+                "editor.stickyScroll.defaultModel": "foldingProviderModel",
+                "editor.suggest.insertMode": "replace"
             },
             "[c]": {
                 "editor.wordBasedSuggestions": "off",
-                "editor.suggest.insertMode": "replace",
-                "editor.semanticHighlighting.enabled": true
+                "editor.semanticHighlighting.enabled": true,
+                "editor.stickyScroll.defaultModel": "foldingProviderModel",
+                "editor.suggest.insertMode": "replace"
             }
         },
         "semanticTokenTypes": [