Error decoration (#48116)

microsoft · Apr 23, 2018 · adbdec9 · adbdec9
1 parent a8633b2
commit adbdec9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -32,6 +32,7 @@ import { chain, debounceEvent } from 'vs/base/common/event';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { onUnexpectedError, canceled } from 'vs/base/common/errors';
+import Severity from 'vs/base/common/severity';
 
 const $ = dom.$;
 
@@ -142,6 +143,7 @@ class TextInputController implements InputController<string> {
 				this.updatedValidation()
 					.then(validationError => {
 						ui.message.textContent = validationError || defaultMessage;
+						ui.inputBox.showDecoration(validationError ? Severity.Error : Severity.Ignore);
 					})
 					.then(null, onUnexpectedError);
 			}));
@@ -408,6 +410,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.controller = parameters.type === 'selectMany' ? new SelectManyController(this.ui, parameters) : new TextInputController(this.ui, parameters);
 		this.ui.checkAll.style.display = this.controller.showUI.checkAll ? null : 'none';
 		this.filterContainer.style.display = this.controller.showUI.inputBox ? null : 'none';
+		this.ui.inputBox.showDecoration(Severity.Ignore);
 		this.countContainer.style.display = this.controller.showUI.count ? null : 'none';
 		this.okContainer.style.display = this.controller.showUI.ok ? null : 'none';
 		this.ui.message.style.display = this.controller.showUI.message ? null : 'none';

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -7,12 +7,13 @@
 
 import 'vs/css!./quickInput';
 import * as dom from 'vs/base/browser/dom';
-import { InputBox, IRange } from 'vs/base/browser/ui/inputbox/inputBox';
+import { InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { localize } from 'vs/nls';
-import { inputBackground, inputForeground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
+import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, 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';
+import Severity from 'vs/base/common/severity';
 
 const $ = dom.$;
 
@@ -70,6 +71,14 @@ export class QuickInputBox {
 		this.inputBox.inputElement.type = isPassword ? 'password' : 'text';
 	}
 
+	showDecoration(decoration: Severity): void {
+		if (decoration === Severity.Ignore) {
+			this.inputBox.hideMessage();
+		} else {
+			this.inputBox.showMessage({ type: decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR, content: '' });
+		}
+	}
+
 	setFocus(): void {
 		this.inputBox.focus();
 	}
@@ -82,7 +91,13 @@ export class QuickInputBox {
 		this.inputBox.style({
 			inputForeground: theme.getColor(inputForeground),
 			inputBackground: theme.getColor(inputBackground),
-			inputBorder: theme.getColor(inputBorder)
+			inputBorder: theme.getColor(inputBorder),
+			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
+			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
+			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
+			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
+			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
+			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder),
 		});
 	}