Remove comments reserved space when commenting is off (microsoft#167165)

Part of microsoft#162352

Author: alexr00

src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts

@@ -399,6 +399,7 @@ export class CommentController implements IEditorContribution {
 				this.registerEditorListeners();
 				this.beginCompute();
 			} else {
+				this.tryUpdateReservedSpace();
 				this.clearEditorListeners();
 				this._commentingRangeDecorator.update(this.editor, []);
 				this._commentThreadRangeDecorator.update(this.editor, []);
@@ -949,13 +950,13 @@ export class CommentController implements IEditorContribution {
 			return hasRanges || (info.threads.length > 0);
 		});
 
-		if (hasCommentsOrRanges && !this._commentingRangeSpaceReserved) {
+		if (hasCommentsOrRanges && !this._commentingRangeSpaceReserved && this.commentService.isCommentingEnabled) {
 			this._workspaceHasCommenting.set(true);
 			this._commentingRangeSpaceReserved = true;
 			const { lineDecorationsWidth, extraEditorClassName } = this.getExistingCommentEditorOptions(this.editor);
 			const newOptions = this.getWithCommentsEditorOptions(this.editor, extraEditorClassName, lineDecorationsWidth);
 			this.updateEditorLayoutOptions(this.editor, newOptions.extraEditorClassName, newOptions.lineDecorationsWidth);
-		} else if (!hasCommentsOrRanges && this._commentingRangeSpaceReserved) {
+		} else if ((!hasCommentsOrRanges || !this.commentService.isCommentingEnabled) && this._commentingRangeSpaceReserved) {
 			this._commentingRangeSpaceReserved = false;
 			const { lineDecorationsWidth, extraEditorClassName } = this.getExistingCommentEditorOptions(this.editor);
 			const newOptions = this.getWithoutCommentsEditorOptions(this.editor, extraEditorClassName, lineDecorationsWidth);