Bug-fix: Extension won't load, after changes for #18, if no configura…

…tion was specified (restore configuration defaults).
tintoy · Oct 7, 2017 · b49a529 · b49a529
1 parent 9bccc90
commit b49a529
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.2.10
+
+* Bug-fix: Extension won't load, after changes for tintoy/msbuild-project-tools-vscode#18, if no configuration was specified (restore configuration defaults).
+
 ## v0.2.9
 
 * Add command (`NuGet: toggle pre-release`) to toggle NuGet pre-release packages and package versions on / off (tintoy/msbuild-project-tools-vscode#18).

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "msbuild-project-tools",
     "displayName": "MSBuild project tools",
     "description": "Tools for working with MSBuild project files (such as auto-complete for package Ids / versions).",
-    "version": "0.2.9",
+    "version": "0.2.10",
     "publisher": "tintoy",
     "license": "MIT",
     "repository": {
@@ -48,12 +48,24 @@
                 "msbuildProjectTools": {
                     "type": "object",
                     "description": "Configuration for MSBuild project tools.",
-                    "default": { },
+                    "default": {
+                        "language": {
+                            "enable": true,
+                            "disableHover": false,
+                            "logLevel": "Information",
+                            "trace": false
+                        },
+                        "nuget": {
+                            "newestVersionsFirst": true,
+                            "includePreRelease": true,
+                            "disablePrefetch": false
+                        }
+                    },
                     "properties": {
                         "language": {
                             "description": "Configuration for the MSBuild language service.",
                             "type": "object",
-                            "default": { },
+                            "default": {},
                             "properties": {
                                 "enable": {
                                     "title": "Enable language service?",
@@ -88,7 +100,7 @@
                                 },
                                 "seqLogging": {
                                     "type": "object",
-                                    "default": { },
+                                    "default": {},
                                     "description": "Configure the MSBuild language service to log to Seq (https://getseq.net/). This is only useful if you're hacking on the language service itself.",
                                     "properties": {
                                         "url": {
@@ -153,7 +165,7 @@
                         "nuget": {
                             "description": "Configuration for the MSBuild language service.",
                             "type": "object",
-                            "default": { },
+                            "default": {},
                             "properties": {
                                 "newestVersionsFirst": {
                                     "type": "boolean",
@@ -176,7 +188,8 @@
                 }
             }
         },
-        "snippets": [{
+        "snippets": [
+            {
                 "language": "msbuild",
                 "path": "./snippets/msbuild-project.json"
             },
@@ -185,7 +198,8 @@
                 "path": "./snippets/msbuild-project.json"
             }
         ],
-        "grammars": [{
+        "grammars": [
+            {
                 "scopeName": "text.xml.msbuild.expression",
                 "injectTo": [
                     "text.xml.msbuild"
@@ -198,18 +212,20 @@
                 "path": "./syntaxes/msbuild.json"
             }
         ],
-        "languages": [{
-            "id": "msbuild",
-            "aliases": [
-                "MSBuild"
-            ],
-            "extensions": [
-                "csproj",
-                "props",
-                "targets"
-            ],
-            "configuration": "./language-configuration.json"
-        }]
+        "languages": [
+            {
+                "id": "msbuild",
+                "aliases": [
+                    "MSBuild"
+                ],
+                "extensions": [
+                    "csproj",
+                    "props",
+                    "targets"
+                ],
+                "configuration": "./language-configuration.json"
+            }
+        ]
     },
     "scripts": {
         "vscode:prepublish": "tsc -p ./",
@@ -240,4 +256,4 @@
         "which": "^1.3.0",
         "xmldom": "^0.1.27"
     }
-}
+}
diff --git a/src/extension/commands.ts b/src/extension/commands.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { Settings } from './settings';
+import { Settings, NuGetSettings } from './settings';
 
 let extensionContext: vscode.ExtensionContext;
 let extensionStatusBarItem: vscode.StatusBarItem;
@@ -25,6 +25,8 @@ export function registerCommands(context: vscode.ExtensionContext, statusBarItem
 async function toggleNuGetPreRelease(): Promise<void> {
     const configuration = vscode.workspace.getConfiguration();
     const settings = configuration.get<Settings>('msbuildProjectTools');
+    settings.nuget = settings.nuget || <NuGetSettings>{};
+
     settings.nuget.includePreRelease = !settings.nuget.includePreRelease;
 
     await configuration.update('msbuildProjectTools', settings);

diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -93,7 +93,7 @@ async function loadConfiguration(): Promise<void> {
 
     configuration = workspaceConfiguration.get<Settings>('msbuildProjectTools');
     featureFlags.clear();
-    if (configuration.language.experimentalFeatures)
+    if (configuration.language && configuration.language.experimentalFeatures)
     {
         configuration.language.experimentalFeatures.forEach(
             featureFlag => featureFlags.add(featureFlag)