(#733) use existing properties inside omnisharp.json

package.json

@@ -622,7 +622,7 @@
     "watch": "npm run ensureCi && tsc -watch -p ./",
     "test": "npm run compile && node ./out/test/runTest.js",
     "depcheck": "depcheck",
-    "ensureCi": "node -e \"const fs=require('fs'); if (fs.existsSync('./node_modules/')) { process.exit(123); }\" && npm ci"
+    "ensureCi": "(node -e \"const fs=require('fs'); if (fs.existsSync('./node_modules/')) { process.exit(123); }\" && npm ci) & echo 'ensured.'"
   },
   "dependencies": {
     "adm-zip": "^0.5.9",

src/bakery/cakeBakery.ts

@@ -90,22 +90,36 @@ export class CakeBakery {
 
                 const targetPath = this.getTargetPath();
                 const omnisharpCakeConfigFile = this.getOmnisharpCakeConfigFile();
+                let omnisharpCakeConfig = {};
                 if (fs.existsSync(omnisharpCakeConfigFile)) {
                     // Read in file
                     //import omnisharpCakeConfig from omnisharpCakeConfigFile;
-                    var omnisharpCakeConfig = JSON.parse(fs.readFileSync(omnisharpCakeConfigFile, 'utf-8'))
-                    logger.logInfo(`existing bakery-path: ${omnisharpCakeConfig.cake.bakeryPath}`);
-                    omnisharpCakeConfig.cake.bakeryPath = targetPath;
-                    logger.logInfo(`new bakery-path: ${omnisharpCakeConfig.cake.bakeryPath}`);
-                    fs.writeFileSync(omnisharpCakeConfigFile, JSON.stringify(omnisharpCakeConfig, null, 2));
-
-                    // lets force a restart of the Omnisharp server to use new config
-                    vscode.commands.executeCommand('o.restart');
+                    omnisharpCakeConfig = JSON.parse(fs.readFileSync(omnisharpCakeConfigFile, 'utf-8'))
                 } else {
-                    // create file
-                    var newOmnisharpCakeConfig = { cake: { bakeryPath: targetPath }};
-                    fs.writeFileSync(omnisharpCakeConfigFile, JSON.stringify(newOmnisharpCakeConfig));
+                    logger.logInfo(`${omnisharpCakeConfigFile} will be created.`);
+                }
+
+                let cakePropName = this.getPropertyNameCaseInsensitive(omnisharpCakeConfig, "cake");
+                if(!cakePropName) {
+                    cakePropName = "cake"
+                    omnisharpCakeConfig[cakePropName] = {};
                 }
+
+                let bakeryPathPropName = this.getPropertyNameCaseInsensitive(omnisharpCakeConfig[cakePropName], "bakeryPath");
+                if(!bakeryPathPropName) {
+                    bakeryPathPropName = "bakeryPath"
+                    omnisharpCakeConfig[cakePropName][bakeryPathPropName] = "";
+                }
+
+                logger.logInfo(`existing bakery-path: ${omnisharpCakeConfig[cakePropName][bakeryPathPropName]}`);
+                omnisharpCakeConfig[cakePropName][bakeryPathPropName] = targetPath;
+                logger.logInfo(`new bakery-path: ${omnisharpCakeConfig[cakePropName][bakeryPathPropName]}`);
+
+
+                fs.writeFileSync(omnisharpCakeConfigFile, JSON.stringify(omnisharpCakeConfig, null, 2));
+
+                // lets force a restart of the Omnisharp server to use new config
+                vscode.commands.executeCommand('o.restart');
                 logger.logInfo("Omnisharp setting successfully updated.")
                 resolve();
             } catch (e) {
@@ -124,4 +138,16 @@ export class CakeBakery {
     private getOmnisharpCakeConfigFile() : string {
         return path.join(this.getOmnisharpUserFolderPath(), "omnisharp.json");
     }
+
+    private getPropertyNameCaseInsensitive(obj: any, propName: string) : string|null {
+        for (const key in obj) {
+            if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                if(propName.toLowerCase() == key.toLowerCase()) {
+                    return key;
+                }
+            }
+        }
+
+        return null;
+    }
 }

src/bakery/cakeBakeryCommand.ts

@@ -5,16 +5,20 @@ import { logger } from '../shared'
 
 export async function updateCakeBakeryCommand(extensionPath: string) {
     // Install Cake Bakery
-    var result = await forceInstallBakery(extensionPath);
-    if (result) {
-        commands.executeCommand('o.restart');
-        window.showInformationMessage(
-            'Intellisense support (Cake.Bakery) for Cake files was installed.'
-        );
-    } else {
-        window.showErrorMessage(
-            'Error downloading intellisense support (Cake.Bakery) for Cake files.'
-        );
+    try {
+        var result = await forceInstallBakery(extensionPath);
+        if (result) {
+            commands.executeCommand('o.restart');
+            window.showInformationMessage(
+                'Intellisense support (Cake.Bakery) for Cake files was installed.'
+            );
+        } else {
+            window.showErrorMessage(
+                'Error downloading intellisense support (Cake.Bakery) for Cake files.'
+            );
+        }
+    } catch (e: unknown) {
+        logger.logError("Intellisense support (Cake.Bakery) for Cake files NOT installed!\r\n> "+e, false)
     }
 }