Updated settings

Author: ecmel

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the extension will be documented in this file.
 
+## [1.6.0] - 2020-12-29
+
+- Updated settings.
+
 ## [1.5.0] - 2020-12-28
 
 - Added `css.validation` setting.

package.json

@@ -2,7 +2,7 @@
 	"name": "vscode-html-css",
 	"displayName": "HTML CSS Support",
 	"description": "CSS Intellisense for HTML",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"publisher": "ecmel",
 	"license": "MIT",
 	"homepage": "https://github.com/ecmel/vscode-html-css",
@@ -38,26 +38,35 @@
 			"properties": {
 				"css.enabledLanguages": {
 					"type": "array",
-					"description": "A list of languages where suggestions are desired.",
+					"scope": "application",
+					"description": "List of languages where suggestions are desired.",
 					"default": [
 						"html"
-					],
-					"scope": "application"
-				},
-				"css.styleSheets": {
-					"type": "array",
-					"default": [],
-					"description": "A list of local or remote style sheets for suggestions.",
-					"scope": "resource"
+					]
 				},
 				"css.validation": {
 					"type": "object",
-					"default": {
-						"id": false,
-						"class": true
-					},
-					"description": "Choose selectors for validation.",
-					"scope": "resource"
+					"scope": "resource",
+					"description": "Map of selectors to validate.",
+					"default": {},
+					"properties": {
+						"id": {
+							"type": "boolean",
+							"description": "Whether to validate 'id' selectors.",
+							"default": false
+						},
+						"class": {
+							"type": "boolean",
+							"description": "Whether to validate 'class' selectors.",
+							"default": true
+						}
+					}
+				},
+				"css.styleSheets": {
+					"type": "array",
+					"scope": "resource",
+					"description": "List of local or remote style sheets for suggestions.",
+					"default": []
 				}
 			}
 		}

src/completion.ts

@@ -20,11 +20,6 @@ import {
     workspace
 } from "vscode";
 
-type Validation = {
-    id: boolean;
-    class: boolean;
-};
-
 export class SelectorCompletionItemProvider implements CompletionItemProvider, Disposable {
 
     readonly none = "__!NONE!__";
@@ -68,8 +63,12 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         return workspace.getConfiguration("css", uri).get<string[]>("styleSheets", []);
     }
 
-    getValidation(uri: Uri): Validation {
-        return workspace.getConfiguration("css", uri).get<Validation>("validation", { id: false, class: true });
+    isValidateId(uri: Uri): boolean {
+        return workspace.getConfiguration("css", uri).get<boolean>("validation.id", false);
+    }
+
+    isValidateClass(uri: Uri): boolean {
+        return workspace.getConfiguration("css", uri).get<boolean>("validation.class", true);
     }
 
     getRelativePath(uri: Uri, spec: string, ext?: string): string {
@@ -302,7 +301,8 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
         this.findAll(uri, text).then(sets => {
             const ids = new Set<string>();
             const classes = new Set<string>();
-            const validation = this.getValidation(uri);
+            const isValidateId = this.isValidateId(uri);
+            const isValidateClass = this.isValidateClass(uri);
 
             sets.forEach(set => set.forEach(key => this.getItems(key)?.forEach((v, k) => {
                 if (v.kind === CompletionItemKind.Value) {
@@ -332,13 +332,13 @@ export class SelectorCompletionItemProvider implements CompletionItemProvider, D
                     const start = document.positionAt(anchor - value[1].length);
 
                     if (attribute[1] === "id") {
-                        if (validation.id && !ids.has(value[1])) {
+                        if (isValidateId && !ids.has(value[1])) {
                             diagnostics.push(new Diagnostic(new Range(start, end),
                                 `CSS id selector '${value[1]}' not found.`,
                                 DiagnosticSeverity.Information));
                         }
                     } else {
-                        if (validation.class && !classes.has(value[1])) {
+                        if (isValidateClass && !classes.has(value[1])) {
                             diagnostics.push(new Diagnostic(new Range(start, end),
                                 `CSS class selector '${value[1]}' not found.`,
                                 DiagnosticSeverity.Warning));