From 0a20ce4d081163ab2cdfe4b9cd6c6e788a13ecd6 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 20 Dec 2016 14:13:17 +0100
Subject: [PATCH] #17292 - Do not bail out if settings has errors (Ignore
 invalid settings) - Fix mouse over on edit icon

---
 .../workbench/common/editor/rangeDecorations.ts |  3 ++-
 .../preferences/browser/preferencesEditor.ts    | 17 +++++++++++++----
 .../preferences/common/preferencesModels.ts     |  4 ++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/common/editor/rangeDecorations.ts b/src/vs/workbench/common/editor/rangeDecorations.ts
index 6104e528281..b03fca8e56e 100644
--- a/src/vs/workbench/common/editor/rangeDecorations.ts
+++ b/src/vs/workbench/common/editor/rangeDecorations.ts
@@ -62,7 +62,8 @@ export class RangeHighlightDecorations implements IDisposable {
 			this.editor = editor;
 			this.editorDisposables.push(this.editor.onDidChangeCursorPosition((e: editorCommon.ICursorPositionChangedEvent) => {
 				if (
-					e.reason === editorCommon.CursorChangeReason.Explicit
+					e.reason === editorCommon.CursorChangeReason.NotSet
+					|| e.reason === editorCommon.CursorChangeReason.Explicit
 					|| e.reason === editorCommon.CursorChangeReason.Undo
 					|| e.reason === editorCommon.CursorChangeReason.Redo
 				) {
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index aaa5c6e4a20..e4a75b3adcf 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -828,16 +828,25 @@ class EditSettingRenderer extends Disposable {
 	}
 
 	private onMouseMoved(mouseMoveEvent: IEditorMouseEvent): void {
-		if (mouseMoveEvent.event.target === this.editPreferenceWidgetForMouseMove.getDomNode() ||
-			mouseMoveEvent.event.target === this.editPreferenceWidgetForCusorPosition.getDomNode()
-		) {
-			this.onMouseOver(this.editPreferenceWidgetForMouseMove);
+		const editPreferenceWidget = this.getEditPreferenceWidgetUnderMouse(mouseMoveEvent);
+		if (editPreferenceWidget) {
+			this.onMouseOver(editPreferenceWidget);
 			return;
 		}
 		this.settingHighlighter.clear();
 		this.toggleEditPreferencesForMouseMoveDelayer.trigger(() => this.toggleEidtPreferenceWidgetForMouseMove(mouseMoveEvent));
 	}
 
+	private getEditPreferenceWidgetUnderMouse(mouseMoveEvent: IEditorMouseEvent): EditPreferenceWidget<ISetting> {
+		if (mouseMoveEvent.event.target === this.editPreferenceWidgetForMouseMove.getDomNode()) {
+			return this.editPreferenceWidgetForMouseMove;
+		}
+		if (mouseMoveEvent.event.target === this.editPreferenceWidgetForCusorPosition.getDomNode()) {
+			return this.editPreferenceWidgetForCusorPosition;
+		}
+		return null;
+	}
+
 	private toggleEidtPreferenceWidgetForMouseMove(mouseMoveEvent: IEditorMouseEvent): void {
 		const settings = mouseMoveEvent.target.position ? this.getSettings(mouseMoveEvent.target.position.lineNumber) : null;
 		if (settings && settings.length) {
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index a06097b1ea8..ecbb54549be 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -261,6 +261,10 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 			},
 			onLiteralValue: onValue,
 			onError: (error) => {
+				const setting = settings[settings.length - 1];
+				if (!setting.range || !setting.keyRange || !setting.valueRange) {
+					settings.pop();
+				}
 			}
 		};
 		visit(model.getValue(), visitor);
-- 
GitLab