Skip to content

Commit fd2ae12

Browse files
committed
Take more recent server version
2 parents 3855ad2 + 20afa76 commit fd2ae12

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4809,4 +4809,4 @@
48094809
}
48104810
]
48114811
}
4812-
}
4812+
}

src/lsptoolshost/roslynLanguageServer.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,18 @@ export class RoslynLanguageServer {
386386
args.push("--telemetryLevel", this.telemetryReporter.telemetryLevel);
387387

388388
let childProcess: cp.ChildProcessWithoutNullStreams;
389+
let cpOptions: cp.SpawnOptionsWithoutStdio = {
390+
detached: true,
391+
windowsHide: true
392+
};
393+
389394
if (serverPath.endsWith('.dll')) {
390395
// If we were given a path to a dll, launch that via dotnet.
391396
const argsWithPath = [ serverPath ].concat(args);
392-
childProcess = cp.spawn('dotnet', argsWithPath);
397+
childProcess = cp.spawn('dotnet', argsWithPath, cpOptions);
393398
} else {
394399
// Otherwise assume we were given a path to an executable.
395-
childProcess = cp.spawn(serverPath, args);
400+
childProcess = cp.spawn(serverPath, args, cpOptions);
396401
}
397402

398403
return childProcess;

src/razor/src/Document/RazorDocumentManager.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class RazorDocumentManager implements IRazorDocumentManager {
5050
// succeed. Without this, even a simple diagnostics request will fail in Roslyn if the user just opens a .razor document
5151
// and leaves it open past the timeout.
5252
if (this.razorDocumentGenerationInitialized) {
53-
await this.ensureProjectedDocumentsOpen(document);
53+
await this.ensureDocumentAndProjectedDocumentsOpen(document);
5454
}
5555

5656
return document;
@@ -306,10 +306,6 @@ export class RazorDocumentManager implements IRazorDocumentManager {
306306
await vscode.workspace.openTextDocument(razorUri);
307307
}
308308

309-
await this.ensureProjectedDocumentsOpen(document);
310-
}
311-
312-
private async ensureProjectedDocumentsOpen(document: IRazorDocument) {
313309
await vscode.workspace.openTextDocument(document.csharpDocument.uri);
314310
await vscode.workspace.openTextDocument(document.htmlDocument.uri);
315311
}

0 commit comments

Comments
 (0)