From 6ca137730bd498e0469fb8c647e5fe7677304701 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 6 Feb 2019 11:43:48 -0800
Subject: [PATCH] Extract

---
 .../src/extension.ts                          | 56 ++++++++++++-------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index bd6f3eb4035..544c67be193 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -15,8 +15,8 @@ import MarkdownWorkspaceSymbolProvider from './features/workspaceSymbolProvider'
 import { Logger } from './logger';
 import { MarkdownEngine } from './markdownEngine';
 import { getMarkdownExtensionContributions } from './markdownExtensions';
-import { ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector } from './security';
-import { loadDefaultTelemetryReporter } from './telemetryReporter';
+import { ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector, ContentSecurityPolicyArbiter } from './security';
+import { loadDefaultTelemetryReporter, TelemetryReporter } from './telemetryReporter';
 import { githubSlugifier } from './slugify';
 
 
@@ -31,28 +31,49 @@ export function activate(context: vscode.ExtensionContext) {
 	const engine = new MarkdownEngine(contributions, githubSlugifier);
 	const logger = new Logger();
 
-	const selector: vscode.DocumentSelector = [
-		{ language: 'markdown', scheme: 'file' },
-		{ language: 'markdown', scheme: 'untitled' }
-	];
-
 	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, contributions, logger);
 	const symbolProvider = new MDDocumentSymbolProvider(engine);
 	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions);
 	context.subscriptions.push(previewManager);
 
-	context.subscriptions.push(vscode.languages.setLanguageConfiguration('markdown', {
-		wordPattern: new RegExp('(\\p{Alphabetic}|\\p{Number})+', 'ug'),
+	context.subscriptions.push(registerMarkdownLanguageFeatures(symbolProvider, engine));
+	context.subscriptions.push(registerMarkdownCommands(previewManager, telemetryReporter, cspArbiter, engine));
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
+		logger.updateConfiguration();
+		previewManager.updateConfiguration();
 	}));
-	context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(selector, symbolProvider));
-	context.subscriptions.push(vscode.languages.registerDocumentLinkProvider(selector, new LinkProvider()));
-	context.subscriptions.push(vscode.languages.registerFoldingRangeProvider(selector, new MarkdownFoldingProvider(engine)));
-	context.subscriptions.push(vscode.languages.registerWorkspaceSymbolProvider(new MarkdownWorkspaceSymbolProvider(symbolProvider)));
+}
 
+function registerMarkdownLanguageFeatures(
+	symbolProvider: MDDocumentSymbolProvider,
+	engine: MarkdownEngine
+): vscode.Disposable {
+	const selector: vscode.DocumentSelector = [
+		{ language: 'markdown', scheme: 'file' },
+		{ language: 'markdown', scheme: 'untitled' }
+	];
+
+	return vscode.Disposable.from(
+		vscode.languages.setLanguageConfiguration('markdown', {
+			wordPattern: new RegExp('(\\p{Alphabetic}|\\p{Number})+', 'ug'),
+		}),
+		vscode.languages.registerDocumentSymbolProvider(selector, symbolProvider),
+		vscode.languages.registerDocumentLinkProvider(selector, new LinkProvider()),
+		vscode.languages.registerFoldingRangeProvider(selector, new MarkdownFoldingProvider(engine)),
+		vscode.languages.registerWorkspaceSymbolProvider(new MarkdownWorkspaceSymbolProvider(symbolProvider))
+	);
+}
+
+function registerMarkdownCommands(
+	previewManager: MarkdownPreviewManager,
+	telemetryReporter: TelemetryReporter,
+	cspArbiter: ContentSecurityPolicyArbiter,
+	engine: MarkdownEngine
+): vscode.Disposable {
 	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
 
 	const commandManager = new CommandManager();
-	context.subscriptions.push(commandManager);
 	commandManager.register(new commands.ShowPreviewCommand(previewManager, telemetryReporter));
 	commandManager.register(new commands.ShowPreviewToSideCommand(previewManager, telemetryReporter));
 	commandManager.register(new commands.ShowLockedPreviewToSideCommand(previewManager, telemetryReporter));
@@ -62,9 +83,6 @@ export function activate(context: vscode.ExtensionContext) {
 	commandManager.register(new commands.ShowPreviewSecuritySelectorCommand(previewSecuritySelector, previewManager));
 	commandManager.register(new commands.OpenDocumentLinkCommand(engine));
 	commandManager.register(new commands.ToggleLockCommand(previewManager));
-
-	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
-		logger.updateConfiguration();
-		previewManager.updateConfiguration();
-	}));
+	return commandManager;
 }
+
-- 
GitLab