Merge pull request #41 from PowerShell/dfinke/expandAlias

Add "Expand Alias" command

Author: daviwil

package.json

@@ -38,19 +38,29 @@
 		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./"
     },
 	"contributes": {
-		"keybindings": [
+		"keybindings": [			
 			{
 				"command": "PowerShell.OnlineHelp",
 				"key": "ctrl+f1",
 				"when": "editorTextFocus && editorLangId == 'powershell'"
 			},
+			{
+				"command": "PowerShell.ExpandAlias",
+				"key": "ctrl+f5",
+				"when": "editorTextFocus && editorLangId == 'powershell'"
+			},
 			{
 				"command": "PowerShell.RunSelection",
 				"key": "f8",
 				"when": "editorTextFocus && editorLangId == 'powershell'"
 			}
 		],
-		"commands": [
+		"commands": [			
+			{
+				"command": "PowerShell.ExpandAlias",
+				"title": "Expand Alias",
+				"category": "PowerShell"
+			},		
 			{
 				"command": "PowerShell.OnlineHelp",
 				"title": "Get online help for command",

src/features/ExpandAlias.ts

@@ -0,0 +1,38 @@
+import vscode = require('vscode');
+import { LanguageClient } from 'vscode-languageclient';
+import { RequestType, NotificationType, ResponseError } from 'vscode-jsonrpc';
+import Window = vscode.window;
+
+export namespace ExpandAliasRequest {
+	export const type: RequestType<string, any, void> = { get method() { return 'powerShell/expandAlias'; } };
+}
+
+export function registerExpandAliasCommand(client: LanguageClient): void {
+    var disposable = vscode.commands.registerCommand('PowerShell.ExpandAlias', () => {
+
+		var editor    = Window.activeTextEditor;
+		var document  = editor.document;		
+		var selection = editor.selection;	
+		var text, range;
+		
+		var sls = selection.start;
+		var sle = selection.end; 
+		
+		if(
+			(sls.character === sle.character ) &&
+			(sls.line === sle.line)
+		) {
+			text  = document.getText();		
+			range = new vscode.Range(0, 0, document.lineCount, text.length);		
+		} else {
+			text  = document.getText(selection);		
+			range = new vscode.Range(sls.line, sls.character, sle.line, sle.character);		
+		}
+						
+		client.sendRequest(ExpandAliasRequest.type, text).then((result) => {		
+			editor.edit((editBuilder) => {				
+				editBuilder.replace(range, result);
+			});
+		});	
+    });
+}

src/main.ts

@@ -10,6 +10,7 @@ import settingsManager = require('./settings');
 import { LanguageClient, LanguageClientOptions, Executable } from 'vscode-languageclient';
 
 import { RequestType, NotificationType, ResponseError } from 'vscode-jsonrpc';
+import { registerExpandAliasCommand } from './features/ExpandAlias';
 import { registerShowHelpCommand } from './features/ShowOnlineHelp';
 import { registerConsoleCommands } from './features/Console';
 
@@ -95,6 +96,7 @@ export function activate(context: vscode.ExtensionContext): void {
     client.start();
 
 	// Register other features
+	registerExpandAliasCommand(client);
 	registerShowHelpCommand(client);
 	registerConsoleCommands(client);
 }