Merge pull request #299 from VioSea-hub/master

Fix the issue where document.getWordRangeAtPosition() returns incorre…

Author: ecmel

package.json

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

src/provider.ts

@@ -129,8 +129,8 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
     position: Position,
     type: StyleType
   ) {
-    const map = await this.getCompletionMap(document, type);
     const range = document.getWordRangeAtPosition(position, this.wordRange);
+    const map = await this.getCompletionMap(document, type);
     const items = [];
 
     for (const item of map.values()) {
@@ -164,8 +164,8 @@ export class Provider implements CompletionItemProvider, DefinitionProvider {
   }
 
   private async getDefinitions(document: TextDocument, position: Position) {
-    const styles = await this.getStyles(document);
     const range = document.getWordRangeAtPosition(position, this.wordRange);
+    const styles = await this.getStyles(document);
     const selector = document.getText(range);
     const locations: Location[] = [];