From b7201a6ed13b7af42304315e47a2045f1d5ba1cc Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 13 Nov 2017 15:20:37 +0100 Subject: [PATCH] [folding] "editor.showFoldingCongrols":"always" not respected. Fixes #35839 --- src/vs/editor/contrib/folding/folding.css | 2 +- src/vs/editor/contrib/folding/folding.ts | 14 ++++++++------ .../editor/contrib/folding/foldingDecorations.ts | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/vs/editor/contrib/folding/folding.css b/src/vs/editor/contrib/folding/folding.css index fbc0462fe35..445f8c05a49 100644 --- a/src/vs/editor/contrib/folding/folding.css +++ b/src/vs/editor/contrib/folding/folding.css @@ -24,7 +24,7 @@ } .monaco-editor .margin-view-overlays:hover .folding, -.monaco-editor.alwaysShowFoldIcons .margin-view-overlays .folding { +.monaco-editor .margin-view-overlays .folding.alwaysShowFoldIcons { opacity: 1; } diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts index 692ce9eaba5..777797b3341 100644 --- a/src/vs/editor/contrib/folding/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -177,12 +177,14 @@ export class FoldingController { } private onModelContentChanged() { - this.foldingModelPromise = this.updateScheduler.trigger(() => { - if (this.foldingModel) { // null if editor has been disposed, or folding turned off - this.foldingModel.update(this.computeRanges(this.foldingModel.textModel)); - } - return this.foldingModel; - }); + if (this.updateScheduler) { + this.foldingModelPromise = this.updateScheduler.trigger(() => { + if (this.foldingModel) { // null if editor has been disposed, or folding turned off + this.foldingModel.update(this.computeRanges(this.foldingModel.textModel)); + } + return this.foldingModel; + }); + } } private onHiddenRangesChanges(hiddenRanges: IRange[]) { diff --git a/src/vs/editor/contrib/folding/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts index fe5f0837c34..b549fcac3c5 100644 --- a/src/vs/editor/contrib/folding/foldingDecorations.ts +++ b/src/vs/editor/contrib/folding/foldingDecorations.ts @@ -18,12 +18,12 @@ export class FoldingDecorationProvider implements IDecorationProvider { private EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({ stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, - linesDecorationsClassName: 'folding autoHide' + linesDecorationsClassName: 'folding' }); private EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({ stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, - linesDecorationsClassName: 'folding' + linesDecorationsClassName: 'folding alwaysShowFoldIcons' }); public autoHideFoldingControls: boolean = true; -- GitLab