Fix merge conflict with master

Author: Kapil Borle

src/features/CodeActions.ts

@@ -0,0 +1,37 @@
+import vscode = require('vscode');
+import { LanguageClient, RequestType, NotificationType } from 'vscode-languageclient';
+import Window = vscode.window;
+import { IFeature } from '../feature';
+
+export class CodeActionsFeature implements IFeature {
+    private command: vscode.Disposable;
+    private languageClient: LanguageClient;
+
+    constructor() {
+        this.command = vscode.commands.registerCommand('PowerShell.ApplyCodeActionEdits', (edit: any) => {
+            var editor = Window.activeTextEditor;
+            var filePath = editor.document.fileName;
+            var workspaceEdit = new vscode.WorkspaceEdit();
+            workspaceEdit.set(
+                vscode.Uri.file(filePath),
+                [
+                    new vscode.TextEdit(
+                        new vscode.Range(
+                            edit.StartLineNumber - 1,
+                            edit.StartColumnNumber - 1,
+                            edit.EndLineNumber - 1,
+                            edit.EndColumnNumber - 1),
+                        edit.Text)
+                ]);
+            vscode.workspace.applyEdit(workspaceEdit);
+        });
+    }
+
+    public setLanguageClient(languageclient: LanguageClient) {
+        this.languageClient = languageclient;
+    }
+
+    public dispose() {
+        this.command.dispose();
+    }
+}

src/main.ts

@@ -5,7 +5,6 @@
 'use strict';
 
 import vscode = require('vscode');
-
 import { Logger, LogLevel } from './logging';
 import { IFeature } from './feature';
 import { SessionManager } from './session';
@@ -17,6 +16,7 @@ import { ShowHelpFeature } from './features/ShowOnlineHelp';
 import { FindModuleFeature } from './features/PowerShellFindModule';
 import { ExtensionCommandsFeature } from './features/ExtensionCommands';
 import { SelectPSSARulesFeature } from './features/SelectPSSARules';
+import { CodeActionsFeature } from './features/CodeActions';
 
 // NOTE: We will need to find a better way to deal with the required
 //       PS Editor Services version...
@@ -77,7 +77,8 @@ export function activate(context: vscode.ExtensionContext): void {
         new ShowHelpFeature(),
         new FindModuleFeature(),
         new ExtensionCommandsFeature(),
-        new SelectPSSARulesFeature()
+        new SelectPSSARulesFeature(),
+        new CodeActionsFeature()
     ];
 
     sessionManager =