add utility method for the 80% case, add doc highlights command

src/vs/editor/common/core/position.ts

@@ -54,7 +54,7 @@ export class Position implements EditorCommon.IEditorPosition {
 		return new Position(pos.lineNumber, pos.column);
 	}
 
-	public static isIPosition(obj: any): boolean {
+	public static isIPosition(obj: any): obj is EditorCommon.IPosition {
 		return (
 			obj
 			&& (typeof obj.lineNumber === 'number')

src/vs/editor/common/editorCommonExtensions.ts

@@ -5,10 +5,13 @@
 'use strict';
 
 import EditorCommon = require('vs/editor/common/editorCommon');
+import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
+import URI from 'vs/base/common/uri';
+import {Position} from 'vs/editor/common/core/position';
 import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
+import {IModelService} from 'vs/editor/common/services/modelService';
 import {Registry} from 'vs/platform/platform';
-import Errors = require('vs/base/common/errors');
 import {KeybindingsRegistry,ICommandDescriptor} from 'vs/platform/keybinding/common/keybindingsRegistry';
 import config = require('vs/editor/common/config/config');
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
@@ -84,6 +87,38 @@ export module CommonEditorRegistry {
 
 		KeybindingsRegistry.registerCommandDesc(commandDesc);
 	}
+
+	export function registerLanguageCommand(id: string, handler: (accessor: ServicesAccessor, args: { [n: string]: any }) => any) {
+		KeybindingsRegistry.registerCommandDesc({
+			id,
+			handler(accessor, args: any[]) {
+				if (args && args.length > 1 || typeof args[0] !== 'object') {
+					throw illegalArgument();
+				}
+				return handler(accessor, args && args[0]);
+			},
+			weight: KeybindingsRegistry.WEIGHT.editorContrib(),
+			primary: undefined,
+			context: undefined,
+		});
+	}
+
+	export function registerDefaultLanguageCommand(id: string, handler: (model: EditorCommon.IModel, position: EditorCommon.IPosition) => any) {
+		registerLanguageCommand(id, function(accessor, args) {
+
+			const {resource, position} = args;
+			if (!URI.isURI(resource) || !Position.isIPosition(position)) {
+				throw illegalArgument();
+			}
+
+			const model = accessor.get(IModelService).getModel(resource);
+			if (!model) {
+				throw illegalArgument();
+			}
+
+			return handler(model, position);
+		});
+	}
 }
 
 class SimpleEditorContributionDescriptor implements EditorCommon.ICommonEditorContributionDescriptor {
@@ -193,7 +228,7 @@ function triggerEditorActionGlobal(actionId: string, accessor: ServicesAccessor,
 		var action = activeEditor.getAction(actionId);
 		if (action) {
 			accessor.get(ITelemetryService).publicLog('editorActionInvoked', {name: action.label} );
-			action.run().done(null, Errors.onUnexpectedError);
+			action.run().done(null, onUnexpectedError);
 		}
 		return;
 	}

src/vs/editor/contrib/goToDeclaration/common/goToDeclaration.ts

@@ -7,13 +7,12 @@
 
 import URI from 'vs/base/common/uri';
 import {TPromise} from 'vs/base/common/winjs.base';
-import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
+import {onUnexpectedError} from 'vs/base/common/errors';
 import {IModel, IPosition} from 'vs/editor/common/editorCommon';
 import {IDeclarationSupport} from 'vs/editor/common/modes';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
 import {IReference} from 'vs/editor/common/modes';
-import {IModelService} from 'vs/editor/common/services/modelService';
-import {registerCommand} from 'vs/platform/keybinding/common/commandsUtils';
+import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 
 export const DeclarationRegistry = new LanguageFeatureRegistry<IDeclarationSupport>('declarationSupport');
 
@@ -44,17 +43,4 @@ export function getDeclarationsAtPosition(model: IModel, position: IPosition): T
 	});
 }
 
-registerCommand('_executeDefinitionProvider', function(accessor, args) {
-
-	let {resource, position} = args;
-	if (!URI.isURI(resource)) {
-		throw illegalArgument();
-	}
-
-	let model = accessor.get(IModelService).getModel(resource);
-	if (!model) {
-		throw illegalArgument(resource + ' not found');
-	}
-
-	return getDeclarationsAtPosition(model, position);
-});
\ No newline at end of file
+CommonEditorRegistry.registerDefaultLanguageCommand('_executeDefinitionProvider', getDeclarationsAtPosition)
\ No newline at end of file

src/vs/editor/contrib/hover/common/hover.ts

@@ -5,15 +5,13 @@
 
 'use strict';
 
-import URI from 'vs/base/common/uri';
 import {IExtraInfoSupport, IComputeExtraInfoResult} from 'vs/editor/common/modes';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {coalesce} from 'vs/base/common/arrays';
-import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
+import {onUnexpectedError} from 'vs/base/common/errors';
 import {IPosition, IModel} from 'vs/editor/common/editorCommon';
-import {IModelService} from 'vs/editor/common/services/modelService';
-import {registerCommand} from 'vs/platform/keybinding/common/commandsUtils';
+import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 
 export const ExtraInfoRegistry = new LanguageFeatureRegistry<IExtraInfoSupport>('extraInfoSupport');
 
@@ -41,16 +39,4 @@ export function getExtraInfoAtPosition(model: IModel, position: IPosition): TPro
 	return TPromise.join(promises).then(() => coalesce(values));
 }
 
-registerCommand('_executeHoverProvider', function(accessor, args) {
-
-	let {resource, position} = args;
-	if (!URI.isURI(resource)) {
-		throw illegalArgument();
-	}
-	let model = accessor.get(IModelService).getModel(resource);
-	if (!model) {
-		throw illegalArgument(resource + ' not found');
-	}
-
-	return getExtraInfoAtPosition(model, position);
-});
\ No newline at end of file
+CommonEditorRegistry.registerDefaultLanguageCommand('_executeHoverProvider', getExtraInfoAtPosition);
\ No newline at end of file

