From 37043bc9d28647e8dd40551e715e0aae9640cb9c Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 16 Oct 2017 14:46:40 +0200 Subject: [PATCH] deco - tooltip -> title --- src/vs/workbench/browser/labels.ts | 2 +- .../parts/markers/browser/markersFileDecorations.ts | 2 +- .../parts/scm/electron-browser/scmFileDecorations.ts | 2 +- .../workbench/services/decorations/browser/decorations.ts | 4 ++-- .../services/decorations/browser/decorationsService.ts | 6 +++--- .../decorations/test/browser/decorationsService.test.ts | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts index 08a68da883c..ec6920eed22 100644 --- a/src/vs/workbench/browser/labels.ts +++ b/src/vs/workbench/browser/labels.ts @@ -192,7 +192,7 @@ export class ResourceLabel extends IconLabel { } if (deco && deco.badgeClassName && this.options.fileDecorations.badges) { iconLabelOptions.badge = { - title: deco.tooltip, + title: deco.title, className: deco.badgeClassName, }; } diff --git a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts index 670e1db47da..e9a44a611ac 100644 --- a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts +++ b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts @@ -44,7 +44,7 @@ class MarkersDecorationsProvider implements IDecorationsProvider { return { weight: 100 * first.severity, - tooltip: markers.length === 1 ? localize('tooltip.1', "1 problem in this file") : localize('tooltip.N', "{0} problems in this file", markers.length), + title: markers.length === 1 ? localize('tooltip.1', "1 problem in this file") : localize('tooltip.N', "{0} problems in this file", markers.length), letter: markers.length.toString(), color: first.severity === Severity.Error ? editorErrorForeground : editorWarningForeground, }; diff --git a/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts b/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts index ebfd9f55cd9..75fcbab94b8 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts @@ -67,7 +67,7 @@ class SCMDecorationsProvider implements IDecorationsProvider { } return { weight: 100 - resource.decorations.tooltip.charAt(0).toLowerCase().charCodeAt(0), - tooltip: localize('tooltip', "{0}, {1}", resource.decorations.tooltip, this._provider.label), + title: localize('tooltip', "{0}, {1}", resource.decorations.tooltip, this._provider.label), color: resource.decorations.color, letter: resource.decorations.tooltip.charAt(0) }; diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts index 1c42c362433..25401fd795a 100644 --- a/src/vs/workbench/services/decorations/browser/decorations.ts +++ b/src/vs/workbench/services/decorations/browser/decorations.ts @@ -17,13 +17,13 @@ export interface IDecorationData { readonly color?: ColorIdentifier; readonly opacity?: number; readonly letter?: string; - readonly tooltip?: string; + readonly title?: string; } export interface IDecoration { readonly _decoBrand: undefined; readonly weight?: number; - readonly tooltip?: string; + readonly title?: string; readonly labelClassName?: string; readonly badgeClassName?: string; } diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts index feb0ff47fe3..9792da756f4 100644 --- a/src/vs/workbench/services/decorations/browser/decorationsService.ts +++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts @@ -93,10 +93,10 @@ class ResourceDecoration implements IDecoration { let result = new ResourceDecoration(data); if (Array.isArray(data)) { result.weight = data[0].weight; - result.tooltip = data.map(d => d.tooltip).join(', '); + result.title = data.map(d => d.title).join(', '); } else { result.weight = data.weight; - result.tooltip = data.tooltip; + result.title = data.title; } return result; } @@ -105,7 +105,7 @@ class ResourceDecoration implements IDecoration { _data: IDecorationData | IDecorationData[]; weight?: number; - tooltip?: string; + title?: string; labelClassName?: string; badgeClassName?: string; diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts index 8135a7eceac..54f37ccf294 100644 --- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts +++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts @@ -36,7 +36,7 @@ suite('DecorationsService', function () { return new Promise(resolve => { setTimeout(() => resolve({ color: 'someBlue', - tooltip: 'T' + title: 'T' })); }); } @@ -51,7 +51,7 @@ suite('DecorationsService', function () { assert.equal(e.affectsResource(uri), true); // sync result - assert.deepEqual(service.getDecoration(uri, false).tooltip, 'T'); + assert.deepEqual(service.getDecoration(uri, false).title, 'T'); assert.equal(callCounter, 1); }); }); @@ -71,7 +71,7 @@ suite('DecorationsService', function () { }); // trigger -> sync - assert.deepEqual(service.getDecoration(uri, false).tooltip, 'Z'); + assert.deepEqual(service.getDecoration(uri, false).title, 'Z'); assert.equal(callCounter, 1); }); @@ -89,7 +89,7 @@ suite('DecorationsService', function () { }); // trigger -> sync - assert.deepEqual(service.getDecoration(uri, false).tooltip, 'J'); + assert.deepEqual(service.getDecoration(uri, false).title, 'J'); assert.equal(callCounter, 1); // un-register -> ensure good event -- GitLab