From 6dc884f2abefa86ebdbbc48c990bb26c34e39e68 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Fri, 26 Apr 2019 11:31:21 -0700
Subject: [PATCH] test(language-service): Load language service from tsconfig
 (#30153)

This PR changes the integration test to load language service the way it would be loaded in the editor.
If the language service is specified in tsconfig, it'd only be loaded for Angular projects.
Specifying it as `globalPlugins` loads it unconditionally whenever tsserver is brought up.

PR Close #30153
---
 integration/language_service_plugin/project/tsconfig.json | 5 ++++-
 integration/language_service_plugin/test.ts               | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/integration/language_service_plugin/project/tsconfig.json b/integration/language_service_plugin/project/tsconfig.json
index 2c7260d1bc..a774248d5b 100644
--- a/integration/language_service_plugin/project/tsconfig.json
+++ b/integration/language_service_plugin/project/tsconfig.json
@@ -8,6 +8,9 @@
     "experimentalDecorators": true,
     "lib": [ "es2015", "dom" ],
     "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true
+    "suppressImplicitAnyIndexErrors": true,
+    "plugins": [
+      {"name": "@angular/language-service"}
+    ]
   }
 }
diff --git a/integration/language_service_plugin/test.ts b/integration/language_service_plugin/test.ts
index fb4f1c870c..607c17eae2 100644
--- a/integration/language_service_plugin/test.ts
+++ b/integration/language_service_plugin/test.ts
@@ -13,7 +13,6 @@ describe('Angular Language Service', () => {
   beforeEach(() => {
     jasmine.addMatchers(goldenMatcher);
     server = fork(SERVER_PATH, [
-      '--globalPlugins', '@angular/language-service',
       '--logVerbosity', 'verbose',
       '--logFile', join(PWD, 'tsserver.log'),
     ], {