ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 09:35:36 -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

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,
@IConfigurationService private _configurationService?: IConfigurationService,
@ILogService private _logService?: ILogService,
@ILanguageService private _modeService?: ILanguageService
@ILanguageService private _languageService?: ILanguageService
) {
super();
this.id = `${modelId++}`;
@@ -414,8 +414,8 @@ export class CellModel extends Disposable implements ICellModel {
let result: string;
if (this._cellType === CellTypes.Markdown) {
result = 'Markdown';
} else if (this._modeService) {
let language = this._modeService.getLanguageName(this.language);
} else if (this._languageService) {
let language = this._languageService.getLanguageName(this.language);
result = language ?? this.language;
} else {
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,
@INotebookService private _notebookService: INotebookService,
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
@ILanguageService private _modeService: ILanguageService,
@ILanguageService private _languageService: ILanguageService,
) {
super();
if (!_notebookOptions || !_notebookOptions.notebookUri || !_notebookOptions.executeManagers) {
@@ -165,8 +165,8 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (!fileExt) {
let languageMode = this._notebookOptions.getInputLanguageMode();
if (languageMode) {
let languageName = this._modeService.getLanguageName(languageMode);
let fileExtensions = this._modeService.getExtensions(languageName);
let languageName = this._languageService.getLanguageName(languageMode);
let fileExtensions = this._languageService.getExtensions(languageName);
if (fileExtensions?.length > 0) {
extensions = fileExtensions;
} else {