Skip to content

Commit f0d88b6

Browse files
jriekenjrieken
committed
debt - move ParameterHintsRegistry
1 parent 102ce1c commit f0d88b6

6 files changed

Lines changed: 9 additions & 12 deletions

File tree

‎src/vs/editor/common/modes.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,4 +764,6 @@ export const ReferenceSearchRegistry = new LanguageFeatureRegistry<IReferenceSup
764764

765765
export const RenameRegistry = new LanguageFeatureRegistry<IRenameSupport>('renameSupport');
766766

767-
export var SuggestRegistry = new LanguageFeatureRegistry<ISuggestSupport>('suggestSupport');
767+
export const SuggestRegistry = new LanguageFeatureRegistry<ISuggestSupport>('suggestSupport');
768+
769+
export const ParameterHintsRegistry = new LanguageFeatureRegistry<IParameterHintsSupport>('parameterHintsSupport');

‎src/vs/editor/contrib/parameterHints/browser/parameterHints.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution} fro
1313
import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
1414
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
1515
import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
16-
import {ParameterHintsRegistry} from '../common/parameterHints';
16+
import {ParameterHintsRegistry} from 'vs/editor/common/modes';
1717
import {ParameterHintsModel} from './parameterHintsModel';
1818
import {ParameterHintsWidget} from './parameterHintsWidget';
1919

‎src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {EventEmitter, IEventEmitter, ListenerCallback} from 'vs/base/common/even
1010
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
1111
import {TPromise} from 'vs/base/common/winjs.base';
1212
import {EventType, ICommonCodeEditor, ICursorSelectionChangedEvent, IModeSupportChangedEvent} from 'vs/editor/common/editorCommon';
13-
import {IParameterHints} from 'vs/editor/common/modes';
14-
import {ParameterHintsRegistry, getParameterHints} from '../common/parameterHints';
13+
import {ParameterHintsRegistry, IParameterHints} from 'vs/editor/common/modes';
14+
import {getParameterHints} from '../common/parameterHints';
1515

1616
export interface IHintEvent {
1717
hints: IParameterHints;

‎src/vs/editor/contrib/parameterHints/common/parameterHints.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ import {illegalArgument} from 'vs/base/common/errors';
99
import {TPromise} from 'vs/base/common/winjs.base';
1010
import {IModel, IPosition} from 'vs/editor/common/editorCommon';
1111
import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
12-
import {IParameterHints, IParameterHintsSupport} from 'vs/editor/common/modes';
13-
import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
14-
15-
export const ParameterHintsRegistry = new LanguageFeatureRegistry<IParameterHintsSupport>('parameterHintsSupport');
12+
import {IParameterHints, ParameterHintsRegistry} from 'vs/editor/common/modes';
1613

1714
export function getParameterHints(model:IModel, position:IPosition, triggerCharacter: string): TPromise<IParameterHints> {
1815

‎src/vs/languages/typescript/common/languageFeatures.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import * as modes from 'vs/editor/common/modes';
1313
import matches from 'vs/editor/common/modes/languageSelector';
1414
import {IMarkerService, IMarkerData} from 'vs/platform/markers/common/markers';
1515
import {IModelService} from 'vs/editor/common/services/modelService';
16-
import {ParameterHintsRegistry} from 'vs/editor/contrib/parameterHints/common/parameterHints';
1716
import {OccurrencesRegistry} from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';
1817
import {ExtraInfoRegistry} from 'vs/editor/contrib/hover/common/hover';
1918
import {DeclarationRegistry} from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration';
@@ -27,7 +26,7 @@ export function register(modelService: IModelService, markerService: IMarkerServ
2726

2827
const disposables: lifecycle.IDisposable[] = [];
2928
disposables.push(modes.SuggestRegistry.register(selector, new SuggestAdapter(modelService, worker)));
30-
disposables.push(ParameterHintsRegistry.register(selector, new ParameterHintsAdapter(modelService, worker)));
29+
disposables.push(modes.ParameterHintsRegistry.register(selector, new ParameterHintsAdapter(modelService, worker)));
3130
disposables.push(ExtraInfoRegistry.register(selector, new QuickInfoAdapter(modelService, worker)));
3231
disposables.push(OccurrencesRegistry.register(selector, new OccurrencesAdapter(modelService, worker)));
3332
disposables.push(DeclarationRegistry.register(selector, new DeclarationAdapter(modelService, worker)));

‎src/vs/workbench/api/node/extHostLanguageFeatures.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {OutlineRegistry, IOutlineEntry, IOutlineSupport} from 'vs/editor/contrib
2424
import {NavigateTypesSupportRegistry, INavigateTypesSupport, ITypeBearing} from 'vs/workbench/parts/search/common/search';
2525
import {FormatRegistry, FormatOnTypeRegistry} from 'vs/editor/contrib/format/common/format';
2626
import {CodeLensRegistry} from 'vs/editor/contrib/codelens/common/codelens';
27-
import {ParameterHintsRegistry} from 'vs/editor/contrib/parameterHints/common/parameterHints';
2827
import {asWinJsPromise, ShallowCancelThenPromise} from 'vs/base/common/async';
2928

3029
// --- adapter
@@ -1044,7 +1043,7 @@ export class MainThreadLanguageFeatures {
10441043
// --- parameter hints
10451044

10461045
$registerParameterHintsSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacter: string[]): TPromise<any> {
1047-
this._registrations[handle] = ParameterHintsRegistry.register(selector, <modes.IParameterHintsSupport>{
1046+
this._registrations[handle] = modes.ParameterHintsRegistry.register(selector, <modes.IParameterHintsSupport>{
10481047
getParameterHints: (resource: URI, position: IPosition, triggerCharacter?: string): TPromise<modes.IParameterHints> => {
10491048
return this._proxy.$getParameterHints(handle, resource, position, triggerCharacter);
10501049
},

0 commit comments

Comments
 (0)