Merge setupCppTools and setupRustAnalyzer into a single setting

package.json

@@ -233,15 +233,13 @@
           ],
           "description": "Have VSCode download the language server automatically (MacOS/Windows only for Swift-MesonLSP)"
         },
-        "mesonbuild.setupCppTools": {
-          "type": "boolean",
-          "default": true,
-          "markdownDescription": "Setup the [Microsoft C/C++ extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) to work with Meson"
-        },
-        "mesonbuild.setupRustAnalyzer": {
-          "type": "boolean",
+        "mesonbuild.modifySettings": {
+          "type": [
+            "boolean",
+            "array"
+          ],
           "default": true,
-          "markdownDescription": "Setup the [rust-analyzer extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) to work with Meson"
+          "markdownDescription": "Automatically setup other extensions to use files generated by Meson. Disable this if for example .vscode/settings.json is committed into git and should not be modified. Can also be an array of settings that can be modified, currently [cppTools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) or [rustAnalyser](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)."
         },
         "mesonbuild.Swift-MesonLSP.others.ignoreDiagnosticsFromSubprojects": {
           "type": [

src/extension.ts

@@ -11,6 +11,7 @@ import {
   getBuildDirectory,
   whenFileExists,
   mesonRootDirs,
+  modifySettings,
 } from "./utils";
 import { DebugConfigurationProviderCppdbg } from "./debug/cppdbg";
 import { DebugConfigurationProviderLldb } from "./debug/lldb";
@@ -134,15 +135,15 @@ export async function activate(ctx: vscode.ExtensionContext) {
 
   const compileCommandsFile = `${buildDir}/compile_commands.json`;
   whenFileExists(ctx, compileCommandsFile, async () => {
-    if (extensionConfiguration("setupCppTools")) {
+    if (modifySettings("cppTools")) {
       const conf = vscode.workspace.getConfiguration("C_Cpp");
       conf.update("default.compileCommands", compileCommandsFile, vscode.ConfigurationTarget.Workspace);
     }
   });
 
   const rustProjectFile = `${buildDir}/rust-project.json`;
   whenFileExists(ctx, rustProjectFile, async () => {
-    if (extensionConfiguration("setupRustAnalyzer")) {
+    if (modifySettings("rustAnalyzer")) {
       const conf = vscode.workspace.getConfiguration("rust-analyzer");
       conf.update("linkedProjects", [rustProjectFile], vscode.ConfigurationTarget.Workspace);
     }

src/types.ts

@@ -33,8 +33,7 @@ export interface ExtensionConfiguration {
   languageServerPath: string;
   downloadLanguageServer: boolean | "ask";
   selectRootDir: boolean;
-  setupCppTools: boolean;
-  setupRustAnalyzer: boolean;
+  modifySettings: boolean;
 }
 
 export interface TaskQuickPickItem extends vscode.QuickPickItem {
@@ -133,6 +132,5 @@ export enum SettingsKey {
   languageServer = "languageServer",
   configureOnOpen = "configureOnOpen",
   selectRootDir = "selectRootDir",
-  setupCppTools = "setupCppTools",
-  setupRustAnalyzer = "setupRustAnalyzer",
+  modifySettings = "modifySettings",
 }

src/utils.ts

@@ -5,7 +5,7 @@ import * as vscode from "vscode";
 import * as which from "which";
 
 import { createHash, BinaryLike } from "crypto";
-import { ExtensionConfiguration, Target } from "./types";
+import { ExtensionConfiguration, Target, SettingsKey } from "./types";
 import { getMesonBuildOptions } from "./introspection";
 import { extensionPath, workspaceState } from "./extension";
 
@@ -123,6 +123,13 @@ export function extensionConfigurationSet<K extends keyof ExtensionConfiguration
   return getConfiguration().update(key, value, target);
 }
 
+export function modifySettings(key: string) {
+  const modifySettings = extensionConfiguration(SettingsKey.modifySettings);
+  if (typeof modifySettings == "boolean") return modifySettings;
+  if (arrayIncludes(modifySettings, key)) return true;
+  return false;
+}
+
 export function arrayIncludes<T>(array: T[], value: T) {
   return array.indexOf(value) !== -1;
 }