Moved emmet completion provider to vscode-emmet-helper

ramya-rao-a · ramya-rao-a · commit 07c5fe39ddad · 2017-06-21T16:21:54.000-07:00
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
@@ -73,6 +73,7 @@
         "@emmetio/expand-abbreviation": "^0.5.8",
         "@emmetio/extract-abbreviation": "^0.1.1",
         "@emmetio/html-matcher": "^0.3.1",
-        "@emmetio/css-parser": "^0.3.0"
+        "@emmetio/css-parser": "^0.3.0",
+        "vscode-emmet-helper":"0.0.6"
     }
 }
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
@@ -9,7 +9,7 @@ import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { getSyntax, getNode, getInnerRange } from './util';
-import { getExpandOptions, extractAbbreviation, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { getExpandOptions, extractAbbreviation, isStyleSheet } from 'vscode-emmet-helper';
 import { DocumentStreamReader } from './bufferStream';
 
 export function wrapWithAbbreviation() {
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 import { getNode } from './util';
 
 export function balanceOut() {
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -8,8 +8,7 @@ import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
-import { EmmetCompletionItemProvider } from './vscode-emmet-helper/emmetCompletionProvider';
+import { EmmetCompletionItemProvider, isStyleSheet } from 'vscode-emmet-helper';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
 import { getSyntax, getNode, getInnerRange } from './util';
 
diff --git a/extensions/emmet/src/extension.ts b/extensions/emmet/src/extension.ts
@@ -16,7 +16,7 @@ import { toggleComment } from './toggleComment';
 import { fetchEditPoint } from './editPoint';
 import { fetchSelectItem } from './selectItem';
 import { LANGUAGE_MODES, getMappedModes } from './util';
-import { updateExtensionsPath } from './vscode-emmet-helper/abbreviationUtil';
+import { updateExtensionsPath } from 'vscode-emmet-helper';
 
 export function activate(context: vscode.ExtensionContext) {
 	let completionProvider = new DefaultCompletionItemProvider();
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 import { getNode } from './util';
 
 export function mergeLines() {
diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts
@@ -11,7 +11,7 @@ import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 
 
 export function fetchSelectItem(direction: string): void {
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 import { getNode } from './util';
 
 export function splitJoinTag() {
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
@@ -9,7 +9,7 @@ import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 
 const startCommentStylesheet = '/*';
 const endCommentStylesheet = '*/';
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { DocumentStreamReader } from './bufferStream';
-import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
+import { isStyleSheet } from 'vscode-emmet-helper';
 
 export const LANGUAGE_MODES: Object = {
 	'html': ['!', '.', '}'],
diff --git a/extensions/emmet/src/vscode-emmet-helper/abbreviationUtil.ts b/extensions/emmet/src/vscode-emmet-helper/abbreviationUtil.ts
diff --git a/extensions/emmet/src/vscode-emmet-helper/emmetCompletionProvider.ts b/extensions/emmet/src/vscode-emmet-helper/emmetCompletionProvider.ts

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@`
`73`	`73`	`"@emmetio/expand-abbreviation": "^0.5.8",`
`74`	`74`	`"@emmetio/extract-abbreviation": "^0.1.1",`
`75`	`75`	`"@emmetio/html-matcher": "^0.3.1",`
`76`		`- "@emmetio/css-parser": "^0.3.0"`
	`76`	`+ "@emmetio/css-parser": "^0.3.0",`
	`77`	`+ "vscode-emmet-helper":"0.0.6"`
`77`	`78`	`}`
`78`	`79`	`}`