fixed word range

Author: ecmel

CHANGELOG.md

@@ -2,140 +2,141 @@
 
 All notable changes to the extension will be documented in this file.
 
-## [2.0.1] - 2023-12-31
+## [2.0.2] - 2024-01-01
 
-- Go to definition support.
-- Ported to custom parser.
+- Go to definition support
+- Ported to custom parser
+- Fixed word range for selectors
 
 ## [1.14.1] - 2023-12-28
 
-- Added glob support for local files.
-- Initial support for lit css.
-- Match on patterns with a colon in addition to equals.
-- Ported to rollup & fast-glob.
-- Updated dependencies.
+- Added glob support for local files
+- Initial support for lit css
+- Match on patterns with a colon in addition to equals
+- Ported to rollup & fast-glob
+- Updated dependencies
 
 ## [1.13.1] - 2022-07-31
 
-- Updated sponsor field.
+- Updated sponsor field
 
 ## [1.13.0] - 2022-06-13
 
-- Added sponsor field.
+- Added sponsor field
 
 ## [1.12.2] - 2022-05-05
 
-- Update dependencies.
+- Update dependencies
 
 ## [1.11.0] - 2022-02-06
 
-- Update dependencies.
-- Added source file name to completion list.
+- Update dependencies
+- Added source file name to completion list
 
 ## [1.10.2] - 2021-02-10
 
-- Update dependencies.
+- Update dependencies
 
 ## [1.9.1] - 2021-01-17
 
-- Update documentation.
+- Update documentation
 
 ## [1.9.0] - 2021-01-16
 
-- Added Clear Cache command.
-- Added file cache.
-- Update documentation.
+- Added Clear Cache command
+- Added file cache
+- Update documentation
 
 ## [1.8.1] - 2021-01-15
 
-- Added ${fileBasenameNoExtension} setting variable.
+- Added ${fileBasenameNoExtension} setting variable
 
 ## [1.8.0] - 2021-01-11
 
-- Added validate command.
-- Allow multi level inheritance.
+- Added validate command
+- Allow multi level inheritance
 
 ## [1.7.2] - 2021-01-10
 
-- Update internals.
+- Update internals
 
 ## [1.7.1] - 2021-01-09
 
-- Update documentation.
+- Update documentation
 
 ## [1.7.0] - 2021-01-09
 
-- Removed validation.
+- Removed validation
 
 ## [1.6.3] - 2021-01-07
 
