- Move to proposed

- Use numeric enum

Author: mjbvz

build/monaco/monaco.d.ts.recipe

@@ -32,6 +32,10 @@ declare namespace monaco {
 		Error = 3,
 	}
 
+	export enum MarkerTag {
+		Unnecessary = 1,
+	}
+
 	export enum MarkerSeverity {
 		Hint = 1,
 		Info = 2,

src/vs/editor/common/services/modelServiceImpl.ts

@@ -11,7 +11,7 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IMarker, IMarkerService, MarkerSeverity, WellKnownMarkerTags } from 'vs/platform/markers/common/markers';
+import { IMarker, IMarkerService, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
 import { Range } from 'vs/editor/common/core/range';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
 import { IMode, LanguageIdentifier } from 'vs/editor/common/modes';
@@ -131,7 +131,7 @@ class ModelMarkerHandler {
 
 		switch (marker.severity) {
 			case MarkerSeverity.Hint:
-				if (!marker.customTags || marker.customTags.indexOf(WellKnownMarkerTags.Unnecessary) === -1) {
+				if (!marker.customTags || marker.customTags.indexOf(MarkerTag.Unnecessary) === -1) {
 					className = ClassName.EditorHintDecoration;
 				}
 				zIndex = 0;
@@ -158,7 +158,7 @@ class ModelMarkerHandler {
 		}
 
 		if (marker.customTags) {
-			if (marker.customTags.indexOf(WellKnownMarkerTags.Unnecessary) === -1) {
+			if (marker.customTags.indexOf(MarkerTag.Unnecessary) !== -1) {
 				inlineClassName = ClassName.EditorUnnecessaryDecoration;
 			}
 		}

src/vs/editor/common/standalone/standaloneBase.ts

@@ -25,6 +25,10 @@ export enum Severity {
 	Error = 3,
 }
 
+export enum MarkerTag {
+	Unnecessary = 1,
+}
+
 export enum MarkerSeverity {
 	Hint = 1,
 	Info = 2,
@@ -246,6 +250,7 @@ export function createMonacoBaseAPI(): typeof monaco {
 		SelectionDirection: SelectionDirection,
 		Severity: Severity,
 		MarkerSeverity: MarkerSeverity,
+		MarkerTag: MarkerTag,
 		Promise: TPromise,
 		Uri: <any>URI,
 		Token: Token

src/vs/editor/editor.api.ts

@@ -37,6 +37,7 @@ export const Selection = api.Selection;
 export const SelectionDirection = api.SelectionDirection;
 export const Severity = api.Severity;
 export const MarkerSeverity = api.MarkerSeverity;
+export const MarkerTag = api.MarkerTag;
 export const Promise = api.Promise;
 export const Uri = api.Uri;
 export const Token = api.Token;

src/vs/monaco.d.ts

@@ -32,6 +32,10 @@ declare namespace monaco {
 		Error = 3,
 	}
 
+	export enum MarkerTag {
+		Unnecessary = 1,
+	}
+
 	export enum MarkerSeverity {
 		Hint = 1,
 		Info = 2,
@@ -1089,7 +1093,7 @@ declare namespace monaco.editor {
 		endLineNumber: number;
 		endColumn: number;
 		relatedInformation?: IRelatedInformation[];
-		customTags?: string[];
+		customTags?: MarkerTag[];
 	}
 
 	/**
@@ -1105,7 +1109,7 @@ declare namespace monaco.editor {
 		endLineNumber: number;
 		endColumn: number;
 		relatedInformation?: IRelatedInformation[];
-		customTags?: string[];
+		customTags?: MarkerTag[];
 	}
 
 	/**

src/vs/platform/markers/common/markers.ts

@@ -38,8 +38,8 @@ export interface IRelatedInformation {
 	endColumn: number;
 }
 
-export enum WellKnownMarkerTags {
-	Unnecessary = 'unnecessary'
+export enum MarkerTag {
+	Unnecessary = 1,
 }
 
 export enum MarkerSeverity {
@@ -87,7 +87,7 @@ export interface IMarkerData {
 	endLineNumber: number;
 	endColumn: number;
 	relatedInformation?: IRelatedInformation[];
-	customTags?: string[];
+	customTags?: MarkerTag[];
 }
 
 export interface IResourceMarker {
@@ -107,7 +107,7 @@ export interface IMarker {
 	endLineNumber: number;
 	endColumn: number;
 	relatedInformation?: IRelatedInformation[];
-	customTags?: string[];
+	customTags?: MarkerTag[];
 }
 
 export interface MarkerStatistics {

src/vs/vscode.d.ts

@@ -3845,16 +3845,6 @@ declare module 'vscode' {
 		Hint = 3
 	}
 
-	/**
-	 * Additional metadata about the type of diagnostic.
-	 */
-	export enum DiagnosticTag {
-		/**
-		 * Unused or unnecessary code.
-		 */
-		Unnecessary = 'unnecessary'
-	}
-
 	/**
 	 * Represents a related message and source code location for a diagnostic. This should be
 	 * used to point to code locations that cause or related to a diagnostics, e.g when duplicating
@@ -3902,11 +3892,6 @@ declare module 'vscode' {
 		 */
 		severity: DiagnosticSeverity;
 
-		/**
-		 * Additional metadata about the type of the diagnostic.
-		 */
-		customTags?: DiagnosticTag[];
-
 		/**
 		 * A human-readable string describing the source of this
 		 * diagnostic, e.g. 'typescript' or 'super lint'.

src/vs/vscode.proposed.d.ts

@@ -619,4 +619,24 @@ declare module 'vscode' {
 	}
 
 	//#endregion
+
+	//#region mjbvz: Unused diagnostics
+	/**
+	 * Additional metadata about the type of diagnostic.
+	 */
+	export enum DiagnosticTag {
+		/**
+		 * Unused or unnecessary code.
+		 */
+		Unnecessary = 1,
+	}
+
+	export interface Diagnostic {
+		/**
+		 * Additional metadata about the type of the diagnostic.
+		 */
+		customTags?: DiagnosticTag[];
+	}
+
+	//#endregion
 }

src/vs/workbench/api/node/extHostTypeConverters.ts

@@ -20,7 +20,7 @@ import * as htmlContent from 'vs/base/common/htmlContent';
 import { IRelativePattern } from 'vs/base/common/glob';
 import * as languageSelector from 'vs/editor/common/modes/languageSelector';
 import { WorkspaceEditDto, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
-import { MarkerSeverity, IRelatedInformation, IMarkerData } from 'vs/platform/markers/common/markers';
+import { MarkerSeverity, IRelatedInformation, IMarkerData, MarkerTag } from 'vs/platform/markers/common/markers';
 
 export interface PositionLike {
 	line: number;
@@ -88,6 +88,16 @@ export namespace Position {
 	}
 }
 
+export namespace DiagnosticTag {
+	export function from(value: vscode.DiagnosticTag): MarkerTag {
+		switch (value) {
+			case types.DiagnosticTag.Unnecessary:
+				return MarkerTag.Unnecessary;
+		}
+		return undefined;
+	}
+}
+
 export namespace Diagnostic {
 	export function from(value: vscode.Diagnostic): IMarkerData {
 		return {
@@ -97,7 +107,7 @@ export namespace Diagnostic {
 			code: String(value.code),
 			severity: DiagnosticSeverity.from(value.severity),
 			relatedInformation: value.relatedInformation && value.relatedInformation.map(DiagnosticRelatedInformation.from),
-			customTags: value.customTags,
+			customTags: Array.isArray(value.customTags) ? value.customTags.map(DiagnosticTag.from) : undefined,
 		};
 	}
 }

src/vs/workbench/api/node/extHostTypes.ts

@@ -674,7 +674,7 @@ export class SnippetString {
 }
 
 export enum DiagnosticTag {
-	Unnecessary = 'unnecessary',
+	Unnecessary = 1,
 }
 
 export enum DiagnosticSeverity {