Skip to content

Commit bcaf1de

Browse files
committed
(maint) Move feature activation earlier
1 parent d2eba9c commit bcaf1de

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/extension.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
'use strict';
22

3-
import * as vscode from 'vscode';
43
import * as fs from 'fs';
5-
4+
import * as vscode from 'vscode';
65
import { ConnectionConfiguration } from './configuration';
7-
import { ConnectionHandler } from './handler';
8-
import { StdioConnectionHandler } from './handlers/stdio';
9-
import { TcpConnectionHandler } from './handlers/tcp';
106
import { IFeature } from './feature';
7+
import { BoltFeature } from './feature/BoltFeature';
118
import { DebuggingFeature } from './feature/DebuggingFeature';
129
import { FormatDocumentFeature } from './feature/FormatDocumentFeature';
1310
import { NodeGraphFeature } from './feature/NodeGraphFeature';
1411
import { PDKFeature } from './feature/PDKFeature';
1512
import { PuppetResourceFeature } from './feature/PuppetResourceFeature';
16-
import { ProtocolType, ConnectionType, IConnectionConfiguration } from './interfaces';
13+
import { ConnectionHandler } from './handler';
14+
import { DockerConnectionHandler } from './handlers/docker';
15+
import { StdioConnectionHandler } from './handlers/stdio';
16+
import { TcpConnectionHandler } from './handlers/tcp';
17+
import { ConnectionType, IConnectionConfiguration, ProtocolType } from './interfaces';
1718
import { ILogger } from './logging';
1819
import { OutputChannelLogger } from './logging/outputchannel';
1920
import { PuppetStatusBar } from './PuppetStatusBar';
2021
import { ISettings, legacySettings, settingsFromWorkspace } from './settings';
2122
import { Reporter, reporter } from './telemetry/telemetry';
22-
import { DockerConnectionHandler } from './handlers/docker';
23-
import { BoltFeature } from './feature/BoltFeature';
2423

2524
export const puppetLangID = 'puppet'; // don't change this
2625
export const puppetFileLangID = 'puppetfile'; // don't change this
@@ -53,6 +52,11 @@ export function activate(context: vscode.ExtensionContext) {
5352
statusBar = new PuppetStatusBar([puppetLangID, puppetFileLangID], context, logger);
5453
configSettings = new ConnectionConfiguration();
5554

55+
extensionFeatures = [
56+
new PDKFeature(extContext, logger),
57+
new BoltFeature(extContext),
58+
];
59+
5660
if(settings.editorService.enable === false){
5761
notifyEditorServiceDisabled(extContext);
5862
reporter.sendTelemetryEvent('editorServiceDisabled');
@@ -79,14 +83,10 @@ export function activate(context: vscode.ExtensionContext) {
7983
break;
8084
}
8185

82-
extensionFeatures = [
83-
new FormatDocumentFeature(puppetLangID, connectionHandler, settings, logger, extContext),
84-
new NodeGraphFeature(puppetLangID, connectionHandler, logger, extContext),
85-
new PDKFeature(extContext, logger),
86-
new PuppetResourceFeature(extContext, connectionHandler, logger),
87-
new DebuggingFeature(debugType, settings, configSettings, extContext, logger),
88-
new BoltFeature(extContext),
89-
];
86+
extensionFeatures.push(new FormatDocumentFeature(puppetLangID, connectionHandler, settings, logger, extContext));
87+
extensionFeatures.push(new NodeGraphFeature(puppetLangID, connectionHandler, logger, extContext));
88+
extensionFeatures.push(new PuppetResourceFeature(extContext, connectionHandler, logger));
89+
extensionFeatures.push(new DebuggingFeature(debugType, settings, configSettings, extContext, logger));
9090
}
9191

9292
export function deactivate() {

0 commit comments

Comments
 (0)