Fix #11: Add script analysis settings

This change rearranges the current extension settings and adds a new one
that allows the user to turn off real-time script analysis.  The new
setting organization will make it easier to add new settings to these
areas in the future without having the user go rename their existing
settings.

Author: daviwil

package.json

@@ -13,7 +13,7 @@
 		"Debuggers",
 		"Linters"
 	],	
-	"icon": "images/PowerShell_icon.png",		
+	"icon": "images/PowerShell_icon.png",
 	"galleryBanner": {
 		"color": "#ACD1EC",
 		"theme": "light"
@@ -63,7 +63,7 @@
 				"language": "powershell",
 				"path": "./snippets/PowerShell.json"
 			}
-		],
+		],		
 		"debuggers": [
 			{
 				"type": "PowerShell",
@@ -75,20 +75,20 @@
 			"type": "object",
 			"title": "PowerShell Configuration",
 			"properties": {
-				"PowerShell.editorServicesHostPath": {
+				"powershell.scriptAnalysis.enable": {
+					"type": "boolean",
+					"default": true,
+					"description": "Enables real-time script analysis using PowerShell Script Analyzer."
+				},				
+				"powershell.developer.editorServicesHostPath": {
 					"type": "string",
 					"default": "../bin/Microsoft.PowerShell.EditorServices.Host.exe",
 					"description": "Specifies the path to the PowerShell Editor Services host executable."
 				},
-				"PowerShell.waitForDebugger": {
+				"powershell.developer.editorServicesWaitForDebugger": {
 					"type": "boolean",
 					"default": false,
 					"description": "Launches the language service with the /waitForDebugger flag to force it to wait for a .NET debugger to attach before proceeding."
-				},
-				"PowerShell.enableLogging": {
-					"type": "boolean",
-					"default": true,
-					"description": "Enables diagnostic logging for the extension."
 				}				
 			}
 		}

src/features/configuration.ts

@@ -6,15 +6,16 @@
 
 import path = require('path');
 import vscode = require('vscode');
-import configuration = require('./features/configuration');
+import settingsManager = require('./settings');
 import { LanguageClient, LanguageClientOptions, Executable } from 'vscode-languageclient';
 
 import { RequestType, NotificationType, ResponseError } from 'vscode-jsonrpc';
 import powerShellMessage = require('./features/ShowOnlineHelp');
 
 export function activate(context: vscode.ExtensionContext): void {
 
-	var PowerShellLanguageId = 'PowerShell';
+	var PowerShellLanguageId = 'powershell';
+	var settings = settingsManager.load('powershell');
 
     vscode.languages.setLanguageConfiguration(PowerShellLanguageId, 
 	{
@@ -59,10 +60,17 @@ export function activate(context: vscode.ExtensionContext): void {
 
 	});
 
-	let serverPath = resolveLanguageServerPath();
+	let args = [];
+	if (settings.developer.editorServicesWaitForDebugger)
+	{
+		args.push('/waitForDebugger');
+	}
+	
+	let serverPath = resolveLanguageServerPath(settings);
 	let serverOptions = {
 		run: { 
-			command: serverPath, 
+			command: serverPath,
+			args: args 
 		},
 		debug: { 
 			command: serverPath,
@@ -99,19 +107,18 @@ export function activate(context: vscode.ExtensionContext): void {
     });
 }
 
-function resolveLanguageServerPath() : string {
-	var config = configuration.load('PowerShell');
-	var editorServicesHostPath = config.editorServicesHostPath;
+function resolveLanguageServerPath(settings: settingsManager.ISettings) : string {
+	var editorServicesHostPath = settings.developer.editorServicesHostPath;
 
-	if (config.editorServicesHostPath)
+	if (editorServicesHostPath)
 	{	
 		console.log("Found Editor Services path from config: " + editorServicesHostPath);
 
 		// Make the path absolute if it's not
 		editorServicesHostPath =
 			path.resolve(
 				__dirname,
-				config.editorServicesHostPath);
+				editorServicesHostPath);
 
 		console.log("    Resolved path to: " + editorServicesHostPath);
 	}

src/main.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+
+'use strict';
+
+import vscode = require('vscode');
+
+export interface IScriptAnalysisSettings {
+	enable?: boolean
+}
+
+export interface IDeveloperSettings {
+	editorServicesHostPath?: string;
+	editorServicesWaitForDebugger?: boolean;
+}
+
+export interface ISettings {
+	scriptAnalysis?: IScriptAnalysisSettings,
+	developer?: IDeveloperSettings,	
+}
+
+export function load(myPluginId: string): ISettings {
+	let configuration = vscode.workspace.getConfiguration(myPluginId);
+	
+	let defaultScriptAnalysisSettings = {
+		enable: true
+	};
+	
+	let defaultDeveloperSettings = {
+		editorServicesHostPath: "../bin/Microsoft.PowerShell.EditorServices.Host.exe",
+		editorServicesWaitForDebugger: false
+	}
+	
+	return {
+		scriptAnalysis: configuration.get<IScriptAnalysisSettings>("scriptAnalysis", defaultScriptAnalysisSettings),
+		developer: configuration.get<IDeveloperSettings>("developer", defaultDeveloperSettings)
+	}
+}