Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-04 10:22:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing

Browse Source
This commit is contained in:
Aiday Marlen Kyzy
2023-06-01 15:06:10 +02:00
parent 0479e057c1
commit 9aba21b6aa
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+23 -4
View File
@@ -26,6 +26,7 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua
import { ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
import * as dom from 'vs/base/browser/dom';
import { StickyRange } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollElement';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
interface CustomMouseEvent {
detail: string;
@@ -76,7 +77,8 @@ export class StickyScrollController extends Disposable implements IEditorContrib
@IInstantiationService private readonly _instaService: IInstantiationService,
@ILanguageConfigurationService _languageConfigurationService: ILanguageConfigurationService,
@ILanguageFeatureDebounceService _languageFeatureDebounceService: ILanguageFeatureDebounceService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@ICodeEditorService private readonly _codeEditorService: ICodeEditorService
) {
super();
this._stickyScrollWidget = new StickyScrollWidget(this._editor);
@@ -297,15 +299,32 @@ export class StickyScrollController extends Disposable implements IEditorContrib
});
}
private _removeStickyWidget(): void {
this._editor.removeOverlayWidget(this._stickyScrollWidget);
this._sessionStore.clear();
this._enabled = false;
}
private _readConfiguration() {
const options = this._editor.getOption(EditorOption.stickyScroll);
if (options.enabled === false) {
this._editor.removeOverlayWidget(this._stickyScrollWidget);
this._sessionStore.clear();
this._enabled = false;
this._removeStickyWidget();
return;
} else if (options.enabled && !this._enabled) {
// Do not render the sticky scroll if the editor is the left side of an inline diff editor
let isLeftSideOfInlineDiffEditor = false;
if (this._editor.getOption(EditorOption.inDiffEditor)) {
for (const diffEditor of this._codeEditorService.listDiffEditors()) {
if (diffEditor.getOriginalEditor() === this._editor && !diffEditor.renderSideBySide) {
isLeftSideOfInlineDiffEditor = true;
}
}
}
if (isLeftSideOfInlineDiffEditor) {
this._removeStickyWidget();
return;
}
// When sticky scroll was just enabled, add the listeners on the sticky scroll
this._editor.addOverlayWidget(this._stickyScrollWidget);
this._sessionStore.add(this._editor.onDidScrollChange(() => this._renderStickyScroll()));