Rename expression -> Edit expression, fix microsoft#14127

roblourens · roblourens · commit 9e7eaaa35f08 · 2016-10-24T11:06:34.000-07:00
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -773,12 +773,12 @@ export class AddToWatchExpressionsAction extends AbstractDebugAction {
 	}
 }
 
-export class RenameWatchExpressionAction extends AbstractDebugAction {
-	static ID = 'workbench.debug.viewlet.action.renameWatchExpression';
-	static LABEL = nls.localize('renameWatchExpression', "Rename Expression");
+export class EditWatchExpressionAction extends AbstractDebugAction {
+	static ID = 'workbench.debug.viewlet.action.editWatchExpression';
+	static LABEL = nls.localize('editWatchExpression', "Edit Expression");
 
 	constructor(id: string, label: string, private expression: model.Expression, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action rename', debugService, keybindingService);
+		super(id, label, 'debug-action editWatchExpression', debugService, keybindingService);
 	}
 
 	public run(): TPromise<any> {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
@@ -783,7 +783,7 @@ export class WatchExpressionsActionProvider implements renderer.IActionProvider
 		if (element instanceof model.Expression) {
 			const expression = <model.Expression>element;
 			actions.push(this.instantiationService.createInstance(debugactions.AddWatchExpressionAction, debugactions.AddWatchExpressionAction.ID, debugactions.AddWatchExpressionAction.LABEL));
-			actions.push(this.instantiationService.createInstance(debugactions.RenameWatchExpressionAction, debugactions.RenameWatchExpressionAction.ID, debugactions.RenameWatchExpressionAction.LABEL, expression));
+			actions.push(this.instantiationService.createInstance(debugactions.EditWatchExpressionAction, debugactions.EditWatchExpressionAction.ID, debugactions.EditWatchExpressionAction.LABEL, expression));
 			if (expression.reference === 0) {
 				actions.push(this.instantiationService.createInstance(CopyValueAction, CopyValueAction.ID, CopyValueAction.LABEL, expression.value));
 			}

Original file line number	Diff line number	Diff line change
`@@ -773,12 +773,12 @@ export class AddToWatchExpressionsAction extends AbstractDebugAction {`
`773`	`773`	`}`
`774`	`774`	`}`
`775`	`775`
`776`		`-export class RenameWatchExpressionAction extends AbstractDebugAction {`
`777`		`- static ID = 'workbench.debug.viewlet.action.renameWatchExpression';`
`778`		`- static LABEL = nls.localize('renameWatchExpression', "Rename Expression");`
	`776`	`+export class EditWatchExpressionAction extends AbstractDebugAction {`
	`777`	`+ static ID = 'workbench.debug.viewlet.action.editWatchExpression';`
	`778`	`+ static LABEL = nls.localize('editWatchExpression', "Edit Expression");`
`779`	`779`
`780`	`780`	`constructor(id: string, label: string, private expression: model.Expression, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {`
`781`		`- super(id, label, 'debug-action rename', debugService, keybindingService);`
	`781`	`+ super(id, label, 'debug-action editWatchExpression', debugService, keybindingService);`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`public run(): TPromise<any> {`
Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ export class WatchExpressionsActionProvider implements renderer.IActionProvider`
`783`	`783`	`if (element instanceof model.Expression) {`
`784`	`784`	`const expression = <model.Expression>element;`
`785`	`785`	`actions.push(this.instantiationService.createInstance(debugactions.AddWatchExpressionAction, debugactions.AddWatchExpressionAction.ID, debugactions.AddWatchExpressionAction.LABEL));`
`786`		`- actions.push(this.instantiationService.createInstance(debugactions.RenameWatchExpressionAction, debugactions.RenameWatchExpressionAction.ID, debugactions.RenameWatchExpressionAction.LABEL, expression));`
	`786`	`+ actions.push(this.instantiationService.createInstance(debugactions.EditWatchExpressionAction, debugactions.EditWatchExpressionAction.ID, debugactions.EditWatchExpressionAction.LABEL, expression));`
`787`	`787`	`if (expression.reference === 0) {`
`788`	`788`	`actions.push(this.instantiationService.createInstance(CopyValueAction, CopyValueAction.ID, CopyValueAction.LABEL, expression.value));`
`789`	`789`	`}`