Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

src/vs/base/common/actions.ts

@@ -64,11 +64,11 @@ export class Action extends Disposable implements IAction {
 
 	protected readonly _id: string;
 	protected _label: string;
-	protected _tooltip: string;
+	protected _tooltip: string | undefined;
 	protected _cssClass: string | undefined;
-	protected _enabled: boolean;
-	protected _checked: boolean;
-	protected _radio: boolean;
+	protected _enabled: boolean = true;
+	protected _checked: boolean = false;
+	protected _radio: boolean = false;
 	protected readonly _actionCallback?: (event?: any) => Promise<any>;
 
 	constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => Promise<any>) {
@@ -100,7 +100,7 @@ export class Action extends Disposable implements IAction {
 	}
 
 	get tooltip(): string {
-		return this._tooltip;
+		return this._tooltip || '';
 	}
 
 	set tooltip(value: string) {

src/vs/base/common/color.ts

@@ -293,7 +293,7 @@ export class Color {
 		}
 	}
 
-	equals(other: Color): boolean {
+	equals(other: Color | null): boolean {
 		return !!other && RGBA.equals(this.rgba, other.rgba) && HSLA.equals(this.hsla, other.hsla) && HSVA.equals(this.hsva, other.hsva);
 	}
 
@@ -608,4 +608,4 @@ export namespace Color {
 			}
 		}
 	}
-}
+}

src/vs/base/common/event.ts

@@ -645,7 +645,7 @@ export interface IWaitUntil {
 
 export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 
-	private _asyncDeliveryQueue: [Listener<T>, T, Promise<any>[]][];
+	private _asyncDeliveryQueue?: [Listener<T>, T, Promise<any>[]][];
 
 	async fireAsync(eventFn: (thenables: Promise<any>[], listener: Function) => T): Promise<void> {
 		if (!this._listeners) {

src/vs/base/common/history.ts

@@ -7,9 +7,9 @@ import { INavigator, ArrayNavigator } from 'vs/base/common/iterator';
 
 export class HistoryNavigator<T> implements INavigator<T> {
 
-	private _history: Set<T>;
+	private _history!: Set<T>;
 	private _limit: number;
-	private _navigator: ArrayNavigator<T>;
+	private _navigator!: ArrayNavigator<T>;
 
 	constructor(history: T[] = [], limit: number = 10) {
 		this._initialize(history);

src/vs/base/common/map.ts

@@ -112,9 +112,9 @@ export class StringIterator implements IKeyIterator {
 
 export class PathIterator implements IKeyIterator {
 
-	private _value: string;
-	private _from: number;
-	private _to: number;
+	private _value!: string;
+	private _from!: number;
+	private _to!: number;
 
 	reset(key: string): this {
 		this._value = key.replace(/\\$|\/$/, '');
@@ -176,9 +176,9 @@ export class PathIterator implements IKeyIterator {
 }
 
 class TernarySearchTreeNode<E> {
-	segment: string;
+	segment!: string;
 	value: E | undefined;
-	key: string;
+	key!: string;
 	left: TernarySearchTreeNode<E> | undefined;
 	mid: TernarySearchTreeNode<E> | undefined;
 	right: TernarySearchTreeNode<E> | undefined;

src/vs/base/common/path.ts

@@ -58,6 +58,8 @@ class ErrorInvalidArgType extends Error {
 
 		msg += `. Received type ${typeof actual}`;
 		super(msg);
+
+		this.code = 'ERR_INVALID_ARG_TYPE';
 	}
 }