From ee4a5f4df71619b4f28307822cf9d24491513f5c Mon Sep 17 00:00:00 2001
From: Minchenko Valery <valery.vs.va@gmail.com>
Date: Tue, 30 May 2017 17:33:41 +0300
Subject: [PATCH] feat(@angular/cli): use tslint language service

tslint-language-service can support tslint rules that require the type checker
share program representation with TypeScript (no need to reanalyze)

Fixes: #6125
---
 packages/@angular/cli/blueprints/ng/files/package.json  | 3 ++-
 packages/@angular/cli/blueprints/ng/files/tsconfig.json | 7 ++++++-
 tests/e2e/tests/commands/new/new-minimal.ts             | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json
index 1808271d071e..f8e3009df1cc 100644
--- a/packages/@angular/cli/blueprints/ng/files/package.json
+++ b/packages/@angular/cli/blueprints/ng/files/package.json
@@ -46,7 +46,8 @@
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
-    "tslint": "~5.3.2",<% } %>
+    "tslint": "~5.3.2",
+    "tslint-language-service": "^0.9.6",<% } %>
     "typescript": "~2.3.3"
   }
 }
diff --git a/packages/@angular/cli/blueprints/ng/files/tsconfig.json b/packages/@angular/cli/blueprints/ng/files/tsconfig.json
index a6c016bf38ad..22d3b81e8af9 100644
--- a/packages/@angular/cli/blueprints/ng/files/tsconfig.json
+++ b/packages/@angular/cli/blueprints/ng/files/tsconfig.json
@@ -14,6 +14,11 @@
     "lib": [
       "es2017",
       "dom"
-    ]
+    ]<% if (!minimal) { %>,
+    "plugins": [
+      {
+        "name": "tslint-language-service"
+      }
+    ]<% } %>
   }
 }
diff --git a/tests/e2e/tests/commands/new/new-minimal.ts b/tests/e2e/tests/commands/new/new-minimal.ts
index d3b8c2e5e327..cc603892bdd2 100644
--- a/tests/e2e/tests/commands/new/new-minimal.ts
+++ b/tests/e2e/tests/commands/new/new-minimal.ts
@@ -22,6 +22,7 @@ export default function() {
     .then(() => expectToFail(() => expectFileToMatch('package.json', '"protractor":')))
     .then(() => expectToFail(() => expectFileToMatch('package.json', '"karma":')))
     .then(() => expectToFail(() => expectFileToMatch('package.json', '"jasmine-core":')))
+    .then(() => expectToFail(() => expectFileToMatch('package.json', '"tslint-language-service":')))
 
     // Try to run a build.
     .then(() => ng('build'));