Merge pull request #39501 from danrpinho/highlight_brackets_scrollbar

Adds bracket highlighting in scrollbar, fixes issue #16228
microsoft · Jan 24, 2018 · ad6067a · ad6067a
2 parents 1b54baf + 8c81274
commit ad6067a
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
@@ -16,11 +16,14 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { EditorAction, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { TrackedRangeStickiness, IModelDeltaDecoration, OverviewRulerLane } from 'vs/editor/common/model';
+
+const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
 
 class JumpToBracketAction extends EditorAction {
 	constructor() {
@@ -214,7 +217,12 @@ export class BracketMatchingController extends Disposable implements editorCommo
 
 	private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'bracket-match'
+		className: 'bracket-match',
+		overviewRuler: {
+			color: themeColorFromId(overviewRulerBracketMatchForeground),
+			darkColor: themeColorFromId(overviewRulerBracketMatchForeground),
+			position: OverviewRulerLane.Center
+		}
 	});
 
 	private _updateBrackets(): void {