Updated deps

Author: sergeche

package-lock.json

@@ -27,12 +27,12 @@
     "typescript": "^3.9.2"
   },
   "dependencies": {
-    "@emmetio/action-utils": "^1.0.5",
+    "@emmetio/action-utils": "^1.1.1",
     "@emmetio/css-matcher": "^1.0.2",
-    "@emmetio/html-matcher": "^1.2.3",
+    "@emmetio/html-matcher": "^1.3.0",
     "@emmetio/math-expression": "^1.0.4",
     "@emmetio/scanner": "^1.0.0",
-    "emmet": "^2.0.2"
+    "emmet": "^2.1.0"
   },
   "mocha": {
     "require": "./test/register",

package.json

@@ -37,7 +37,7 @@ export default function initAbbreviationTracker(editor: TextEditor) {
         const pos = getCaret(ed);
         let tracker = handleChange(ed);
 
-        if (!tracker && lastPos !== null && lastPos === pos - 1 && allowTracking(ed, pos)) {
+        if (!tracker && lastPos !== null && lastPos === pos - 1 && allowTracking(ed)) {
             tracker = startAbbreviationTracking(ed, pos);
         }
 
@@ -62,7 +62,7 @@ export default function initAbbreviationTracker(editor: TextEditor) {
 /**
  * Check if abbreviation tracking is allowed in editor at given location
  */
-function allowTracking(editor: TextEditor, pos: number): boolean {
+function allowTracking(editor: TextEditor): boolean {
     if (isEnabled()) {
         const syntax = docSyntax(editor);
         return isSupported(syntax) || isJSX(syntax);
@@ -222,9 +222,9 @@ function getActivationContext(editor: TextEditor, pos: number): UserConfig | und
                 options: getOutputOptions(editor, pos)
             };
         }
+    } else {
+        return { syntax, type: 'markup' };
     }
-
-    return { syntax, type: 'markup' };
 }
 
 function getCSSActivationContext(editor: TextEditor, pos: number, syntax: string, ctx: CSSContext): UserConfig | undefined {

src/abbreviation/index.ts

@@ -4,12 +4,12 @@ import { TokenType } from '@emmetio/css-matcher';
 import { getHTMLContext, CSSContext, HTMLContext, getCSSContext } from '@emmetio/action-utils';
 import { getContent, attributeValue, last } from './utils';
 
-const markupSyntaxes = ['html', 'xml', 'xsl', 'jsx', 'haml', 'jade', 'pug', 'slim'];
-const stylesheetSyntaxes = ['css', 'scss', 'sass', 'less', 'sss', 'stylus', 'postcss'];
 const xmlSyntaxes = ['xml', 'xsl', 'jsx'];
-const htmlSyntaxes = ['html', 'vue'];
+const htmlSyntaxes = ['html', 'vue', 'html+erb', 'php'];
 const cssSyntaxes = ['css', 'scss', 'less'];
 const jsxSyntaxes = ['jsx', 'tsx'];
+const markupSyntaxes = ['haml', 'jade', 'pug', 'slim'].concat(htmlSyntaxes, xmlSyntaxes, jsxSyntaxes);
+const stylesheetSyntaxes = ['sass', 'sss', 'stylus', 'postcss'].concat(cssSyntaxes);
 
 export interface SyntaxInfo {
     type: SyntaxType;

src/lib/syntax.ts

@@ -12,6 +12,7 @@ import './actions/split-join-tag';
 import './actions/update-image-size';
 import './actions/wrap-with-abbreviation';
 import initAbbreviationTracker from './abbreviation';
+import { stopTracking } from './abbreviation/AbbreviationTracker';
 import createAutocompleteProvider from './autocomplete';
 
 export function activate() {
@@ -20,3 +21,7 @@ export function activate() {
     nova.workspace.onDidAddTextEditor(initAbbreviationTracker);
     nova.assistants.registerCompletionAssistant('*', autocomplete);
 }
+
+export function deactivate() {
+    nova.workspace.textEditors.forEach(editor => stopTracking(editor, true));
+}

src/main.ts

@@ -1,27 +1,10 @@
-import fs from 'fs';
-import path from 'path';
-import { AbbreviationContext } from 'emmet';
-import { deepStrictEqual as deepEqual, strictEqual as equal } from 'assert';
+import { strictEqual as equal } from 'assert';
 import Range from './assets/range';
 import createSimulator from './assets/simutator';
 import { IssueCollection, Issue, IssueSeverity } from './assets/issue';
 import nova from './assets/nova';
-import { getHTMLContext, getCSSContext } from '../src/lib/context';
 import { startTracking, getTracker, handleChange, handleSelectionChange } from '../src/abbreviation/AbbreviationTracker';
 
-function read(fileName: string): string {
-    const absPath = path.resolve(__dirname, fileName);
-    return fs.readFileSync(absPath, 'utf8');
-}
-
-function context(name: string, attributes?: { [name: string]: string }): AbbreviationContext {
-    const result = { name } as AbbreviationContext;
-    if (attributes) {
-        result.attributes = attributes;
-    }
-    return result;
-}
-
 describe('Autocomplete provider', () => {
     before(() => {
         global['Range'] = Range;
@@ -38,93 +21,6 @@ describe('Autocomplete provider', () => {
         delete global['nova'];
     });
 
-    it('HTML context', () => {
-        const html = read('./samples/embedded-style.html');
-
-        deepEqual(getHTMLContext(html, 298), {
-            syntax: 'html',
-            context: context('div', { style: 'padding: 10px;' })
-        });
-        // Inside tag, ignore context
-        deepEqual(getHTMLContext(html, 276), undefined);
-
-        // Inside tag but in `style` attribute value: syntax is `css` but no context
-        // since caret is inside property name
-        deepEqual(getHTMLContext(html, 286), {
-            syntax: 'css',
-            inline: true
-        });
-
-        // Same as above but caret is inside CSS property value
-        deepEqual(getHTMLContext(html, 290), {
-            syntax: 'css',
-            inline: true,
-            context: context('padding')
-        });
-        deepEqual(getHTMLContext(html, 292), {
-            syntax: 'css',
-            inline: true,
-            context: context('padding')
-        });
-
-        // Inside empty `style` attribute
-        deepEqual(getHTMLContext(html, 351), {
-            syntax: 'css',
-            inline: true
-        });
-    });
-
-    it('CSS in HTML', () => {
-        const html = read('./samples/embedded-style.html');
-
-        // Inside <style> tag, inside selector block
-        deepEqual(getHTMLContext(html, 212), {
-            syntax: 'css'
-        });
-
-        // Outside selector block
-        deepEqual(getHTMLContext(html, 194), undefined);
-
-        // Inside property value
-        deepEqual(getHTMLContext(html, 224), {
-            syntax: 'css',
-            context: context('padding')
-        });
-    });
-
-    it('CSS context', () => {
-        const scss = read('./samples/style.scss');
-        const ctx = (context?: {}) => {
-            const result: any = { syntax: 'css' };
-            if (context) {
-                result.context = context;
-            }
-
-            return result;
-        };
-
-        // Not inside selector block
-        deepEqual(getCSSContext(scss, 9), undefined);
-
-        // ...but inside property (variable)
-        deepEqual(getCSSContext(scss, 5), ctx({ name: '$foo' }));
-
-        // Inside selector
-        deepEqual(getCSSContext(scss, 12), undefined);
-
-        // Inside selector block
-        deepEqual(getCSSContext(scss, 36), ctx());
-
-        // Inside property value
-        deepEqual(getCSSContext(scss, 32), ctx({ name: 'padding' }));
-
-        // Still inside selector block
-        deepEqual(getCSSContext(scss, 125), ctx());
-
-        // Not inside selector
-        deepEqual(getCSSContext(scss, 128), undefined);
-    });
-
     it('abbreviation tracker', () => {
         const { editor, content, input, select } = createSimulator('before d after', 8, {
             onChange: handleChange,