move codelense to /browser/-layer

src/vs/editor/browser/editor.all.ts

@@ -14,7 +14,7 @@ import 'vs/css!vs/editor/contrib/bracketMatching/browser/bracketMatching';
 import 'vs/editor/contrib/caretOperations/common/caretOperations';
 import 'vs/editor/contrib/caretOperations/common/transpose';
 import 'vs/editor/contrib/clipboard/browser/clipboard';
-import 'vs/editor/contrib/codelens/browser/codelens';
+import 'vs/editor/contrib/codelens/browser/codelensController';
 import 'vs/editor/contrib/comment/common/comment';
 import 'vs/editor/contrib/contextmenu/browser/contextmenu';
 import 'vs/editor/contrib/cursorUndo/browser/cursorUndo';

src/vs/editor/contrib/codelens/common/codelens.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, onUnexpectedExternalError } from 'vs/base/common/errors';
-import { stableSort } from 'vs/base/common/arrays';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IModel } from 'vs/editor/common/editorCommon';
-import { CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions';
-import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { asWinJsPromise } from 'vs/base/common/async';
-
-export interface ICodeLensData {
-	symbol: ICodeLensSymbol;
-	provider: CodeLensProvider;
-}
-
-export function getCodeLensData(model: IModel): TPromise<ICodeLensData[]> {
-
-	const symbols: ICodeLensData[] = [];
-	const provider = CodeLensProviderRegistry.ordered(model);
-
-	const promises = provider.map(provider => asWinJsPromise(token => provider.provideCodeLenses(model, token)).then(result => {
-		if (Array.isArray(result)) {
-			for (let symbol of result) {
-				symbols.push({ symbol, provider });
-			}
-		}
-	}, onUnexpectedExternalError));
-
-	return TPromise.join(promises).then(() => {
-
-		return stableSort(symbols, (a, b) => {
-			// sort by lineNumber, provider-rank, and column
-			if (a.symbol.range.startLineNumber < b.symbol.range.startLineNumber) {
-				return -1;
-			} else if (a.symbol.range.startLineNumber > b.symbol.range.startLineNumber) {
-				return 1;
-			} else if (provider.indexOf(a.provider) < provider.indexOf(b.provider)) {
-				return -1;
-			} else if (provider.indexOf(a.provider) > provider.indexOf(b.provider)) {
-				return 1;
-			} else if (a.symbol.range.startColumn < b.symbol.range.startColumn) {
-				return -1;
-			} else if (a.symbol.range.startColumn > b.symbol.range.startColumn) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	});
-}
-
-CommonEditorRegistry.registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
-
-	const { resource } = args;
-	if (!(resource instanceof URI)) {
-		throw illegalArgument();
-	}
-
-	const model = accessor.get(IModelService).getModel(resource);
-	if (!model) {
-		throw illegalArgument();
-	}
-
-	return getCodeLensData(model);
-});

src/vs/workbench/api/node/extHostApiCommands.ts

@@ -16,7 +16,6 @@ import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { IOutline } from 'vs/editor/contrib/quickOpen/common/quickOpen';
 import { IWorkspaceSymbolProvider } from 'vs/workbench/parts/search/common/search';
-import { ICodeLensData } from 'vs/editor/contrib/codelens/common/codelens';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 
 export class ExtHostApiCommands {
@@ -409,12 +408,12 @@ export class ExtHostApiCommands {
 
 	private _executeCodeLensProvider(resource: URI): Thenable<vscode.CodeLens[]> {
 		const args = { resource };
-		return this._commands.executeCommand<ICodeLensData[]>('_executeCodeLensProvider', args).then(value => {
+		return this._commands.executeCommand<modes.ICodeLensSymbol[]>('_executeCodeLensProvider', args).then(value => {
 			if (Array.isArray(value)) {
 				return value.map(item => {
 					return new types.CodeLens(
-						typeConverters.toRange(item.symbol.range),
-						this._commands.converter.fromInternal(item.symbol.command));
+						typeConverters.toRange(item.range),
+						this._commands.converter.fromInternal(item.command));
 				});
 			}
 			return undefined;

src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts

@@ -27,7 +27,7 @@ import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen';
 import { DocumentSymbolProviderRegistry, DocumentHighlightKind } from 'vs/editor/common/modes';
-import { getCodeLensData } from 'vs/editor/contrib/codelens/common/codelens';
+import { getCodeLensData } from 'vs/editor/contrib/codelens/browser/codelens';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from 'vs/editor/contrib/goToDeclaration/browser/goToDeclaration';
 import { getHover } from 'vs/editor/contrib/hover/common/hover';
 import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';