Skip to content

Commit 875e3a6

Browse files
Don't immediately return promise within newly created promise
1 parent d63892f commit 875e3a6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/omnisharp/launcher.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export interface LaunchResult {
162162
export function launchOmniSharp(details: LaunchDetails): Promise<LaunchResult> {
163163
return new Promise<LaunchResult>((resolve, reject) => {
164164
try {
165-
return launch(details).then(result => {
165+
launch(details).then(result => {
166166
// async error - when target not not ENEOT
167167
result.process.on('error', reject);
168168

@@ -212,7 +212,7 @@ function launchWindows(details: LaunchDetails): Promise<LaunchResult> {
212212
cwd: details.cwd
213213
});
214214

215-
return resolve({
215+
resolve({
216216
process,
217217
command: details.serverPath,
218218
usingMono: false
@@ -239,7 +239,7 @@ function launchNixCoreCLR(details: LaunchDetails): Promise<LaunchResult> {
239239
cwd: details.cwd
240240
});
241241

242-
return resolve({
242+
resolve({
243243
process,
244244
command: details.serverPath,
245245
usingMono: false
@@ -249,7 +249,7 @@ function launchNixCoreCLR(details: LaunchDetails): Promise<LaunchResult> {
249249

250250
function launchNixMono(details: LaunchDetails): Promise<LaunchResult> {
251251
return new Promise<LaunchResult>((resolve, reject) => {
252-
return canLaunchMono().then(() => {
252+
canLaunchMono().then(() => {
253253
let args = details.args.slice(0); // create copy of details.args
254254
args.unshift(details.serverPath);
255255

@@ -271,10 +271,10 @@ function canLaunchMono(): Promise<void> {
271271
return new Promise<void>((resolve, reject) => {
272272
hasMono('>=4.0.1').then(success => {
273273
if (success) {
274-
return resolve();
274+
resolve();
275275
}
276276
else {
277-
return reject(new Error('Cannot start Omnisharp because Mono version >=4.0.1 is required.'));
277+
reject(new Error('Cannot start Omnisharp because Mono version >=4.0.1 is required.'));
278278
}
279279
});
280280
});

0 commit comments

Comments
 (0)