src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts

@@ -10,9 +10,10 @@ import * as EditorCommon from 'vs/editor/common/editorCommon';
 import {IOccurrencesSupport, IOccurence} from 'vs/editor/common/modes';
 import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {Range} from 'vs/editor/common/core/range';
-import {onUnexpectedError} from 'vs/base/common/errors';
+import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
 import {INullService} from 'vs/platform/instantiation/common/instantiation';
 import {sequence} from 'vs/base/common/async';
+import {IModelService} from 'vs/editor/common/services/modelService';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
 
 export const OccurrencesRegistry = new LanguageFeatureRegistry<IOccurrencesSupport>('occurrencesSupport');
@@ -44,6 +45,8 @@ export function getOccurrencesAtPosition(model: EditorCommon.IModel, position: E
 	});
 }
 
+CommonEditorRegistry.registerDefaultLanguageCommand('_executeDocumentHighlights', getOccurrencesAtPosition);
+
 class WordHighlighter {
 
 	private editor: EditorCommon.ICommonCodeEditor;

src/vs/platform/keybinding/common/commandsUtils.ts

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import {illegalArgument} from 'vs/base/common/errors';
-import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation';
-import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
-
-export function registerCommand(id: string, handler: (accessor: ServicesAccessor, args: { [n: string]: any }) => any) {
-
-	KeybindingsRegistry.registerCommandDesc({
-		id,
-		handler(accessor, args: any[]) {
-			if (args && args.length > 1 || typeof args[0] !== 'object') {
-				throw illegalArgument();
-			}
-
-			return handler(accessor, args && args[0]);
-		},
-		weight: KeybindingsRegistry.WEIGHT.editorContrib(),
-		primary: undefined,
-		context: undefined,
-	});
-}
\ No newline at end of file

src/vs/workbench/api/common/extHostLanguageFeatureCommands.ts

@@ -41,8 +41,8 @@ import {SuggestRegistry} from 'vs/editor/contrib/suggest/common/suggest';
 // vscode.executeWorkspaceSymbolProvider
 // vscode.executeDefinitionProvider
 // vscode.executeHoverProvider
-
 // vscode.executeDocumentHighlights
+
 // vscode.executeReferenceProvider
 // vscode.executeCodeActionProvider
 // vscode.executeCodeLensProvider
@@ -65,6 +65,7 @@ export class ExtHostLanguageFeatureCommands {
 		this._register('vscode.executeWorkspaceSymbolProvider', this._executeWorkspaceSymbolProvider);
 		this._register('vscode.executeDefinitionProvider', this._executeDefinitionProvider);
 		this._register('vscode.executeHoverProvider', this._executeHoverProvider);
+		this._register('vscode.executeDocumentHighlights', this._executeDocumentHighlights);
 	}
 
 	private _register(id: string, callback: (...args: any[]) => any): void {
@@ -104,4 +105,16 @@ export class ExtHostLanguageFeatureCommands {
 			}
 		});
 	}
+
+	private _executeDocumentHighlights(resource: URI, position: types.Position): Thenable<types.DocumentHighlight[]> {
+		const args = {
+			resource,
+			position: position && typeConverters.fromPosition(position)
+		};
+		return this._commands.executeCommand<modes.IOccurence[]>('_executeDocumentHighlights', args).then(value => {
+			if (Array.isArray(value)) {
+				return value.map(typeConverters.toDocumentHighlight)
+			}
+		});
+	}
 }
\ No newline at end of file

src/vs/workbench/api/common/pluginHostTypeConverters.ts

@@ -245,4 +245,9 @@ export function fromHover(hover: vscode.Hover): modes.IComputeExtraInfoResult {
 
 export function toHover(info: modes.IComputeExtraInfoResult): types.Hover {
 	return new types.Hover(info.htmlContent.map(toFormattedString), toRange(info.range));
+}
+
+export function toDocumentHighlight(occurrence: modes.IOccurence): types.DocumentHighlight {
+	return new types.DocumentHighlight(toRange(occurrence.range),
+		types.DocumentHighlightKind[occurrence.kind.charAt(0).toUpperCase() + occurrence.kind.substr(1)]);
 }
\ No newline at end of file

src/vs/workbench/parts/search/common/search.ts

@@ -9,9 +9,9 @@ import {TPromise} from 'vs/base/common/winjs.base';
 import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
 import {IDisposable} from 'vs/base/common/lifecycle';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
+import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {IRange} from 'vs/editor/common/editorCommon';
 import URI from 'vs/base/common/uri';
-import {registerCommand} from 'vs/platform/keybinding/common/commandsUtils';
 
 /**
  * Interface used to navigate to types by value.
@@ -75,7 +75,7 @@ export function getNavigateToItems(query: string): TPromise<ITypeBearing[]> {
 	});
 }
 
-registerCommand('_executeWorkspaceSymbolProvider', function(accessor, args: { query: string;}) {
+CommonEditorRegistry.registerLanguageCommand('_executeWorkspaceSymbolProvider', function(accessor, args: { query: string;}) {
 	let {query} = args;
 	if (typeof query !== 'string') {
 		throw illegalArgument();

src/vs/workbench/test/common/api/testThreadService.ts

@@ -24,7 +24,7 @@ export class TestThreadService extends NullThreadService {
 	private set _callCount(value:number) {
 		this._callCountValue = value;
 		if (this._callCountValue === 0) {
-			this._completeIdle();
+			this._completeIdle && this._completeIdle();
 			this._idle = undefined;
 		}
 	}