Revert "Merge branch 'master' of github.com:Microsoft/vscode"

This reverts commit bf46b6bfba, reversing
changes made to e275a42448.

src/vs/workbench/parts/preferences/browser/settingsTree.ts

@@ -1468,7 +1468,7 @@ export class SettingsTree extends NonExpandableTree {
 			controller,
 			accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),
 			filter: instantiationService.createInstance(SettingsTreeFilter, viewState),
-			styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass),
+			styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass),
 
 			...configuration
 		};

src/vs/workbench/parts/preferences/browser/settingsWidgets.ts

@@ -89,7 +89,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const listSelectBackgroundColor = theme.getColor(listActiveSelectionBackground);
 	if (listSelectBackgroundColor) {
-		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { background-color: ${listSelectBackgroundColor}; }`);
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:focus { background-color: ${listSelectBackgroundColor}; }`);
 	}
 
 	const listInactiveSelectionBackgroundColor = theme.getColor(listInactiveSelectionBackground);
@@ -104,7 +104,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const listSelectForegroundColor = theme.getColor(listActiveSelectionForeground);
 	if (listSelectForegroundColor) {
-		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { color: ${listSelectForegroundColor}; }`);
+		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected { color: ${listSelectForegroundColor}; }`);
 	}
 
 	const codeTextForegroundColor = theme.getColor(textPreformatForeground);
@@ -152,10 +152,6 @@ export class ExcludeSettingListModel {
 		this._selectedIdx = idx;
 	}
 
-	getSelected(): number {
-		return this._selectedIdx;
-	}
-
 	selectNext(): void {
 		if (typeof this._selectedIdx === 'number') {
 			this._selectedIdx = Math.min(this._selectedIdx + 1, this._dataItems.length - 1);
@@ -210,18 +206,12 @@ export class ExcludeSettingWidget extends Disposable {
 				return;
 			}
 
-			const targetIdxStr = element.getAttribute('data-index');
-			if (!targetIdxStr) {
+			const targetIdx = element.getAttribute('data-index');
+			if (!targetIdx) {
 				return;
 			}
 
-			const targetIdx = parseInt(targetIdxStr);
-
-			if (this.model.getSelected() === targetIdx) {
-				return;
-			}
-
-			this.model.select(targetIdx);
+			this.model.select(parseInt(targetIdx));
 			this.renderList();
 			e.preventDefault();
 			e.stopPropagation();

src/vs/workbench/parts/preferences/browser/tocTree.ts

@@ -169,7 +169,7 @@ export class TOCTree extends WorkbenchTree {
 		const fullConfiguration = <ITreeConfiguration>{
 			controller: instantiationService.createInstance(WorkbenchTreeController, { openMode: OpenMode.DOUBLE_CLICK }),
 			filter: instantiationService.createInstance(SettingsTreeFilter, viewState),
-			styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass),
+			styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass),
 			dataSource: instantiationService.createInstance(TOCDataSource),
 			accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),