From f0d88b60dca22dde4b12c1b5a53d803fe2d617f2 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 13 Apr 2016 18:08:20 +0200 Subject: [PATCH] debt - move ParameterHintsRegistry --- src/vs/editor/common/modes.ts | 4 +++- .../editor/contrib/parameterHints/browser/parameterHints.ts | 2 +- .../contrib/parameterHints/browser/parameterHintsModel.ts | 4 ++-- .../editor/contrib/parameterHints/common/parameterHints.ts | 5 +---- src/vs/languages/typescript/common/languageFeatures.ts | 3 +-- src/vs/workbench/api/node/extHostLanguageFeatures.ts | 3 +-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 60c32eb4640..36badf8076b 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -764,4 +764,6 @@ export const ReferenceSearchRegistry = new LanguageFeatureRegistry('renameSupport'); -export var SuggestRegistry = new LanguageFeatureRegistry('suggestSupport'); +export const SuggestRegistry = new LanguageFeatureRegistry('suggestSupport'); + +export const ParameterHintsRegistry = new LanguageFeatureRegistry('parameterHintsSupport'); diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts index 8499b9d80ce..aa48cd10c10 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts @@ -13,7 +13,7 @@ import {ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution} fro import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; -import {ParameterHintsRegistry} from '../common/parameterHints'; +import {ParameterHintsRegistry} from 'vs/editor/common/modes'; import {ParameterHintsModel} from './parameterHintsModel'; import {ParameterHintsWidget} from './parameterHintsWidget'; diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts index 378e623634a..3a6c3b7f908 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts @@ -10,8 +10,8 @@ import {EventEmitter, IEventEmitter, ListenerCallback} from 'vs/base/common/even import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; import {EventType, ICommonCodeEditor, ICursorSelectionChangedEvent, IModeSupportChangedEvent} from 'vs/editor/common/editorCommon'; -import {IParameterHints} from 'vs/editor/common/modes'; -import {ParameterHintsRegistry, getParameterHints} from '../common/parameterHints'; +import {ParameterHintsRegistry, IParameterHints} from 'vs/editor/common/modes'; +import {getParameterHints} from '../common/parameterHints'; export interface IHintEvent { hints: IParameterHints; diff --git a/src/vs/editor/contrib/parameterHints/common/parameterHints.ts b/src/vs/editor/contrib/parameterHints/common/parameterHints.ts index a973cce9a94..167eca90413 100644 --- a/src/vs/editor/contrib/parameterHints/common/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/common/parameterHints.ts @@ -9,10 +9,7 @@ import {illegalArgument} from 'vs/base/common/errors'; import {TPromise} from 'vs/base/common/winjs.base'; import {IModel, IPosition} from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; -import {IParameterHints, IParameterHintsSupport} from 'vs/editor/common/modes'; -import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry'; - -export const ParameterHintsRegistry = new LanguageFeatureRegistry('parameterHintsSupport'); +import {IParameterHints, ParameterHintsRegistry} from 'vs/editor/common/modes'; export function getParameterHints(model:IModel, position:IPosition, triggerCharacter: string): TPromise { diff --git a/src/vs/languages/typescript/common/languageFeatures.ts b/src/vs/languages/typescript/common/languageFeatures.ts index b635f7255c3..826bd032870 100644 --- a/src/vs/languages/typescript/common/languageFeatures.ts +++ b/src/vs/languages/typescript/common/languageFeatures.ts @@ -13,7 +13,6 @@ import * as modes from 'vs/editor/common/modes'; import matches from 'vs/editor/common/modes/languageSelector'; import {IMarkerService, IMarkerData} from 'vs/platform/markers/common/markers'; import {IModelService} from 'vs/editor/common/services/modelService'; -import {ParameterHintsRegistry} from 'vs/editor/contrib/parameterHints/common/parameterHints'; import {OccurrencesRegistry} from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; import {ExtraInfoRegistry} from 'vs/editor/contrib/hover/common/hover'; import {DeclarationRegistry} from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration'; @@ -27,7 +26,7 @@ export function register(modelService: IModelService, markerService: IMarkerServ const disposables: lifecycle.IDisposable[] = []; disposables.push(modes.SuggestRegistry.register(selector, new SuggestAdapter(modelService, worker))); - disposables.push(ParameterHintsRegistry.register(selector, new ParameterHintsAdapter(modelService, worker))); + disposables.push(modes.ParameterHintsRegistry.register(selector, new ParameterHintsAdapter(modelService, worker))); disposables.push(ExtraInfoRegistry.register(selector, new QuickInfoAdapter(modelService, worker))); disposables.push(OccurrencesRegistry.register(selector, new OccurrencesAdapter(modelService, worker))); disposables.push(DeclarationRegistry.register(selector, new DeclarationAdapter(modelService, worker))); diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 4e49af33477..789a441c760 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -24,7 +24,6 @@ import {OutlineRegistry, IOutlineEntry, IOutlineSupport} from 'vs/editor/contrib import {NavigateTypesSupportRegistry, INavigateTypesSupport, ITypeBearing} from 'vs/workbench/parts/search/common/search'; import {FormatRegistry, FormatOnTypeRegistry} from 'vs/editor/contrib/format/common/format'; import {CodeLensRegistry} from 'vs/editor/contrib/codelens/common/codelens'; -import {ParameterHintsRegistry} from 'vs/editor/contrib/parameterHints/common/parameterHints'; import {asWinJsPromise, ShallowCancelThenPromise} from 'vs/base/common/async'; // --- adapter @@ -1044,7 +1043,7 @@ export class MainThreadLanguageFeatures { // --- parameter hints $registerParameterHintsSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacter: string[]): TPromise { - this._registrations[handle] = ParameterHintsRegistry.register(selector, { + this._registrations[handle] = modes.ParameterHintsRegistry.register(selector, { getParameterHints: (resource: URI, position: IPosition, triggerCharacter?: string): TPromise => { return this._proxy.$getParameterHints(handle, resource, position, triggerCharacter); }, -- GitLab