deco - use weight instead of severity

src/vs/workbench/parts/markers/browser/markersFileDecorations.ts

@@ -41,7 +41,7 @@ class MarkersDecorationsProvider implements IDecorationsProvider {
 
 		const [first] = markers;
 		return {
-			severity: first.severity,
+			weight: 100 * first.severity,
 			tooltip: localize('tooltip', "{0} problems in this file", markers.length),
 			letter: markers.length.toString(),
 			color: first.severity === Severity.Error ? editorErrorForeground : editorWarningForeground,

src/vs/workbench/parts/scm/electron-browser/scmFileDecorations.ts

@@ -10,7 +10,6 @@ import { IResourceDecorationsService, IDecorationsProvider, IResourceDecorationD
 import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
 import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource } from 'vs/workbench/services/scm/common/scm';
 import URI from 'vs/base/common/uri';
-import Severity from 'vs/base/common/severity';
 import Event, { Emitter } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { localize } from 'vs/nls';
@@ -67,7 +66,7 @@ class SCMDecorationsProvider implements IDecorationsProvider {
 			return undefined;
 		}
 		return {
-			severity: Severity.Info,
+			weight: 10,
 			tooltip: localize('tooltip', "{0}, {1}", resource.decorations.tooltip, this._provider.label),
 			color: resource.decorations.color,
 			letter: resource.decorations.tooltip.charAt(0)

src/vs/workbench/services/decorations/browser/decorations.ts

@@ -7,14 +7,13 @@
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import URI from 'vs/base/common/uri';
 import Event from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 export const IResourceDecorationsService = createDecorator<IResourceDecorationsService>('IFileDecorationsService');
 
 export interface IResourceDecorationData {
-	readonly severity: Severity;
+	readonly weight?: number;
 	readonly color?: ColorIdentifier;
 	readonly opacity?: number;
 	readonly letter?: string;
@@ -23,7 +22,7 @@ export interface IResourceDecorationData {
 
 export interface IResourceDecoration {
 	readonly _decoBrand: undefined;
-	readonly severity: Severity;
+	readonly weight?: number;
 	readonly tooltip?: string;
 	readonly labelClassName?: string;
 	readonly badgeClassName?: string;

src/vs/workbench/services/decorations/browser/decorationsService.ts

@@ -5,7 +5,6 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-import Severity from 'vs/base/common/severity';
 import Event, { Emitter, debounceEvent, any } from 'vs/base/common/event';
 import { IResourceDecorationsService, IResourceDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IResourceDecorationData } from './decorations';
 import { TernarySearchTree } from 'vs/base/common/map';
@@ -57,14 +56,14 @@ class ResourceDecoration implements IResourceDecoration {
 	_decoBrand: undefined;
 	_key: string;
 
-	severity: Severity;
+	weight?: number;
 	tooltip?: string;
 	labelClassName?: string;
 	badgeClassName?: string;
 
 	constructor(key: string, data: IResourceDecorationData) {
 		this._key = key;
-		this.severity = data.severity;
+		this.weight = data.weight;
 		this.tooltip = data.tooltip;
 	}
 }
@@ -317,7 +316,7 @@ export class FileDecorationsService implements IResourceDecorationsService {
 					// only bubble up color
 					top = {
 						_decoBrand: undefined,
-						severity: top.severity,
+						weight: top.weight,
 						labelClassName: top.labelClassName
 					};
 				}
@@ -331,7 +330,7 @@ export class FileDecorationsService implements IResourceDecorationsService {
 			return b;
 		} else if (!b) {
 			return a;
-		} else if (Severity.compare(a.severity, b.severity) < 0) {
+		} else if (a.weight > b.weight) {
 			return a;
 		} else {
 			return b;

src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts

@@ -10,7 +10,6 @@ import { FileDecorationsService } from 'vs/workbench/services/decorations/browse
 import { IDecorationsProvider, IResourceDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import URI from 'vs/base/common/uri';
 import Event, { toPromise } from 'vs/base/common/event';
-import Severity from 'vs/base/common/severity';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 
 suite('DecorationsService', function () {
@@ -36,7 +35,6 @@ suite('DecorationsService', function () {
 				callCounter += 1;
 				return new Promise<IResourceDecorationData>(resolve => {
 					setTimeout(() => resolve({
-						severity: Severity.Info,
 						color: 'someBlue',
 						tooltip: 'T'
 					}));
@@ -68,7 +66,7 @@ suite('DecorationsService', function () {
 			readonly onDidChange: Event<URI[]> = Event.None;
 			provideDecorations(uri: URI) {
 				callCounter += 1;
-				return { severity: Severity.Info, color: 'someBlue', tooltip: 'Z' };
+				return { color: 'someBlue', tooltip: 'Z' };
 			}
 		});
 
@@ -86,7 +84,7 @@ suite('DecorationsService', function () {
 			readonly onDidChange: Event<URI[]> = Event.None;
 			provideDecorations(uri: URI) {
 				callCounter += 1;
-				return { severity: Severity.Info, color: 'someBlue', tooltip: 'J' };
+				return { color: 'someBlue', tooltip: 'J' };
 			}
 		});