From dc2c952bf55b0ddcd3e9bc1b134292a5ca59892f Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 22 Aug 2023 14:37:56 +0200
Subject: [PATCH] cleaning the code

---
 .../stickyScroll/browser/stickyScroll.css     | 14 ++++++++
 .../browser/stickyScrollWidget.ts             | 35 ++++---------------
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index 8b1c053ad78..9de5247eaea 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -33,6 +33,20 @@
 	background-color: inherit;
 }
 
+.monaco-editor .sticky-line-number .folding-icon {
+	width: 18px;
+	height: 18px;
+	float: right;
+	opacity: 0;
+	cursor: default;
+}
+
+.monaco-editor .sticky-line-number .folding-icon:hover {
+	opacity: 1;
+	transition : opacity 250ms linear;
+	cursor: pointer;
+}
+
 .monaco-editor .sticky-line-content {
 	width: var(--vscode-editorStickyScroll-scrollableWidth);
 	background-color: inherit;
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index 389df12346d..f50b25e1059 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -34,7 +34,7 @@ const STICKY_LINE_INDEX_ATTR = 'data-sticky-line-index';
 
 export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 
-	private readonly _disposableStore = new DisposableStore();
+	private readonly _foldingIconStore = new DisposableStore();
 	private readonly _rootDomNode: HTMLElement = document.createElement('div');
 	private readonly _lineNumbersDomNode: HTMLElement = document.createElement('div');
 	private readonly _linesDomNodeScrollable: HTMLElement = document.createElement('div');
@@ -265,6 +265,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	}
 
 	private _renderFoldingIconForLine(container: HTMLSpanElement, foldingModel: FoldingModel | null, index: number, line: number): void {
+		this._foldingIconStore.dispose();
 		if (!foldingModel) {
 			return;
 		}
@@ -276,48 +277,26 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		if (!isFoldingScope) {
 			return;
 		}
-
 		const foldingIcon = document.createElement('div');
 		container.append(foldingIcon);
-		foldingIcon.classList.add('unfold-icon');
-		foldingIcon.style.float = 'right';
 		const isRegionCollapsed = foldingRegions.isCollapsed(indexOfFoldingRegion);
 		if (isRegionCollapsed) {
 			foldingIcon.className = ThemeIcon.asClassName(foldingCollapsedIcon);
 		} else {
 			foldingIcon.className = ThemeIcon.asClassName(foldingExpandedIcon);
 		}
-
-		foldingIcon.style.opacity = '0';
-		foldingIcon.style.height = '0px';
-
-		this._disposableStore.add(dom.addDisposableListener(foldingIcon, dom.EventType.CLICK, () => {
+		foldingIcon.classList.add('folding-icon');
+		this._foldingIconStore.add(dom.addDisposableListener(foldingIcon, dom.EventType.CLICK, () => {
 			toggleCollapseState(foldingModel, Number.MAX_VALUE, [line]);
-
 			const lineHeight = this._editor.getOption(EditorOption.lineHeight);
-			const topOfStart = this._editor.getTopForLineNumber(startLineNumber) - lineHeight * (index) + 1;
-			const topOfEnd = this._editor.getTopForLineNumber(endLineNumber) - lineHeight * (index) + 1;
-			const newHeight = isRegionCollapsed ? topOfStart : topOfEnd;
-			this._editor.setScrollTop(newHeight);
+			const topOfStartLine = this._editor.getTopForLineNumber(startLineNumber) - lineHeight * index + 1;
+			const topOfEndLine = this._editor.getTopForLineNumber(endLineNumber) - lineHeight * index + 1;
+			this._editor.setScrollTop(isRegionCollapsed ? topOfStartLine : topOfEndLine);
 			const editorDomNode = this._editor.getDomNode();
 			if (editorDomNode) {
 				editorDomNode.style.cursor = 'pointer';
 			}
 		}));
-		this._disposableStore.add(dom.addDisposableListener(container, dom.EventType.MOUSE_OVER, () => {
-			console.log('inside of mouse over');
-			foldingIcon.style.opacity = '1';
-			foldingIcon.style.height = '18px';
-			foldingIcon.style.width = '18px';
-			foldingIcon.style.cursor = 'pointer';
-		}));
-		this._disposableStore.add(dom.addDisposableListener(container, dom.EventType.MOUSE_OUT, () => {
-			console.log('inside of mouse out');
-			foldingIcon.style.transition = 'opacity 250ms linear';
-			foldingIcon.style.opacity = '0';
-			foldingIcon.style.height = '0px';
-			foldingIcon.style.cursor = 'default';
-		}));
 	}
 
 	private _updateMinContentWidth() {