Skip to content

Commit f53142d

Browse files
committed
return properly
1 parent 3710b4e commit f53142d

File tree

6 files changed

+38
-36
lines changed

6 files changed

+38
-36
lines changed

src/features/codeLensProvider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
123123
try {
124124
let result = await serverUtils.findUsages(this._server, request, token);
125125
if (!result || !result.QuickFixes) {
126-
return;
126+
return undefined;
127127
}
128128

129129
const quickFixes = result.QuickFixes;
@@ -138,7 +138,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
138138
return codeLens;
139139
}
140140
catch (error) {
141-
return;
141+
return undefined;
142142
}
143143
}
144144

@@ -159,7 +159,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
159159
projectInfo = await serverUtils.requestProjectInformation(this._server, { FileName: codeLens.fileName });
160160
}
161161
catch (error) {
162-
return;
162+
return undefined;
163163
}
164164

165165
// We do not support running all tests on legacy projects.

src/features/dotnetTest.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ export default class TestManager extends AbstractProvider {
122122
return response.Results;
123123
}
124124
catch (error) {
125-
return;
125+
return undefined;
126126
}
127127
}
128128

129-
private async _recordRunAndGetFrameworkVersion(fileName: string, testFrameworkName: string) {
129+
private async _recordRunAndGetFrameworkVersion(fileName: string, testFrameworkName: string): Promise<string>{
130130

131131
await this._saveDirtyFiles();
132132
this._recordRunRequest(testFrameworkName);
@@ -135,7 +135,7 @@ export default class TestManager extends AbstractProvider {
135135
projectInfo = await serverUtils.requestProjectInformation(this._server, { FileName: fileName });
136136
}
137137
catch (error) {
138-
return;
138+
return undefined;
139139
}
140140

141141
let targetFrameworkVersion: string;
@@ -318,7 +318,7 @@ export default class TestManager extends AbstractProvider {
318318
projectInfo = await serverUtils.requestProjectInformation(this._server, { FileName: fileName });
319319
}
320320
catch (error) {
321-
return;
321+
return undefined;
322322
}
323323

324324
let debugType: string;

src/features/renameProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default class OmnisharpRenameProvider extends AbstractSupport implements
2121
let response = await serverUtils.rename(this._server, req, token);
2222

2323
if (!response) {
24-
return;
24+
return undefined;
2525
}
2626

2727
const edit = new WorkspaceEdit();
@@ -37,7 +37,7 @@ export default class OmnisharpRenameProvider extends AbstractSupport implements
3737
return edit;
3838
}
3939
catch (error) {
40-
return;
40+
return undefined;
4141
}
4242
}
4343
}

src/features/signatureHelpProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default class OmniSharpSignatureHelpProvider extends AbstractSupport impl
4444
return ret;
4545
}
4646
catch (error) {
47-
return;
47+
return undefined;
4848
}
4949
}
5050

src/features/structureProvider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ export class StructureProvider extends AbstractSupport implements FoldingRangePr
2323

2424
return ranges;
2525
}
26-
catch (error) { }
27-
28-
return [];
26+
catch (error) {
27+
return [];
28+
}
2929
}
3030

3131
GetType(type: string): FoldingRangeKind {

src/observers/DotnetTestLoggerObserver.ts

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,33 @@ export default class DotNetTestLoggerObserver extends BaseLoggerObserver {
7070
}
7171

7272
private handleReportDotnetTestResults(event: ReportDotNetTestResults) {
73-
this.logger.appendLine("----- Test Execution Summary -----");
74-
this.logger.appendLine('');
75-
76-
// Omnisharp returns null results if there are build failures
77-
const results = event.results || [];
78-
const totalTests = results.length;
79-
80-
let totalPassed = 0, totalFailed = 0, totalSkipped = 0;
81-
for (let result of results) {
82-
this.logTestResult(result);
83-
switch (result.Outcome) {
84-
case protocol.V2.TestOutcomes.Failed:
85-
totalFailed += 1;
86-
break;
87-
case protocol.V2.TestOutcomes.Passed:
88-
totalPassed += 1;
89-
break;
90-
case protocol.V2.TestOutcomes.Skipped:
91-
totalSkipped += 1;
92-
break;
73+
if (event.results) {
74+
this.logger.appendLine("----- Test Execution Summary -----");
75+
this.logger.appendLine('');
76+
77+
// Omnisharp returns null results if there are build failures
78+
const results = event.results;
79+
const totalTests = results.length;
80+
81+
let totalPassed = 0, totalFailed = 0, totalSkipped = 0;
82+
for (let result of results) {
83+
this.logTestResult(result);
84+
switch (result.Outcome) {
85+
case protocol.V2.TestOutcomes.Failed:
86+
totalFailed += 1;
87+
break;
88+
case protocol.V2.TestOutcomes.Passed:
89+
totalPassed += 1;
90+
break;
91+
case protocol.V2.TestOutcomes.Skipped:
92+
totalSkipped += 1;
93+
break;
94+
}
9395
}
94-
}
9596

96-
this.logger.appendLine(`Total tests: ${totalTests}. Passed: ${totalPassed}. Failed: ${totalFailed}. Skipped: ${totalSkipped}`);
97-
this.logger.appendLine('');
97+
this.logger.appendLine(`Total tests: ${totalTests}. Passed: ${totalPassed}. Failed: ${totalFailed}. Skipped: ${totalSkipped}`);
98+
this.logger.appendLine('');
99+
}
98100
}
99101

100102
private logTestResult(result: protocol.V2.DotNetTestResult) {

0 commit comments

Comments
 (0)