ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

ModeService to LanguageService var names (#20949)

Browse Source
This commit is contained in:
Charles Gagnon
2022-10-24 13:57:03 -07:00
committed by GitHub
parent de9dd34275
commit a64a33e091
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/browser/editor/profiler/dashboardInput.ts
View File

@@ -35,7 +35,7 @@ export class DashboardInput extends EditorInput {
constructor( constructor(
_connectionProfile: IConnectionProfile, _connectionProfile: IConnectionProfile,
@IConnectionManagementService private _connectionService: IConnectionManagementService, @IConnectionManagementService private _connectionService: IConnectionManagementService,
@ILanguageService modeService: ILanguageService, @ILanguageService languageService: ILanguageService,
@IModelService model: IModelService @IModelService model: IModelService
) { ) {
super(); super();
@@ -47,7 +47,7 @@ export class DashboardInput extends EditorInput {
// vscode has a comment that Mode's will eventually be removed (not sure the state of this comment) // vscode has a comment that Mode's will eventually be removed (not sure the state of this comment)
// so this might be able to be undone when that happens // so this might be able to be undone when that happens
if (!model.getModel(this.resource)) { if (!model.getModel(this.resource)) {
model.createModel('', modeService.createById('dashboard'), this.resource); model.createModel('', languageService.createById('dashboard'), this.resource);
} }
this._initializedPromise = _connectionService.connectIfNotConnected(_connectionProfile, 'dashboard').then( this._initializedPromise = _connectionService.connectIfNotConnected(_connectionProfile, 'dashboard').then(
u => { u => {

4
src/sql/workbench/browser/modelComponents/editor.component.ts
View File

@@ -48,7 +48,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
@Inject(forwardRef(() => ElementRef)) el: ElementRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef,
@Inject(IInstantiationService) private _instantiationService: IInstantiationService, @Inject(IInstantiationService) private _instantiationService: IInstantiationService,
@Inject(IModelService) private _modelService: IModelService, @Inject(IModelService) private _modelService: IModelService,
@Inject(ILanguageService) private _modeService: ILanguageService, @Inject(ILanguageService) private _languageService: ILanguageService,
@Inject(ILogService) private _logService: ILogService, @Inject(ILogService) private _logService: ILogService,
@Inject(IEditorService) private readonly editorService: IEditorService, @Inject(IEditorService) private readonly editorService: IEditorService,
@Inject(ILogService) logService: ILogService @Inject(ILogService) logService: ILogService
@@ -141,7 +141,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
private updateLanguageMode() { private updateLanguageMode() {
if (this._editorModel && this._editor) { if (this._editorModel && this._editor) {
this._languageMode = this.languageMode; this._languageMode = this.languageMode;
let languageSelection = this._modeService.createById(this._languageMode); let languageSelection = this._languageService.createById(this._languageMode);
this._modelService.setMode(this._editorModel, languageSelection); this._modelService.setMode(this._editorModel, languageSelection);
} }
} }

14
src/sql/workbench/contrib/notebook/browser/cellViews/code.component.ts
View File

@@ -104,7 +104,7 @@ export class CodeComponent extends CellView implements OnInit, OnChanges {
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService, @Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@Inject(IInstantiationService) private _instantiationService: IInstantiationService, @Inject(IInstantiationService) private _instantiationService: IInstantiationService,
@Inject(IModelService) private _modelService: IModelService, @Inject(IModelService) private _modelService: IModelService,
@Inject(ILanguageService) private _modeService: ILanguageService, @Inject(ILanguageService) private _languageService: ILanguageService,
@Inject(IConfigurationService) private _configurationService: IConfigurationService, @Inject(IConfigurationService) private _configurationService: IConfigurationService,
@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
@Inject(ILogService) private readonly logService: ILogService, @Inject(ILogService) private readonly logService: ILogService,
@@ -407,7 +407,7 @@ export class CodeComponent extends CellView implements OnInit, OnChanges {
private updateLanguageMode(): void { private updateLanguageMode(): void {
if (this._editorModel && this._editor) { if (this._editorModel && this._editor) {
let modeValue = this._modeService.createById(this.cellModel.language); let modeValue = this._languageService.createById(this.cellModel.language);
this._modelService.setMode(this._editorModel, modeValue); this._modelService.setMode(this._editorModel, modeValue);
} }
} }
@@ -490,10 +490,10 @@ export class CodeComponent extends CellView implements OnInit, OnChanges {
description = localize('cellLanguageDescriptionConfigured', "({0})", lang); description = localize('cellLanguageDescriptionConfigured', "({0})", lang);
} }
const languageName = this._modeService.getLanguageName(lang) ?? lang; const languageName = this._languageService.getLanguageName(lang) ?? lang;
const item = <ILanguagePickInput>{ const item = <ILanguagePickInput>{
label: languageName, label: languageName,
iconClasses: getIconClasses(this._modelService, this._modeService, this.getFakeResource(languageName, this._modeService)), iconClasses: getIconClasses(this._modelService, this._languageService, this.getFakeResource(languageName, this._languageService)),
description, description,
languageId: lang languageId: lang
}; };
@@ -519,14 +519,14 @@ export class CodeComponent extends CellView implements OnInit, OnChanges {
/** /**
* Copied from coreActions.ts * Copied from coreActions.ts
*/ */
private getFakeResource(lang: string, modeService: ILanguageService): URI | undefined { private getFakeResource(lang: string, languageService: ILanguageService): URI | undefined {
let fakeResource: URI | undefined; let fakeResource: URI | undefined;
const extensions = modeService.getExtensions(lang); const extensions = languageService.getExtensions(lang);
if (extensions?.length) { if (extensions?.length) {
fakeResource = URI.file(extensions[0]); fakeResource = URI.file(extensions[0]);
} else { } else {
const filenames = modeService.getFilenames(lang); const filenames = languageService.getFilenames(lang);
if (filenames?.length) { if (filenames?.length) {
fakeResource = URI.file(filenames[0]); fakeResource = URI.file(filenames[0]);
} }

2
src/sql/workbench/contrib/notebook/browser/models/notebookEditorFactory.ts
View File

@@ -24,7 +24,7 @@ const editorFactoryRegistry = Registry.as<IEditorFactoryRegistry>(EditorExtensio
export class NotebookEditorLanguageAssociation implements ILanguageAssociation { export class NotebookEditorLanguageAssociation implements ILanguageAssociation {
/** /**
* The language IDs that are associated with Notebooks. These are case sensitive for comparing with what's * The language IDs that are associated with Notebooks. These are case sensitive for comparing with what's
* registered in the ModeService registry. * registered in the LanguageService registry.
*/ */
static readonly languages = [NotebookLanguage.Notebook, NotebookLanguage.Ipynb]; static readonly languages = [NotebookLanguage.Notebook, NotebookLanguage.Ipynb];

6
src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
View File

@@ -740,13 +740,13 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
@ILogService private _logService: ILogService, @ILogService private _logService: ILogService,
@IEditorService private _editorService: IEditorService, @IEditorService private _editorService: IEditorService,
@IEditorResolverService private _editorResolverService: IEditorResolverService, @IEditorResolverService private _editorResolverService: IEditorResolverService,
@ILanguageService private _modeService: ILanguageService @ILanguageService private _languageService: ILanguageService
) { ) {
super(); super();
this.registerEditorOverrides(); this.registerEditorOverrides();
// Refresh the editor overrides whenever the languages change so we ensure we always have // Refresh the editor overrides whenever the languages change so we ensure we always have
// the latest up to date list of extensions for each language // the latest up to date list of extensions for each language
this._modeService.onDidChange(() => { this._languageService.onDidChange(() => {
this.registerEditorOverrides(); this.registerEditorOverrides();
}); });
notebookRegistry.onNewDescriptionRegistration(({ id, registration }) => { notebookRegistry.onNewDescriptionRegistration(({ id, registration }) => {
@@ -765,7 +765,7 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
// List of built-in language IDs to associate the query editor for. These are case sensitive. // List of built-in language IDs to associate the query editor for. These are case sensitive.
NotebookEditorLanguageAssociation.languages.forEach(lang => { NotebookEditorLanguageAssociation.languages.forEach(lang => {
const langExtensions = this._modeService.getExtensions(lang); const langExtensions = this._languageService.getExtensions(lang);
allExtensions = allExtensions.concat(langExtensions); allExtensions = allExtensions.concat(langExtensions);
}); });

4
src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts
View File

@@ -94,7 +94,7 @@ suite.skip('MarkdownTextTransformer', () => {
onDidChange: (_a: any) => { } onDidChange: (_a: any) => { }
}; };
let modeService: any = { let languageService: any = {
languageIdCodec: { languageIdCodec: {
encodeLanguageId: (languageId: string) => { return <LanguageId>undefined; }, encodeLanguageId: (languageId: string) => { return <LanguageId>undefined; },
decodeLanguageId: (languageId: LanguageId) => { return <string>undefined; } decodeLanguageId: (languageId: LanguageId) => { return <string>undefined; }
@@ -106,7 +106,7 @@ suite.skip('MarkdownTextTransformer', () => {
isForSimpleWidget: true, defaultEOL: DefaultEndOfLine.LF, detectIndentation: true, isForSimpleWidget: true, defaultEOL: DefaultEndOfLine.LF, detectIndentation: true,
indentSize: 0, insertSpaces: false, largeFileOptimizations: false, tabSize: 4, trimAutoWhitespace: false, indentSize: 0, insertSpaces: false, largeFileOptimizations: false, tabSize: 4, trimAutoWhitespace: false,
bracketPairColorizationOptions: { independentColorPoolPerBracketType: false, enabled: true } bracketPairColorizationOptions: { independentColorPoolPerBracketType: false, enabled: true }
}, undefined, undoRedoService, modeService, }, undefined, undoRedoService, languageService,
languageConfigurationService); languageConfigurationService);
// Couple widget with newly created text model // Couple widget with newly created text model

6
src/sql/workbench/contrib/query/browser/query.contribution.ts
View File

@@ -541,13 +541,13 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork
@ILogService private _logService: ILogService, @ILogService private _logService: ILogService,
@IEditorService private _editorService: IEditorService, @IEditorService private _editorService: IEditorService,
@IEditorResolverService private _editorResolverService: IEditorResolverService, @IEditorResolverService private _editorResolverService: IEditorResolverService,
@ILanguageService private _modeService: ILanguageService @ILanguageService private _languageService: ILanguageService
) { ) {
super(); super();
this.registerEditorOverrides(); this.registerEditorOverrides();
// Refresh the editor overrides whenever the languages change so we ensure we always have // Refresh the editor overrides whenever the languages change so we ensure we always have
// the latest up to date list of extensions for each language // the latest up to date list of extensions for each language
this._modeService.onDidChange(() => { this._languageService.onDidChange(() => {
this.registerEditorOverrides(); this.registerEditorOverrides();
}); });
} }
@@ -556,7 +556,7 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork
this._registeredOverrides.clear(); this._registeredOverrides.clear();
// List of language IDs to associate the query editor for. These are case sensitive. // List of language IDs to associate the query editor for. These are case sensitive.
QueryEditorLanguageAssociation.languages.map(lang => { QueryEditorLanguageAssociation.languages.map(lang => {
const langExtensions = this._modeService.getExtensions(lang); const langExtensions = this._languageService.getExtensions(lang);
if (langExtensions.length === 0) { if (langExtensions.length === 0) {
return; return;
} }

6
src/sql/workbench/contrib/query/browser/queryEditor.ts
View File

@@ -112,7 +112,7 @@ export class QueryEditor extends EditorPane {
@IEditorService private readonly editorService: IEditorService, @IEditorService private readonly editorService: IEditorService,
@IInstantiationService private readonly instantiationService: IInstantiationService, @IInstantiationService private readonly instantiationService: IInstantiationService,
@IConfigurationService private readonly configurationService: IConfigurationService, @IConfigurationService private readonly configurationService: IConfigurationService,
@ILanguageService private readonly modeService: ILanguageService, @ILanguageService private readonly languageService: ILanguageService,
@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService, @ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
@ICapabilitiesService private readonly capabilitiesService: ICapabilitiesService @ICapabilitiesService private readonly capabilitiesService: ICapabilitiesService
) { ) {
@@ -312,10 +312,10 @@ export class QueryEditor extends EditorPane {
// TODO: Allow query provider to provide the language mode. // TODO: Allow query provider to provide the language mode.
if (this.input instanceof UntitledQueryEditorInput) { if (this.input instanceof UntitledQueryEditorInput) {
if ((providerId === 'KUSTO') || this.modeService.getExtensions('Kusto').indexOf(fileExtension) > -1) { if ((providerId === 'KUSTO') || this.languageService.getExtensions('Kusto').indexOf(fileExtension) > -1) {
this.input.setMode('kusto'); this.input.setMode('kusto');
} }
else if (providerId === 'LOGANALYTICS' || this.modeService.getExtensions('LogAnalytics').indexOf(fileExtension) > -1) { else if (providerId === 'LOGANALYTICS' || this.languageService.getExtensions('LogAnalytics').indexOf(fileExtension) > -1) {
this.input.setMode('loganalytics'); this.input.setMode('loganalytics');
} }
} }

2
src/sql/workbench/contrib/query/browser/queryEditorFactory.ts
View File

@@ -31,7 +31,7 @@ export class QueryEditorLanguageAssociation implements ILanguageAssociation {
static readonly isDefault = true; static readonly isDefault = true;
/** /**
* The language IDs that are associated with the query editor. These are case sensitive for comparing with what's * The language IDs that are associated with the query editor. These are case sensitive for comparing with what's
* registered in the ModeService registry. * registered in the LanguageService registry.
*/ */
static readonly languages = ['kusto', 'loganalytics', 'sql']; //TODO Add language id here for new languages supported in query editor. Make it easier to contribute new extension's languageID static readonly languages = ['kusto', 'loganalytics', 'sql']; //TODO Add language id here for new languages supported in query editor. Make it easier to contribute new extension's languageID

6
src/sql/workbench/services/notebook/browser/models/cell.ts
View File

@@ -102,7 +102,7 @@ export class CellModel extends Disposable implements ICellModel {
@ICommandService private _commandService?: ICommandService, @ICommandService private _commandService?: ICommandService,
@IConfigurationService private _configurationService?: IConfigurationService, @IConfigurationService private _configurationService?: IConfigurationService,
@ILogService private _logService?: ILogService, @ILogService private _logService?: ILogService,
@ILanguageService private _modeService?: ILanguageService @ILanguageService private _languageService?: ILanguageService
) { ) {
super(); super();
this.id = `${modelId++}`; this.id = `${modelId++}`;
@@ -414,8 +414,8 @@ export class CellModel extends Disposable implements ICellModel {
let result: string; let result: string;
if (this._cellType === CellTypes.Markdown) { if (this._cellType === CellTypes.Markdown) {
result = 'Markdown'; result = 'Markdown';
} else if (this._modeService) { } else if (this._languageService) {
let language = this._modeService.getLanguageName(this.language); let language = this._languageService.getLanguageName(this.language);
result = language ?? this.language; result = language ?? this.language;
} else { } else {
result = this.language; result = this.language;

6
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -138,7 +138,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
@IUndoRedoService private undoService: IUndoRedoService, @IUndoRedoService private undoService: IUndoRedoService,
@INotebookService private _notebookService: INotebookService, @INotebookService private _notebookService: INotebookService,
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
@ILanguageService private _modeService: ILanguageService, @ILanguageService private _languageService: ILanguageService,
) { ) {
super(); super();
if (!_notebookOptions || !_notebookOptions.notebookUri || !_notebookOptions.executeManagers) { if (!_notebookOptions || !_notebookOptions.notebookUri || !_notebookOptions.executeManagers) {
@@ -165,8 +165,8 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (!fileExt) { if (!fileExt) {
let languageMode = this._notebookOptions.getInputLanguageMode(); let languageMode = this._notebookOptions.getInputLanguageMode();
if (languageMode) { if (languageMode) {
let languageName = this._modeService.getLanguageName(languageMode); let languageName = this._languageService.getLanguageName(languageMode);
let fileExtensions = this._modeService.getExtensions(languageName); let fileExtensions = this._languageService.getExtensions(languageName);
if (fileExtensions?.length > 0) { if (fileExtensions?.length > 0) {
extensions = fileExtensions; extensions = fileExtensions;
} else { } else {