ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-22 04:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/browser/labels.ts
View File

@@ -211,7 +211,7 @@ export class ResourceLabel extends ResourceLabels {
constructor(
container: HTMLElement,
options: IIconLabelCreationOptions,
options: IIconLabelCreationOptions | undefined,
@IInstantiationService instantiationService: IInstantiationService,
@IExtensionService extensionService: IExtensionService,
@IConfigurationService configurationService: IConfigurationService,
@@ -252,7 +252,7 @@ class ResourceLabelWidget extends IconLabel {
constructor(
container: HTMLElement,
options: IIconLabelCreationOptions,
options: IIconLabelCreationOptions | undefined,
@IModeService private readonly modeService: IModeService,
@IModelService private readonly modelService: IModelService,
@IDecorationsService private readonly decorationsService: IDecorationsService,
@@ -434,7 +434,7 @@ class ResourceLabelWidget extends IconLabel {
return;
}
const iconLabelOptions: IIconLabelValueOptions = {
const iconLabelOptions: IIconLabelValueOptions & { extraClasses: string[] } = {
title: '',
italic: this.options && this.options.italic,
matches: this.options && this.options.matches,
@@ -462,7 +462,7 @@ class ResourceLabelWidget extends IconLabel {
}
if (this.options && this.options.extraClasses) {
iconLabelOptions.extraClasses!.push(...this.options.extraClasses);
iconLabelOptions.extraClasses.push(...this.options.extraClasses);
}
if (this.options && this.options.fileDecorations && resource) {
@@ -477,11 +477,11 @@ class ResourceLabelWidget extends IconLabel {
}
if (this.options.fileDecorations.colors) {
iconLabelOptions.extraClasses!.push(deco.labelClassName);
iconLabelOptions.extraClasses.push(deco.labelClassName);
}
if (this.options.fileDecorations.badges) {
iconLabelOptions.extraClasses!.push(deco.badgeClassName);
iconLabelOptions.extraClasses.push(deco.badgeClassName);
}
}
}