From 242e5a08758cc7dbbd04d166340e7e4b7b269f88 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Tue, 8 May 2018 11:41:57 -0700
Subject: [PATCH 1/2] ci(appveyor): use npm (#456)

---
 appveyor.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 537c294b4..6e20fd72f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,21 +7,22 @@ skip_branch_with_pr: true
 skip_tags: true
 
 cache:
- - '%LOCALAPPDATA%\Yarn'
+ - '%AppData%/npm-cache'
 
 environment:
   NODEJS_VERSION: '8.9.4'
 
 install:
   - ps: Install-Product node $env:NODEJS_VERSION
-  - yarn install
+  - npm install -g npm@6.0.0
+  - npm ci
 
 build_script:
-  - yarn run build
+  - npm run build
 
 test_script:
-  - yarn run lint
-  - yarn run cover
+  - npm run lint
+  - npm run cover
 
 after_test:
   - ps: |

From faa787c98afc8ddc8d4440fdfdb9d89e6069905b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@gmail.com>
Date: Wed, 30 May 2018 20:03:51 +0200
Subject: [PATCH 2/2] fix(plugins): add missing project method for plugins
 (#462)

---
 src/plugins.ts         | 5 ++---
 src/project-manager.ts | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins.ts b/src/plugins.ts
index bed3e977e..8436e9948 100644
--- a/src/plugins.ts
+++ b/src/plugins.ts
@@ -40,9 +40,8 @@ export interface PluginCreateInfo {
  * The portion of tsserver's Project API exposed to plugins
  */
 export interface Project {
-    projectService: {
-        logger: Logger
-    }
+    projectService: { logger: Logger }
+    getCurrentDirectory(): string
 }
 
 /**
diff --git a/src/project-manager.ts b/src/project-manager.ts
index c47e06446..4d6a104b0 100644
--- a/src/project-manager.ts
+++ b/src/project-manager.ts
@@ -385,7 +385,11 @@ export class ProjectConfiguration {
 
             const info: PluginCreateInfo = {
                 config: configEntry,
-                project: { projectService: { logger: this.logger } }, // TODO: may need more support
+                project: {
+                    // TODO: may need more support
+                    getCurrentDirectory: () => this.getHost().getCurrentDirectory(),
+                    projectService: { logger: this.logger },
+                },
                 languageService: this.getService(),
                 languageServiceHost: this.getHost(),
                 serverHost: {}, // TODO: may need an adapter