Skip to content

Commit 03aad5f

Browse files
andyleejordanandyleejordan
committed
Enable ESLint explicit-function-return-type
And fix violations.
1 parent 03160f1 commit 03aad5f

28 files changed

+106
-99
lines changed

‎.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"error",
3737
"always"
3838
],
39+
"@typescript-eslint/explicit-function-return-type": [
40+
"error"
41+
],
3942
"@typescript-eslint/no-floating-promises": [
4043
"error",
4144
{

‎src/features/CodeActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ export class CodeActionsFeature implements vscode.Disposable {
3030
});
3131
}
3232

33-
public dispose() {
33+
public dispose(): void {
3434
this.applyEditsCommand.dispose();
3535
this.showDocumentationCommand.dispose();
3636
}
3737

38-
public async showRuleDocumentation(ruleId: string) {
38+
public async showRuleDocumentation(ruleId: string): Promise<void> {
3939
const pssaDocBaseURL = "https://docs.microsoft.com/powershell/utility-modules/psscriptanalyzer/rules/";
4040

4141
if (!ruleId) {

‎src/features/Console.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export class ConsoleFeature extends LanguageClientConsumer {
213213
];
214214
}
215215

216-
public dispose() {
216+
public dispose(): void {
217217
for (const command of this.commands) {
218218
command.dispose();
219219
}
@@ -222,7 +222,7 @@ export class ConsoleFeature extends LanguageClientConsumer {
222222
}
223223
}
224224

225-
public override setLanguageClient(languageClient: LanguageClient) {
225+
public override setLanguageClient(languageClient: LanguageClient): void {
226226
this.languageClient = languageClient;
227227
this.handlers = [
228228
this.languageClient.onRequest(

‎src/features/CustomViews.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ export class CustomViewsFeature extends LanguageClientConsumer {
2121
this.contentProvider));
2222
}
2323

24-
public dispose() {
24+
public dispose(): void {
2525
for (const command of this.commands) {
2626
command.dispose();
2727
}
2828
}
2929

30-
public override setLanguageClient(languageClient: LanguageClient) {
30+
public override setLanguageClient(languageClient: LanguageClient): void {
3131

3232
languageClient.onRequest(
3333
NewCustomViewRequestType,
@@ -81,7 +81,7 @@ class PowerShellContentProvider implements vscode.TextDocumentContentProvider {
8181
return this.viewIndex[uri.toString()].getContent();
8282
}
8383

84-
public createView(id: string, title: string, viewType: CustomViewType) {
84+
public createView(id: string, title: string, viewType: CustomViewType): void {
8585
let view;
8686
switch (viewType) {
8787
case CustomViewType.HtmlContent:
@@ -91,12 +91,12 @@ class PowerShellContentProvider implements vscode.TextDocumentContentProvider {
9191
this.viewIndex[this.getUri(view.id)] = view;
9292
}
9393

94-
public showView(id: string, viewColumn: vscode.ViewColumn) {
94+
public showView(id: string, viewColumn: vscode.ViewColumn): void {
9595
const uriString = this.getUri(id);
9696
(this.viewIndex[uriString] as HtmlContentView).showContent(viewColumn);
9797
}
9898

99-
public closeView(id: string) {
99+
public closeView(id: string): void {
100100
const uriString = this.getUri(id);
101101

102102
vscode.workspace.textDocuments.some((doc) => {
@@ -110,23 +110,23 @@ class PowerShellContentProvider implements vscode.TextDocumentContentProvider {
110110
});
111111
}
112112

113-
public setHtmlContentView(id: string, content: IHtmlContent) {
113+
public setHtmlContentView(id: string, content: IHtmlContent): void {
114114
const uriString = this.getUri(id);
115115
const view: CustomView = this.viewIndex[uriString];
116116

117117
(view as HtmlContentView).setContent(content);
118118
this.didChangeEvent.fire(vscode.Uri.parse(uriString));
119119
}
120120

121-
public appendHtmlOutputView(id: string, content: string) {
121+
public appendHtmlOutputView(id: string, content: string): void {
122122
const uriString = this.getUri(id);
123123
const view: CustomView = this.viewIndex[uriString];
124124

125125
(view as HtmlContentView).appendContent(content);
126126
this.didChangeEvent.fire(vscode.Uri.parse(uriString));
127127
}
128128

129-
private getUri(id: string) {
129+
private getUri(id: string): string {
130130
return `powershell://views/${id}`;
131131
}
132132
}
@@ -158,11 +158,11 @@ class HtmlContentView extends CustomView {
158158
super(id, title, CustomViewType.HtmlContent);
159159
}
160160

161-
public setContent(htmlContent: IHtmlContent) {
161+
public setContent(htmlContent: IHtmlContent): void {
162162
this.htmlContent = htmlContent;
163163
}
164164

165-
public appendContent(content: string) {
165+
public appendContent(content: string): void {
166166
this.htmlContent.bodyContent += content;
167167
}
168168

‎src/features/DebugSession.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ export class DebugSessionFeature extends LanguageClientConsumer
9191
return new vscode.DebugAdapterNamedPipeServer(sessionDetails.debugServicePipeName);
9292
}
9393

94-
public dispose() {
94+
public dispose(): void {
9595
for (const handler of this.handlers) {
9696
handler.dispose();
9797
}
9898
}
9999

100-
public override setLanguageClient(languageClient: LanguageClient) {
100+
public override setLanguageClient(languageClient: LanguageClient): void {
101101
this.handlers = [
102102
languageClient.onNotification(
103103
StartDebuggerNotificationType,
@@ -308,7 +308,7 @@ export class SpecifyScriptArgsFeature implements vscode.Disposable {
308308
});
309309
}
310310

311-
public dispose() {
311+
public dispose(): void {
312312
this.command.dispose();
313313
}
314314

@@ -369,7 +369,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
369369
});
370370
}
371371

372-
public override setLanguageClient(languageClient: LanguageClient) {
372+
public override setLanguageClient(languageClient: LanguageClient): void {
373373
this.languageClient = languageClient;
374374

375375
if (this.waitingForClientToken && this.getLanguageClientResolve) {
@@ -378,7 +378,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
378378
}
379379
}
380380

381-
public dispose() {
381+
public dispose(): void {
382382
this.command.dispose();
383383
}
384384

@@ -456,7 +456,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
456456
return item ? `${item.pid}` : undefined;
457457
}
458458

459-
private clearWaitingToken() {
459+
private clearWaitingToken(): void {
460460
this.waitingForClientToken?.dispose();
461461
this.waitingForClientToken = undefined;
462462
}
@@ -494,7 +494,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
494494
}, this);
495495
}
496496

497-
public override setLanguageClient(languageClient: LanguageClient) {
497+
public override setLanguageClient(languageClient: LanguageClient): void {
498498
this.languageClient = languageClient;
499499

500500
if (this.waitingForClientToken && this.getLanguageClientResolve) {
@@ -503,7 +503,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
503503
}
504504
}
505505

506-
public dispose() {
506+
public dispose(): void {
507507
this.command.dispose();
508508
}
509509

@@ -572,7 +572,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
572572
return item ? `${item.id}` : undefined;
573573
}
574574

575-
private clearWaitingToken() {
575+
private clearWaitingToken(): void {
576576
this.waitingForClientToken?.dispose();
577577
this.waitingForClientToken = undefined;
578578
}

‎src/features/Examples.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class ExamplesFeature implements vscode.Disposable {
1919
});
2020
}
2121

22-
public dispose() {
22+
public dispose(): void {
2323
this.command.dispose();
2424
}
2525
}

‎src/features/ExpandAlias.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class ExpandAliasFeature extends LanguageClientConsumer {
5353
});
5454
}
5555

56-
public dispose() {
56+
public dispose(): void {
5757
this.command.dispose();
5858
}
5959
}

‎src/features/ExtensionCommands.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
198198
];
199199
}
200200

201-
public override setLanguageClient(languageclient: LanguageClient) {
201+
public override setLanguageClient(languageClient: LanguageClient): void {
202202
// Clear the current list of extension commands since they were
203203
// only relevant to the previous session
204204
this.extensionCommands = [];
205205

206-
this.languageClient = languageclient;
206+
this.languageClient = languageClient;
207207

208208
this.handlers = [
209209
this.languageClient.onNotification(
@@ -267,7 +267,7 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
267267
];
268268
}
269269

270-
public dispose() {
270+
public dispose(): void {
271271
for (const command of this.commands) {
272272
command.dispose();
273273
}
@@ -276,7 +276,7 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
276276
}
277277
}
278278

279-
private addExtensionCommand(command: IExtensionCommandAddedNotificationBody) {
279+
private addExtensionCommand(command: IExtensionCommandAddedNotificationBody): void {
280280
this.extensionCommands.push({
281281
name: command.name,
282282
displayName: command.displayName,
@@ -311,7 +311,7 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
311311

312312
private async onCommandSelected(
313313
chosenItem: IExtensionCommandQuickPickItem | undefined,
314-
client: LanguageClient | undefined) {
314+
client: LanguageClient | undefined): Promise<void> {
315315

316316
if (chosenItem !== undefined) {
317317
await client?.sendRequest(

‎src/features/ExternalApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class ExternalApiFeature extends LanguageClientConsumer implements IPower
173173
return this.extensionContext.globalStorageUri.with({ scheme: "file"});
174174
}
175175

176-
public dispose() {
176+
public dispose(): void {
177177
// Nothing to dispose.
178178
}
179179
}

‎src/features/GenerateBugReport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class GenerateBugReportFeature implements vscode.Disposable {
2525
});
2626
}
2727

28-
public dispose() {
28+
public dispose(): void {
2929
this.command.dispose();
3030
}
3131

‎src/features/GetCommands.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ export class GetCommandsFeature extends LanguageClientConsumer {
5050
});
5151
}
5252

53-
public dispose() {
53+
public dispose(): void {
5454
for (const command of this.commands) {
5555
command.dispose();
5656
}
5757
}
5858

59-
public override setLanguageClient(languageclient: LanguageClient) {
60-
this.languageClient = languageclient;
59+
public override setLanguageClient(languageClient: LanguageClient): void {
60+
this.languageClient = languageClient;
6161
if (this.commandsExplorerTreeView.visible) {
6262
void vscode.commands.executeCommand("PowerShell.RefreshCommandsExplorer");
6363
}
6464
}
6565

66-
private async CommandExplorerRefresh() {
66+
private async CommandExplorerRefresh(): Promise<void> {
6767
if (this.languageClient === undefined) {
6868
this.logger.writeVerbose(`<${GetCommandsFeature.name}>: Unable to send getCommand request`);
6969
return;
@@ -77,7 +77,7 @@ export class GetCommandsFeature extends LanguageClientConsumer {
7777
});
7878
}
7979

80-
private async InsertCommand(item: { Name: string; }) {
80+
private async InsertCommand(item: { Name: string; }): Promise<void> {
8181
const editor = vscode.window.activeTextEditor;
8282
if (editor === undefined) {
8383
return;

‎src/features/HelpCompletion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ export class HelpCompletionFeature extends LanguageClientConsumer {
3939
}
4040
}
4141

42-
public dispose() {
42+
public dispose(): void {
4343
this.disposable?.dispose();
4444
}
4545

46-
public override setLanguageClient(languageClient: LanguageClient) {
46+
public override setLanguageClient(languageClient: LanguageClient): void {
4747
this.languageClient = languageClient;
4848
if (this.helpCompletionProvider) {
4949
this.helpCompletionProvider.languageClient = languageClient;

‎src/features/ISECompatibility.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ export class ISECompatibilityFeature implements vscode.Disposable {
4242
];
4343
}
4444

45-
public dispose() {
45+
public dispose(): void {
4646
for (const command of this._commandRegistrations) {
4747
command.dispose();
4848
}
4949
}
5050

51-
private async EnableISEMode() {
51+
private async EnableISEMode(): Promise<void> {
5252
this._iseModeEnabled = true;
5353
for (const iseSetting of ISECompatibilityFeature.settings) {
5454
try {
@@ -73,7 +73,7 @@ export class ISECompatibilityFeature implements vscode.Disposable {
7373
}
7474
}
7575

76-
private async DisableISEMode() {
76+
private async DisableISEMode(): Promise<void> {
7777
this._iseModeEnabled = false;
7878
for (const iseSetting of ISECompatibilityFeature.settings) {
7979
const config = vscode.workspace.getConfiguration(iseSetting.path);
@@ -84,7 +84,7 @@ export class ISECompatibilityFeature implements vscode.Disposable {
8484
}
8585
}
8686

87-
private async ToggleISEMode() {
87+
private async ToggleISEMode(): Promise<void> {
8888
if (this._iseModeEnabled) {
8989
await this.DisableISEMode();
9090
} else {

0 commit comments

Comments
 (0)