From c1d6a14a6b2ac775c53a5443a59487fa01fb3b42 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 15 Jun 2016 21:41:54 -0700
Subject: [PATCH] set default project on script info when it is queried from
 project

---
 src/server/editorServices.ts | 6 +++++-
 src/server/session.ts        | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index d33461efc20..cd2a720fbc4 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -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() {
diff --git a/src/server/session.ts b/src/server/session.ts
index f9820bc1f4b..d46ed9f6732 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -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);