Merge from master

src/vs/workbench/browser/parts/quickinput/quickInputBox.ts

@@ -3,13 +3,10 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import 'vs/css!./quickInput';
 import * as dom from 'vs/base/browser/dom';
 import { InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { localize } from 'vs/nls';
-import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
+import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -17,8 +14,6 @@ import Severity from 'vs/base/common/severity';
 
 const $ = dom.$;
 
-const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results.");
-
 export class QuickInputBox {
 
 	private container: HTMLElement;
@@ -29,16 +24,8 @@ export class QuickInputBox {
 		private parent: HTMLElement
 	) {
 		this.container = dom.append(this.parent, $('.quick-input-box'));
-		this.inputBox = new InputBox(this.container, null, {
-			ariaLabel: DEFAULT_INPUT_ARIA_LABEL
-		});
+		this.inputBox = new InputBox(this.container, null);
 		this.disposables.push(this.inputBox);
-
-		// ARIA
-		const inputElement = this.inputBox.inputElement;
-		inputElement.setAttribute('role', 'combobox');
-		inputElement.setAttribute('aria-haspopup', 'false');
-		inputElement.setAttribute('aria-autocomplete', 'list');
 	}
 
 	onKeyDown = (handler: (event: StandardKeyboardEvent) => void): IDisposable => {
@@ -59,7 +46,7 @@ export class QuickInputBox {
 		this.inputBox.value = value;
 	}
 
-	select(range: IRange = null): void {
+	select(range: IRange | null = null): void {
 		this.inputBox.select(range);
 	}
 
@@ -87,6 +74,14 @@ export class QuickInputBox {
 		this.inputBox.setEnabled(enabled);
 	}
 
+	setAttribute(name: string, value: string) {
+		this.inputBox.inputElement.setAttribute(name, value);
+	}
+
+	removeAttribute(name: string) {
+		this.inputBox.inputElement.removeAttribute(name);
+	}
+
 	showDecoration(decoration: Severity): void {
 		if (decoration === Severity.Ignore) {
 			this.inputBox.hideMessage();
@@ -109,10 +104,13 @@ export class QuickInputBox {
 			inputBackground: theme.getColor(inputBackground),
 			inputBorder: theme.getColor(inputBorder),
 			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
+			inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
 			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
 			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
+			inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
 			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
 			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
+			inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
 			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder),
 		});
 	}