-- Added Handlebars inheritance (https://jknack.github.io/handlebars.java/reuse.html).
-- Update documentation.
-- Internal refactoring.
+- Added Handlebars inheritance (https://jknack.github.io/handlebars.java/reuse.html)
+- Update documentation
+- Internal refactoring
 
 ## [1.6.2] - 2021-01-04
 
-- Handle file watcher create events.
-- Update documentation.
+- Handle file watcher create events
+- Update documentation
 
 ## [1.6.1] - 2020-12-31
 
-- Update documentation.
-- Update dependencies.
+- Update documentation
+- Update dependencies
 
 ## [1.6.0] - 2020-12-29
 
-- Updated settings.
+- Updated settings
 
 ## [1.5.0] - 2020-12-28
 
-- Added `css.validation` setting.
+- Added `css.validation` setting
 
 ## [1.4.5] - 2020-12-28
 
-- Update documentation.
+- Update documentation
 
 ## [1.4.4] - 2020-12-27
 
-- Fixed regex.
+- Fixed regex
 
 ## [1.4.3] - 2020-12-27
 
-- Fixed regex.
+- Fixed regex
 
 ## [1.4.2] - 2020-12-26
 
-- Update documentation.
+- Update documentation
 
 ## [1.4.1] - 2020-12-26
 
-- Validates startup and newly opened documents.
+- Validates startup and newly opened documents
 
 ## [1.4.0] - 2020-12-26
 
-- Added validation.
-- Added @extends('base') tag for inheritance.
-- Added integration test.
+- Added validation
+- Added @extends('base') tag for inheritance
+- Added integration test
 
 ## [1.3.3] - 2020-12-22
 
-- Fixed watcher bug.
-- Fixed cleanup.
+- Fixed watcher bug
+- Fixed cleanup
 
 ## [1.3.2] - 2020-12-22
 
-- Update documentation.
+- Update documentation
 
 ## [1.3.1] - 2020-12-22
 
-- Unified path handling.
-- Fixed recursion bug for template inheritance.
+- Unified path handling
+- Fixed recursion bug for template inheritance
 
 ## [1.3.0] - 2020-12-21
 
-- Update documentation.
+- Update documentation
 - Update to VS Code 1.52
 
 ## [1.2.5] - 2020-12-20
 
-- Added initial template inheritance support for Twig and Mustache like template engines.
+- Added initial template inheritance support for Twig and Mustache like template engines

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-html-css",
   "displayName": "HTML CSS Support",
   "description": "CSS Intellisense for HTML",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "publisher": "ecmel",
   "author": {

package.json

@@ -21,14 +21,15 @@ export function activate(context: ExtensionContext) {
   context.subscriptions.push(
     languages.registerCompletionItemProvider(enabledLanguages, provider),
     languages.registerDefinitionProvider(enabledLanguages, provider),
-    workspace.onDidChangeTextDocument((event) => {
-      const uri = event.document.uri;
-      invalidate(uri.toString());
-      validations.delete(uri);
-    }),
+    workspace.onDidSaveTextDocument((document) =>
+      invalidate(document.uri.toString())
+    ),
     workspace.onDidCloseTextDocument((document) =>
       validations.delete(document.uri)
     ),
+    workspace.onDidChangeTextDocument((event) =>
+      validations.delete(event.document.uri)
+    ),
     commands.registerCommand("vscode-html-css.validate", async () => {
       const editor = window.activeTextEditor;
       if (editor) {

src/extension.ts

@@ -31,7 +31,7 @@ import { Style, StyleType, parse } from "./parser";
 const start = new Position(0, 0);
 const cache = new Map<string, Style[]>();
 const isRemote = /^https?:\/\//i;
-const wordRange = /-?[_a-zA-Z]+[_a-zA-Z0-9-]*/;
+const wordRange = /[_a-zA-Z0-9-]+/;
 const findSelector = /([^(\[{}\])\s]+)(?![^(\[{]*[}\])])/gi;
 const findAttribute = /(class|className)\s*[=:]\s*(["'])(.*?)\2/gis;
 const canComplete = /(id|class|className)\s*[=:]\s*(["'])(?:.(?!\2))*$/is;
@@ -96,7 +96,7 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
   }
 
   private async getCompletionMap(document: TextDocument, type: StyleType) {
-    const items = new Map<string, CompletionItem>();
+    const map = new Map<string, CompletionItem>();
     const styles = await this.getStyles(document);
     for (const value of styles.values()) {
       for (const style of value) {
@@ -107,16 +107,26 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
               ? CompletionItemKind.Value
               : CompletionItemKind.Enum
           );
-          items.set(style.selector, item);
+          map.set(style.selector, item);
         }
       }
     }
-    return items;
+    return map;
   }
 
-  private async getCompletionItems(document: TextDocument, type: StyleType) {
-    const items = await this.getCompletionMap(document, type);
-    return [...items.values()];
+  private async getCompletionItems(
+    document: TextDocument,
+    position: Position,
+    type: StyleType
+  ) {
+    const map = await this.getCompletionMap(document, type);
+    const range = document.getWordRangeAtPosition(position, wordRange);
+    const items = [];
+    for (const item of map.values()) {
+      item.range = range;
+      items.push(item);
+    }
+    return items;
   }
 
   provideCompletionItems(
@@ -134,6 +144,7 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
         resolve(
           this.getCompletionItems(
             document,
+            position,
             match[1] === "id" ? StyleType.ID : StyleType.CLASS
           )
         );
@@ -186,9 +197,9 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
   }
 
   async validate(document: TextDocument) {
-    const text = document.getText();
     const diagnostics: Diagnostic[] = [];
-    const styles = await this.getCompletionMap(document, StyleType.CLASS);
+    const map = await this.getCompletionMap(document, StyleType.CLASS);
+    const text = document.getText();
 
     let attribute, offset, value, anchor, end, start;
 
@@ -199,7 +210,7 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
         attribute[3].indexOf(attribute[2]);
 
       while ((value = findSelector.exec(attribute[3]))) {
-        if (styles.has(value[1])) {
+        if (map.has(value[1])) {
           continue;
         }