microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-16 05:58:32 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

set default project on script info when it is queried from project

Browse Source
This commit is contained in:
Vladimir Matveev 2016-06-15 21:41:54 -07:00
parent a063fa5cdb
commit c1d6a14a6b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/editorServices.ts
View File

@ -397,7 +397,11 @@ namespace ts.server {
}
getScriptInfo(fileName: string) {
return this.projectService.getOrCreateScriptInfo(fileName, /*openedByClient*/ false);
const scriptInfo = this.projectService.getOrCreateScriptInfo(fileName, /*openedByClient*/ false);
if (!scriptInfo.defaultProject) {
scriptInfo.defaultProject = this;
}
return scriptInfo;
}
filesToString() {

6
src/server/session.ts
View File

@ -339,7 +339,7 @@ namespace ts.server {
private getSemanticDiagnostics(args: protocol.FileRequestArgs): protocol.DiagnosticWithLinePosition[] {
const file = normalizePath(args.file);
var project = (args.projectFileName && this.projectService.getProject(normalizePath(args.projectFileName))) || this.projectService.getProjectForFile(file);
const project = (args.projectFileName && this.projectService.getProject(normalizePath(args.projectFileName))) || this.projectService.getProjectForFile(file);
if (!project) {
throw Errors.NoProject;
}
@ -1103,10 +1103,6 @@ namespace ts.server {
return { response, responseRequired: true };
}
private canceledResponse() {
return { canceled: true, responseRequired: true };
}
private handlers: Map<(request: protocol.Request) => { response?: any, responseRequired?: boolean }> = {
[CommandNames.OpenExternalProject]: (request: protocol.OpenExternalProjectRequest) => {
this.projectService.openExternalProject(request.arguments);