use IOpenerService for hovers

tzuhsiulin · Apr 14, 2016 · a3f49d3 · a3f49d3
1 parent 6350d1a
commit a3f49d3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts
@@ -12,8 +12,8 @@ import {KeyCode, KeyMod} from 'vs/base/common/keyCodes';
 import * as platform from 'vs/base/common/platform';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent';
-import {IEditorService} from 'vs/platform/editor/common/editor';
-import {IKeybindingService, KbExpr} from 'vs/platform/keybinding/common/keybindingService';
+import {IOpenerService} from 'vs/platform/opener/common/opener';
+import {KbExpr} from 'vs/platform/keybinding/common/keybindingService';
 import {Range} from 'vs/editor/common/core/range';
 import {EditorAction} from 'vs/editor/common/editorAction';
 import {Behaviour} from 'vs/editor/common/editorActionEnablement';
@@ -39,8 +39,7 @@ class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	constructor(editor: ICodeEditor,
-		@IEditorService editorService: IEditorService,
-		@IKeybindingService keybindingService: IKeybindingService
+		@IOpenerService openerService: IOpenerService
 	) {
 		this._editor = editor;
 
@@ -55,7 +54,7 @@ class ModesHoverController implements editorCommon.IEditorContribution {
 			this._toUnhook.push(this._editor.addListener(editorCommon.EventType.ModelDecorationsChanged, () => this._onModelDecorationsChanged()));
 			this._toUnhook.push(this._editor.addListener('scroll', () => this._hideWidgets()));
 
-			this._contentWidget = new ModesContentHoverWidget(editor, editorService, keybindingService);
+			this._contentWidget = new ModesContentHoverWidget(editor, openerService);
 			this._glyphWidget = new ModesGlyphHoverWidget(editor);
 		}
 	}

diff --git a/src/vs/editor/contrib/hover/browser/modesContentHover.ts b/src/vs/editor/contrib/hover/browser/modesContentHover.ts
@@ -9,9 +9,7 @@ import * as nls from 'vs/nls';
 import URI from 'vs/base/common/uri';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {renderHtml} from 'vs/base/browser/htmlContentRenderer';
-import {IEditorService} from 'vs/platform/editor/common/editor';
-import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
-import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
+import {IOpenerService, NullOpenerService} from 'vs/platform/opener/common/opener';
 import {Range} from 'vs/editor/common/core/range';
 import {IEditorRange, IRange} from 'vs/editor/common/editorCommon';
 import {ExtraInfoRegistry, IComputeExtraInfoResult, IMode} from 'vs/editor/common/modes';
@@ -123,18 +121,16 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 	private _hoverOperation: HoverOperation<IComputeExtraInfoResult[]>;
 	private _highlightDecorations:string[];
 	private _isChangingDecorations: boolean;
-	private _editorService: IEditorService;
-	private _keybindingService: IKeybindingService;
+	private _openerService: IOpenerService;
 	private _shouldFocus: boolean;
 
-	constructor(editor: ICodeEditor, editorService: IEditorService, keybindingService: IKeybindingService) {
+	constructor(editor: ICodeEditor, openerService: IOpenerService) {
 		super(ModesContentHoverWidget.ID, editor);
 
 		this._computer = new ModesContentComputer(this._editor);
 		this._highlightDecorations = [];
 		this._isChangingDecorations = false;
-		this._editorService = editorService;
-		this._keybindingService = keybindingService;
+		this._openerService = openerService || NullOpenerService;
 
 		this._hoverOperation = new HoverOperation(
 			this._computer,
@@ -246,21 +242,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 				msg.htmlContent.forEach((content) => {
 					container.appendChild(renderHtml(content, {
 						actionCallback: (content) => {
-
-							let promise: TPromise<any>;
-							if (KeybindingsRegistry.getCommands()[content]) {
-								promise = this._keybindingService.executeCommand(content);
-							} else {
-								try {
-									let resource = URI.parse(content);
-									promise = this._editorService.openEditor({resource});
-								} catch (e) {
-									// ignore
-								}
-							}
-							if (promise) {
-								promise.then(undefined, err => console.log(err));
-							}
+							this._openerService.open(URI.parse(content));
 						},
 						codeBlockRenderer: (modeId, value) => {
 							let mode: IMode;

diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts
@@ -23,3 +23,8 @@ export interface IOpenerService {
 	 */
 	open(resource: URI): TPromise<any>;
 }
+
+export const NullOpenerService: IOpenerService = Object.freeze({
+	serviceId: undefined,
+	open() { return TPromise.as(undefined);}
+});