From a6ce17e19c4c7360896a0c9e6ce0ca8021036bca Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Wed, 26 Aug 2020 12:09:39 +0800
Subject: [PATCH] Fix #2131

---
 CHANGELOG.md                                   | 1 +
 docs/interpolation.md                          | 2 +-
 package.json                                   | 7 ++++++-
 server/src/config.ts                           | 2 ++
 server/src/modes/template/interpolationMode.ts | 5 +++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ad76d0d8a..de6d718bd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 0.27.0
 
+- Add setting `vetur.validation.interpolation` so interpolation diagnostics and `eslint-plugin-vue` diagnostics can be configed separately. #2131.
 - Fix VLS crash for *.vue files in node_modules. #2006.
 - Upgrade to TypeScript 4.0.2 and fix symbol outline issue. #1849.
 - Improve JSDoc presentation in hover/completion in interpolation mode. #1337.
diff --git a/docs/interpolation.md b/docs/interpolation.md
index eda3293632..ec9410a1e2 100644
--- a/docs/interpolation.md
+++ b/docs/interpolation.md
@@ -17,7 +17,7 @@ Vetur now offers completion, diagnostics, hover, jump to definition, find refere
 ## Generic Language Features
 
 ::: warning
-These features are experimental and you need to set `vetur.experimental.templateInterpolationService: true` to enable them. You can also only disable template diagnostics with `vetur.validation.template: false`, although that disables the built-in ESLint checking, too.
+These features are experimental and you need to set `vetur.experimental.templateInterpolationService: true` to enable them. You can also only disable template diagnostics with `vetur.validation.interpolation: false`.
 :::
 
 Currently diagnostics, hover, jump to definition and find references are implemented in this way:
diff --git a/package.json b/package.json
index 8bf3c08b55..709ff0486f 100644
--- a/package.json
+++ b/package.json
@@ -246,6 +246,11 @@
           "default": true,
           "description": "Validate vue-html in <template> using eslint-plugin-vue"
         },
+        "vetur.validation.interpolation": {
+          "type": "boolean",
+          "default": true,
+          "description": "Validate interpolations in <template> region using TypeScript language service"
+        },
         "vetur.validation.style": {
           "type": "boolean",
           "default": true,
@@ -510,7 +515,7 @@
         "vetur.experimental.templateInterpolationService": {
           "type": "boolean",
           "default": false,
-          "description": "Enable template interpolation service that offers diagnostics / hover / definition / references."
+          "description": "Enable template interpolation service that offers hover / definition / references in Vue interpolations."
         }
       }
     }
diff --git a/server/src/config.ts b/server/src/config.ts
index 9d47860eb9..8f01cc4b1c 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -30,6 +30,7 @@ export interface VLSConfig {
     };
     validation: {
       template: boolean;
+      interpolation: boolean;
       style: boolean;
       script: boolean;
     };
@@ -78,6 +79,7 @@ export function getDefaultVLSConfig(): VLSFullConfig {
       useWorkspaceDependencies: false,
       validation: {
         template: true,
+        interpolation: true,
         style: true,
         script: true
       },
diff --git a/server/src/modes/template/interpolationMode.ts b/server/src/modes/template/interpolationMode.ts
index 1c58c04ec3..531a01d70a 100644
--- a/server/src/modes/template/interpolationMode.ts
+++ b/server/src/modes/template/interpolationMode.ts
@@ -28,9 +28,10 @@ import { LanguageModelCache } from '../../embeddedSupport/languageModelCache';
 import { HTMLDocument } from './parser/htmlParser';
 import { isInsideInterpolation } from './services/isInsideInterpolation';
 import * as Previewer from '../script/previewer';
+import { VLSFullConfig } from '../../config';
 
 export class VueInterpolationMode implements LanguageMode {
-  private config: any = {};
+  private config: VLSFullConfig;
 
   constructor(
     private tsModule: T_TypeScript,
@@ -51,7 +52,7 @@ export class VueInterpolationMode implements LanguageMode {
   }
 
   doValidation(document: TextDocument): Diagnostic[] {
-    if (!_.get(this.config, ['vetur', 'experimental', 'templateInterpolationService'], true)) {
+    if (!this.config.vetur.validation.interpolation) {
       return [];
     }