Merge pull request microsoft#158369 from microsoft/aiday/refactoringStickyScroll

Refactoring sticky scroll

Author: Aiday Marlen Kyzy

src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { localize } from 'vs/nls';
+import { Action2, MenuId } from 'vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+
+export class ToggleStickyScroll extends Action2 {
+
+	constructor() {
+		super({
+			id: 'editor.action.toggleStickyScroll',
+			title: {
+				value: localize('toggleStickyScroll', "Toggle Sticky Scroll"),
+				mnemonicTitle: localize('miStickyScroll', "&&Sticky Scroll"),
+				original: 'Toggle Sticky Scroll',
+			},
+			// Hardcoding due to import violation
+			category: { value: localize('view', "View"), original: 'View' },
+			toggled: ContextKeyExpr.equals('config.editor.experimental.stickyScroll.enabled', true),
+			menu: [
+				{ id: MenuId.CommandPalette },
+				{ id: MenuId.MenubarViewMenu, group: '5_editor', order: 6 },
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const configurationService = accessor.get(IConfigurationService);
+		const newValue = !configurationService.getValue('editor.experimental.stickyScroll.enabled');
+		return configurationService.updateValue('editor.experimental.stickyScroll.enabled', newValue);
+	}
+}

src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.ts

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { ToggleStickyScroll } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollActions';
+import { StickyScrollController } from 'vs/editor/contrib/stickyScroll/browser/stickyScrollController';
+import { registerAction2 } from 'vs/platform/actions/common/actions';
+
+registerEditorContribution(StickyScrollController.ID, StickyScrollController);
+registerAction2(ToggleStickyScroll);

src/vs/editor/contrib/stickyScroll/browser/stickyScroll.ts renamed to src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts

@@ -5,19 +5,15 @@
 
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { EditorOption, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget';
 import { StickyLineCandidateProvider, StickyRange } from './stickyScrollProvider';
 import { IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { localize } from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
-class StickyScrollController extends Disposable implements IEditorContribution {
+
+export class StickyScrollController extends Disposable implements IEditorContribution {
 
 	static readonly ID = 'store.contrib.stickyScrollController';
 	private readonly editor: ICodeEditor;
@@ -140,33 +136,3 @@ class StickyScrollController extends Disposable implements IEditorContribution {
 		this.sessionStore.dispose();
 	}
 }
-
-registerEditorContribution(StickyScrollController.ID, StickyScrollController);
-
-registerAction2(class ToggleStickyScroll extends Action2 {
-
-	constructor() {
-		super({
-			id: 'editor.action.toggleStickyScroll',
-			title: {
-				value: localize('toggleStickyScroll', "Toggle Sticky Scroll"),
-				mnemonicTitle: localize('miStickyScroll', "&&Sticky Scroll"),
-				original: 'Toggle Sticky Scroll',
-			},
-			// Hardcoding due to import violation
-			category: { value: localize('view', "View"), original: 'View' },
-			toggled: ContextKeyExpr.equals('config.editor.experimental.stickyScroll.enabled', true),
-			menu: [
-				{ id: MenuId.CommandPalette },
-				{ id: MenuId.MenubarViewMenu, group: '5_editor', order: 6 },
-			]
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const configurationService = accessor.get(IConfigurationService);
-		const newValue = !configurationService.getValue('editor.experimental.stickyScroll.enabled');
-		return configurationService.updateValue('editor.experimental.stickyScroll.enabled', newValue);
-	}
-});
-

src/vs/editor/editor.all.ts

@@ -41,7 +41,7 @@ import 'vs/editor/contrib/links/browser/links';
 import 'vs/editor/contrib/multicursor/browser/multicursor';
 import 'vs/editor/contrib/parameterHints/browser/parameterHints';
 import 'vs/editor/contrib/rename/browser/rename';
-import 'vs/editor/contrib/stickyScroll/browser/stickyScroll';
+import 'vs/editor/contrib/stickyScroll/browser/stickyScrollContribution';
 import 'vs/editor/contrib/smartSelect/browser/smartSelect';
 import 'vs/editor/contrib/snippet/browser/snippetController2';
 import 'vs/editor/contrib/suggest/browser/suggestController';