go to next / previosu breakpoint minor polish

isidorn · isidorn · commit b8a161294002 · 2018-05-28T16:22:47.000+02:00
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ServicesAccessor, registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';
+import { ServicesAccessor, registerEditorAction, EditorAction, IActionOptions } from 'vs/editor/browser/editorExtensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, IBreakpoint } from 'vs/workbench/parts/debug/common/debug';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -212,11 +212,11 @@ class ShowDebugHoverAction extends EditorAction {
 }
 
 class GoToBreakpointAction extends EditorAction {
-	constructor(private isNext, opts) {
+	constructor(private isNext: boolean, opts: IActionOptions) {
 		super(opts);
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | TPromise<void, any> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): TPromise<any> {
 		const debugService = accessor.get(IDebugService);
 		const editorService = accessor.get(IEditorService);
 		const currentUri = editor.getModel().uri;
@@ -244,8 +244,9 @@ class GoToBreakpointAction extends EditorAction {
 		}
 
 		if (moveBreakpoint) {
-			openBreakpointSource(moveBreakpoint, false, true, debugService, editorService);
+			return openBreakpointSource(moveBreakpoint, false, true, debugService, editorService);
 		}
+
 		return TPromise.as(null);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';`
`8`	`8`	`import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';`
`9`	`9`	`import { Range } from 'vs/editor/common/core/range';`
`10`	`10`	`import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';`
`11`		`-import { ServicesAccessor, registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';`
	`11`	`+import { ServicesAccessor, registerEditorAction, EditorAction, IActionOptions } from 'vs/editor/browser/editorExtensions';`
`12`	`12`	`import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';`
`13`	`13`	`import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, IBreakpoint } from 'vs/workbench/parts/debug/common/debug';`
`14`	`14`	`import { IPanelService } from 'vs/workbench/services/panel/common/panelService';`
`@@ -212,11 +212,11 @@ class ShowDebugHoverAction extends EditorAction {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`class GoToBreakpointAction extends EditorAction {`
`215`		`- constructor(private isNext, opts) {`
	`215`	`+ constructor(private isNext: boolean, opts: IActionOptions) {`
`216`	`216`	`super(opts);`
`217`	`217`	`}`
`218`	`218`
`219`		`- public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void \| TPromise<void, any> {`
	`219`	`+ public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): TPromise<any> {`
`220`	`220`	`const debugService = accessor.get(IDebugService);`
`221`	`221`	`const editorService = accessor.get(IEditorService);`
`222`	`222`	`const currentUri = editor.getModel().uri;`
`@@ -244,8 +244,9 @@ class GoToBreakpointAction extends EditorAction {`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`if (moveBreakpoint) {`
`247`		`- openBreakpointSource(moveBreakpoint, false, true, debugService, editorService);`
	`247`	`+ return openBreakpointSource(moveBreakpoint, false, true, debugService, editorService);`
`248`	`248`	`}`
	`249`	`+`
`249`	`250`	`return TPromise.as(null);`
`250`	`251`	`}`
`251`	`252`	`}`