Fix microsoft#60460 - null check uninitialized range on SettingsGroup

roblourens · roblourens · commit 75adca78ca3c · 2018-10-10T11:59:57.000-07:00
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -259,6 +259,10 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
 		if (previousPosition.lineNumber === currentPosition.lineNumber) {
 			return false;
 		}
+		if (!this.settingsGroup.range) {
+			// #60460?
+			return false;
+		}
 		if (currentPosition.lineNumber === this.settingsGroup.range.startLineNumber - 1 || currentPosition.lineNumber === this.settingsGroup.range.startLineNumber - 2) {
 			return true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,10 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {`
`259`	`259`	`if (previousPosition.lineNumber === currentPosition.lineNumber) {`
`260`	`260`	`return false;`
`261`	`261`	`}`
	`262`	`+ if (!this.settingsGroup.range) {`
	`263`	`+ // #60460?`
	`264`	`+ return false;`
	`265`	`+ }`
`262`	`266`	`if (currentPosition.lineNumber === this.settingsGroup.range.startLineNumber - 1 \|\| currentPosition.lineNumber === this.settingsGroup.range.startLineNumber - 2) {`
`263`	`267`	`return true;`
`264`	`268`	`}`