Skip to content

Commit fe24fd8

Browse files
sandy081sandy081
committed
rename
1 parent 074b3eb commit fe24fd8

25 files changed

Lines changed: 65 additions & 65 deletions

File tree

‎src/vs/editor/common/services/editorWorkerServiceImpl.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageCo
1717
import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
1818
import { IDiffComputationResult, IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
1919
import { IModelService } from 'vs/editor/common/services/modelService';
20-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
20+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
2121
import { regExpFlags } from 'vs/base/common/strings';
2222
import { isNonEmptyArray } from 'vs/base/common/arrays';
2323
import { ILogService } from 'vs/platform/log/common/log';
@@ -52,7 +52,7 @@ export class EditorWorkerServiceImpl extends Disposable implements IEditorWorker
5252
private readonly _logService: ILogService;
5353
constructor(
5454
@IModelService modelService: IModelService,
55-
@IResourceConfigurationService configurationService: IResourceConfigurationService,
55+
@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
5656
@ILogService logService: ILogService
5757
) {
5858
super();
@@ -129,14 +129,14 @@ export class EditorWorkerServiceImpl extends Disposable implements IEditorWorker
129129
class WordBasedCompletionItemProvider implements modes.CompletionItemProvider {
130130

131131
private readonly _workerManager: WorkerManager;
132-
private readonly _configurationService: IResourceConfigurationService;
132+
private readonly _configurationService: ITextResourceConfigurationService;
133133
private readonly _modelService: IModelService;
134134

135135
readonly _debugDisplayName = 'wordbasedCompletions';
136136

137137
constructor(
138138
workerManager: WorkerManager,
139-
configurationService: IResourceConfigurationService,
139+
configurationService: ITextResourceConfigurationService,
140140
modelService: IModelService
141141
) {
142142
this._workerManager = workerManager;

‎src/vs/editor/common/services/resourceConfiguration.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { IPosition } from 'vs/editor/common/core/position';
99
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
1010
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1111

12-
export const IResourceConfigurationService = createDecorator<IResourceConfigurationService>('resourceConfigurationService');
12+
export const ITextResourceConfigurationService = createDecorator<ITextResourceConfigurationService>('textResourceConfigurationService');
1313

14-
export interface IResourceConfigurationChangeEvent {
14+
export interface ITextResourceConfigurationChangeEvent {
1515

1616
/**
1717
* All affected keys. Also includes language overrides and keys changed under language overrides.
@@ -29,14 +29,14 @@ export interface IResourceConfigurationChangeEvent {
2929
affectsConfiguration(resource: URI, section: string): boolean;
3030
}
3131

32-
export interface IResourceConfigurationService {
32+
export interface ITextResourceConfigurationService {
3333

3434
_serviceBrand: undefined;
3535

3636
/**
3737
* Event that fires when the configuration changes.
3838
*/
39-
onDidChangeConfiguration: Event<IResourceConfigurationChangeEvent>;
39+
onDidChangeConfiguration: Event<ITextResourceConfigurationChangeEvent>;
4040

4141
/**
4242
* Fetches the value of the section for the given resource by applying language overrides.

‎src/vs/editor/common/services/resourceConfigurationImpl.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import { URI } from 'vs/base/common/uri';
99
import { IPosition, Position } from 'vs/editor/common/core/position';
1010
import { IModeService } from 'vs/editor/common/services/modeService';
1111
import { IModelService } from 'vs/editor/common/services/modelService';
12-
import { IResourceConfigurationService, IResourceConfigurationChangeEvent } from 'vs/editor/common/services/resourceConfiguration';
12+
import { ITextResourceConfigurationService, ITextResourceConfigurationChangeEvent } from 'vs/editor/common/services/resourceConfiguration';
1313
import { IConfigurationService, ConfigurationTarget, IConfigurationValue, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
1414

15-
export class TextResourceConfigurationService extends Disposable implements IResourceConfigurationService {
15+
export class TextResourceConfigurationService extends Disposable implements ITextResourceConfigurationService {
1616

1717
public _serviceBrand: undefined;
1818

19-
private readonly _onDidChangeConfiguration: Emitter<IResourceConfigurationChangeEvent> = this._register(new Emitter<IResourceConfigurationChangeEvent>());
20-
public readonly onDidChangeConfiguration: Event<IResourceConfigurationChangeEvent> = this._onDidChangeConfiguration.event;
19+
private readonly _onDidChangeConfiguration: Emitter<ITextResourceConfigurationChangeEvent> = this._register(new Emitter<ITextResourceConfigurationChangeEvent>());
20+
public readonly onDidChangeConfiguration: Event<ITextResourceConfigurationChangeEvent> = this._onDidChangeConfiguration.event;
2121

2222
constructor(
2323
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -114,7 +114,7 @@ export class TextResourceConfigurationService extends Disposable implements IRes
114114
return this.modeService.getModeIdByFilepathOrFirstLine(resource);
115115
}
116116

117-
private toResourceConfigurationChangeEvent(configurationChangeEvent: IConfigurationChangeEvent): IResourceConfigurationChangeEvent {
117+
private toResourceConfigurationChangeEvent(configurationChangeEvent: IConfigurationChangeEvent): ITextResourceConfigurationChangeEvent {
118118
return {
119119
affectedKeys: configurationChangeEvent.affectedKeys,
120120
affectsConfiguration: (resource: URI, configuration: string) => {

‎src/vs/editor/contrib/documentSymbols/outlineTree.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { MarkerSeverity } from 'vs/platform/markers/common/markers';
2222
import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
2323
import { registerColor, listErrorForeground, listWarningForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
2424
import { IdleValue } from 'vs/base/common/async';
25-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
25+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
2626
import { URI } from 'vs/base/common/uri';
2727

2828
export type OutlineItem = OutlineGroup | OutlineElement;
@@ -282,7 +282,7 @@ export class OutlineFilter implements ITreeFilter<OutlineItem> {
282282

283283
constructor(
284284
private readonly _prefix: string,
285-
@IResourceConfigurationService private readonly _textResourceConfigService: IResourceConfigurationService,
285+
@ITextResourceConfigurationService private readonly _textResourceConfigService: ITextResourceConfigurationService,
286286
) { }
287287

288288
filter(element: OutlineItem): boolean {

‎src/vs/editor/standalone/browser/simpleServices.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
2323
import { TextEdit, WorkspaceEdit, isResourceTextEdit } from 'vs/editor/common/modes';
2424
import { IModelService } from 'vs/editor/common/services/modelService';
2525
import { IResolvedTextEditorModel, ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
26-
import { IResourceConfigurationService, ITextResourcePropertiesService, IResourceConfigurationChangeEvent } from 'vs/editor/common/services/resourceConfiguration';
26+
import { ITextResourceConfigurationService, ITextResourcePropertiesService, ITextResourceConfigurationChangeEvent } from 'vs/editor/common/services/resourceConfiguration';
2727
import { CommandsRegistry, ICommand, ICommandEvent, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
2828
import { IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IConfigurationService, IConfigurationModel, IConfigurationValue, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
2929
import { Configuration, ConfigurationModel, DefaultConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
@@ -487,11 +487,11 @@ export class SimpleConfigurationService implements IConfigurationService {
487487
}
488488
}
489489

490-
export class SimpleResourceConfigurationService implements IResourceConfigurationService {
490+
export class SimpleResourceConfigurationService implements ITextResourceConfigurationService {
491491

492492
_serviceBrand: undefined;
493493

494-
private readonly _onDidChangeConfiguration = new Emitter<IResourceConfigurationChangeEvent>();
494+
private readonly _onDidChangeConfiguration = new Emitter<ITextResourceConfigurationChangeEvent>();
495495
public readonly onDidChangeConfiguration = this._onDidChangeConfiguration.event;
496496

497497
constructor(private readonly configurationService: SimpleConfigurationService) {

‎src/vs/editor/standalone/browser/standaloneServices.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
1212
import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
1313
import { IModelService } from 'vs/editor/common/services/modelService';
1414
import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
15-
import { IResourceConfigurationService, ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
15+
import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
1616
import { SimpleBulkEditService, SimpleConfigurationService, SimpleDialogService, SimpleNotificationService, SimpleEditorProgressService, SimpleResourceConfigurationService, SimpleResourcePropertiesService, SimpleUriLabelService, SimpleWorkspaceContextService, StandaloneCommandService, StandaloneKeybindingService, StandaloneTelemetryService, SimpleLayoutService } from 'vs/editor/standalone/browser/simpleServices';
1717
import { StandaloneCodeEditorServiceImpl } from 'vs/editor/standalone/browser/standaloneCodeServiceImpl';
1818
import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standaloneThemeServiceImpl';
@@ -126,7 +126,7 @@ export module StaticServices {
126126
const configurationServiceImpl = new SimpleConfigurationService();
127127
export const configurationService = define(IConfigurationService, () => configurationServiceImpl);
128128

129-
export const resourceConfigurationService = define(IResourceConfigurationService, () => new SimpleResourceConfigurationService(configurationServiceImpl));
129+
export const resourceConfigurationService = define(ITextResourceConfigurationService, () => new SimpleResourceConfigurationService(configurationServiceImpl));
130130

131131
export const resourcePropertiesService = define(ITextResourcePropertiesService, () => new SimpleResourcePropertiesService(configurationServiceImpl));
132132

‎src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
4747
import { onDidChangeZoomLevel } from 'vs/base/browser/browser';
4848
import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
4949
import { ILabelService } from 'vs/platform/label/common/label';
50-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
50+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
5151

5252
class Item extends BreadcrumbsItem {
5353

@@ -169,7 +169,7 @@ export class BreadcrumbsControl {
169169
@IThemeService private readonly _themeService: IThemeService,
170170
@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
171171
@IConfigurationService private readonly _configurationService: IConfigurationService,
172-
@IResourceConfigurationService private readonly _textResourceConfigurationService: IResourceConfigurationService,
172+
@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
173173
@IFileService private readonly _fileService: IFileService,
174174
@ITelemetryService private readonly _telemetryService: ITelemetryService,
175175
@ILabelService private readonly _labelService: ILabelService,

‎src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { FileKind } from 'vs/platform/files/common/files';
2424
import { withNullAsUndefined } from 'vs/base/common/types';
2525
import { OutlineFilter } from 'vs/editor/contrib/documentSymbols/outlineTree';
2626
import { ITextModel } from 'vs/editor/common/model';
27-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
27+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
2828

2929
export class FileElement {
3030
constructor(
@@ -55,7 +55,7 @@ export class EditorBreadcrumbsModel {
5555
private readonly _uri: URI,
5656
private readonly _editor: ICodeEditor | undefined,
5757
@IConfigurationService private readonly _configurationService: IConfigurationService,
58-
@IResourceConfigurationService private readonly _textResourceConfigurationService: IResourceConfigurationService,
58+
@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
5959
@IWorkspaceContextService workspaceService: IWorkspaceContextService,
6060
) {
6161
this._cfgFilePath = BreadcrumbsConfig.FilePath.bindTo(_configurationService);

‎src/vs/workbench/browser/parts/editor/editorStatus.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common
3636
import { ITextFileService, SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/textfiles';
3737
import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
3838
import { ConfigurationChangedEvent, IEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
39-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
39+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
4040
import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
4141
import { deepClone } from 'vs/base/common/objects';
4242
import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -1246,7 +1246,7 @@ export class ChangeEncodingAction extends Action {
12461246
actionLabel: string,
12471247
@IEditorService private readonly editorService: IEditorService,
12481248
@IQuickInputService private readonly quickInputService: IQuickInputService,
1249-
@IResourceConfigurationService private readonly textResourceConfigurationService: IResourceConfigurationService,
1249+
@ITextResourceConfigurationService private readonly textResourceConfigurationService: ITextResourceConfigurationService,
12501250
@IFileService private readonly fileService: IFileService,
12511251
@ITextFileService private readonly textFileService: ITextFileService
12521252
) {

‎src/vs/workbench/browser/parts/editor/textDiffEditor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
1616
import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
1717
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1818
import { IStorageService } from 'vs/platform/storage/common/storage';
19-
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
19+
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
2020
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2121
import { IThemeService } from 'vs/platform/theme/common/themeService';
2222
import { TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
@@ -46,7 +46,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
4646
@ITelemetryService telemetryService: ITelemetryService,
4747
@IInstantiationService instantiationService: IInstantiationService,
4848
@IStorageService storageService: IStorageService,
49-
@IResourceConfigurationService configurationService: IResourceConfigurationService,
49+
@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
5050
@IEditorService editorService: IEditorService,
5151
@IThemeService themeService: IThemeService,
5252
@IEditorGroupsService editorGroupService: IEditorGroupsService,

0 commit comments

Comments
 (0)