Skip to content

Commit 58cabb7

Browse files
Set extension path during extension activation
1 parent dce4d48 commit 58cabb7

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
"out/": true
1313
},
1414

15-
"tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
15+
"tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
16+
"typescript.tsdk": "./node_modules/typescript/lib"
1617
}

src/main.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {addAssetsIfNecessary, AddAssetResult} from './assets';
2828
import * as vscode from 'vscode';
2929
import TelemetryReporter from 'vscode-extension-telemetry';
3030
import {DefinitionMetadataDocumentProvider} from './features/definitionMetadataDocumentProvider';
31+
import * as util from './common';
3132

3233
export function activate(context: vscode.ExtensionContext): any {
3334

@@ -36,9 +37,11 @@ export function activate(context: vscode.ExtensionContext): any {
3637
const extensionVersion = extension.packageJSON.version;
3738
const aiKey = extension.packageJSON.contributes.debuggers[0].aiKey;
3839

40+
util.setExtensionPath(extension.extensionPath);
41+
3942
const reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
4043

41-
const _selector: vscode.DocumentSelector = {
44+
const documentSelector: vscode.DocumentSelector = {
4245
language: 'csharp',
4346
scheme: 'file' // only files from disk
4447
};
@@ -54,21 +57,21 @@ export function activate(context: vscode.ExtensionContext): any {
5457
definitionMetadataDocumentProvider.register();
5558
localDisposables.push(definitionMetadataDocumentProvider);
5659

57-
localDisposables.push(vscode.languages.registerDefinitionProvider(_selector, new DefinitionProvider(server, definitionMetadataDocumentProvider)));
58-
localDisposables.push(vscode.languages.registerCodeLensProvider(_selector, new CodeLensProvider(server)));
59-
localDisposables.push(vscode.languages.registerDocumentHighlightProvider(_selector, new DocumentHighlightProvider(server)));
60-
localDisposables.push(vscode.languages.registerDocumentSymbolProvider(_selector, new DocumentSymbolProvider(server)));
61-
localDisposables.push(vscode.languages.registerReferenceProvider(_selector, new ReferenceProvider(server)));
62-
localDisposables.push(vscode.languages.registerHoverProvider(_selector, new HoverProvider(server)));
63-
localDisposables.push(vscode.languages.registerRenameProvider(_selector, new RenameProvider(server)));
64-
localDisposables.push(vscode.languages.registerDocumentRangeFormattingEditProvider(_selector, new FormatProvider(server)));
65-
localDisposables.push(vscode.languages.registerOnTypeFormattingEditProvider(_selector, new FormatProvider(server), '}', ';'));
66-
localDisposables.push(vscode.languages.registerCompletionItemProvider(_selector, new CompletionItemProvider(server), '.', '<'));
60+
localDisposables.push(vscode.languages.registerDefinitionProvider(documentSelector, new DefinitionProvider(server, definitionMetadataDocumentProvider)));
61+
localDisposables.push(vscode.languages.registerCodeLensProvider(documentSelector, new CodeLensProvider(server)));
62+
localDisposables.push(vscode.languages.registerDocumentHighlightProvider(documentSelector, new DocumentHighlightProvider(server)));
63+
localDisposables.push(vscode.languages.registerDocumentSymbolProvider(documentSelector, new DocumentSymbolProvider(server)));
64+
localDisposables.push(vscode.languages.registerReferenceProvider(documentSelector, new ReferenceProvider(server)));
65+
localDisposables.push(vscode.languages.registerHoverProvider(documentSelector, new HoverProvider(server)));
66+
localDisposables.push(vscode.languages.registerRenameProvider(documentSelector, new RenameProvider(server)));
67+
localDisposables.push(vscode.languages.registerDocumentRangeFormattingEditProvider(documentSelector, new FormatProvider(server)));
68+
localDisposables.push(vscode.languages.registerOnTypeFormattingEditProvider(documentSelector, new FormatProvider(server), '}', ';'));
69+
localDisposables.push(vscode.languages.registerCompletionItemProvider(documentSelector, new CompletionItemProvider(server), '.', '<'));
6770
localDisposables.push(vscode.languages.registerWorkspaceSymbolProvider(new WorkspaceSymbolProvider(server)));
68-
localDisposables.push(vscode.languages.registerSignatureHelpProvider(_selector, new SignatureHelpProvider(server), '(', ','));
71+
localDisposables.push(vscode.languages.registerSignatureHelpProvider(documentSelector, new SignatureHelpProvider(server), '(', ','));
6972
const codeActionProvider = new CodeActionProvider(server);
7073
localDisposables.push(codeActionProvider);
71-
localDisposables.push(vscode.languages.registerCodeActionsProvider(_selector, codeActionProvider));
74+
localDisposables.push(vscode.languages.registerCodeActionsProvider(documentSelector, codeActionProvider));
7275
localDisposables.push(reportDiagnostics(server, advisor));
7376
localDisposables.push(forwardChanges(server));
7477
}));

0 commit comments

Comments
 (0)