Fixes #8: Conflict with Emmet

README.md

@@ -29,6 +29,9 @@ By default, it is `["*"]` and will be activated for all languages.
 **Note:** The setting should be set with language id defined in [VS Code](https://github.com/Microsoft/vscode/tree/master/extensions). Taking [javascript definition](https://github.com/Microsoft/vscode/blob/master/extensions/javascript/package.json) as an example, we need to use `javascript` for `.js` and `.es6`, use `javascriptreact` for `.jsx`. So, if you want to enable this extension on `.js` file, you need to add `javascript` in settings.json.
 
 ## Change Log
+### 0.0.7
+* Fix [GitHub issue#8](https://github.com/formulahendry/vscode-auto-rename-tag/issues/8)
+
 ### 0.0.6
 * Merge [PR#7](https://github.com/formulahendry/vscode-auto-rename-tag/pull/7): Remove console.log
 * Update README.md to clarify the configuration for `auto-rename-tag.activationOnLanguage`

package.json

@@ -2,7 +2,7 @@
     "name": "auto-rename-tag",
     "displayName": "Auto Rename Tag",
     "description": "Auto rename paired HTML/XML tag",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "publisher": "formulahendry",
     "icon": "images/logo.png",
     "engines": {

src/tagManager.ts

@@ -32,18 +32,14 @@ export class TagManager {
         let document = editor.document;
         let selection = editor.selection;
         let word = this.getWordAtPosition(document, selection.active);
-        if (word) {
-            this._word = word;
-        }
+        this._word = word;
     }
 
     private getCurrentWord(event: vscode.TextEditorSelectionChangeEvent): void {
         let selection = event.selections[0];
         let document = event.textEditor.document;
         let word = this.getWordAtPosition(document, selection.active);
-        if (word) {
-            this._word = word;
-        }
+        this._word = word;
     }
 
     private getWordAtPosition(document: vscode.TextDocument, position: vscode.Position): string {
@@ -140,7 +136,7 @@ export class TagManager {
         let startTag: string;
         let endTag: string;
 
-        if (this._word === newTag.word) {
+        if (this._word === newTag.word || this._word === null) {
             return;
         }