From 80c67db75bc811b8cd57374856ed54d4da7036c0 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sat, 6 Dec 2014 21:23:54 -0800
Subject: [PATCH 1/4] add error\trace message that should be exposed by the
 host

---
 src/services/services.ts | 2 ++
 src/services/shims.ts    | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/services/services.ts b/src/services/services.ts
index 980b7ecda3d..1d5418aff75 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -865,6 +865,8 @@ module ts {
 
     export interface Logger {
         log(s: string): void;
+        trace(s: string): void;
+        error(s: string): void;
     }
 
     //
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 5556743830f..a79948a3121 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -341,6 +341,14 @@ module ts {
             this.shimHost.log(s);
         }
 
+        public trace(s: string): void {
+            this.shimHost.trace(s);
+        }
+        
+        public error(s: string): void {
+            this.shimHost.error(s);
+        }
+
         public getCompilationSettings(): CompilerOptions {
             var settingsJson = this.shimHost.getCompilationSettings();
             if (settingsJson == null || settingsJson == "") {

From 89a065185b7a6029baa6159376530bd346ea95e7 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sat, 6 Dec 2014 23:04:17 -0800
Subject: [PATCH 2/4] added getApiVersion method to TypeScriptServicesFactory

---
 src/services/services.ts | 3 +++
 src/services/shims.ts    | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/services/services.ts b/src/services/services.ts
index 1d5418aff75..fa09ee5daa0 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -14,6 +14,9 @@
 /// <reference path='formatting.ts' />
 
 module ts {
+
+    export var ScriptAPIVersion = "1.4"
+
     export interface Node {
         getSourceFile(): SourceFile;
         getChildCount(sourceFile?: SourceFile): number;
diff --git a/src/services/shims.ts b/src/services/shims.ts
index a79948a3121..2157ae2336e 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -867,6 +867,13 @@ module ts {
         private _shims: Shim[] = [];
         private documentRegistry: DocumentRegistry = createDocumentRegistry();
 
+        /*
+         * Returns script API version.
+         */
+        public getApiVersion(dummy: any): string {
+            return ScriptAPIVersion;
+        }
+
         public createLanguageServiceShim(host: LanguageServiceShimHost): LanguageServiceShim {
             try {
                 var hostAdapter = new LanguageServiceShimHostAdapter(host);

From a4a87f87fa108c1ac28074c940e9e60269ad50e4 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sun, 7 Dec 2014 15:17:20 -0800
Subject: [PATCH 3/4] removed dummy parameter from getApiVersion method

---
 src/services/shims.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/shims.ts b/src/services/shims.ts
index 2157ae2336e..dec48facc35 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -870,7 +870,7 @@ module ts {
         /*
          * Returns script API version.
          */
-        public getApiVersion(dummy: any): string {
+        public getApiVersion(): string {
             return ScriptAPIVersion;
         }
 

From 3469b4ce03b9b22e21215e255e0af41f0bfff361 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sun, 7 Dec 2014 21:41:15 -0800
Subject: [PATCH 4/4] addressed CR feedback: rename getApiVersion to
 getServicesVersion

---
 src/services/services.ts | 2 +-
 src/services/shims.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index fa09ee5daa0..7703c3633bf 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -15,7 +15,7 @@
 
 module ts {
 
-    export var ScriptAPIVersion = "1.4"
+    export var servicesVersion = "0.4"
 
     export interface Node {
         getSourceFile(): SourceFile;
diff --git a/src/services/shims.ts b/src/services/shims.ts
index dec48facc35..d139381c225 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -870,8 +870,8 @@ module ts {
         /*
          * Returns script API version.
          */
-        public getApiVersion(): string {
-            return ScriptAPIVersion;
+        public getServicesVersion(): string {
+            return servicesVersion;
         }
 
         public createLanguageServiceShim(host: LanguageServiceShimHost): LanguageServiceShim {