提交 190367eb 编写于 作者: R Ramya Achutha Rao

lookahead not needed when running emmet expand #32478

上级 224df127
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz" "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
}, },
"vscode-emmet-helper": { "vscode-emmet-helper": {
"version": "1.0.14", "version": "1.0.15",
"from": "vscode-emmet-helper@>=1.0.14 <2.0.0", "from": "vscode-emmet-helper@>=1.0.15 <2.0.0",
"resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.14.tgz" "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.15.tgz"
}, },
"vscode-languageserver-types": { "vscode-languageserver-types": {
"version": "3.3.0", "version": "3.3.0",
......
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
"@emmetio/html-matcher": "^0.3.1", "@emmetio/html-matcher": "^0.3.1",
"@emmetio/css-parser": "^0.4.0", "@emmetio/css-parser": "^0.4.0",
"@emmetio/math-expression": "^0.1.1", "@emmetio/math-expression": "^0.1.1",
"vscode-emmet-helper": "^1.0.14", "vscode-emmet-helper": "^1.0.15",
"vscode-languageserver-types": "^3.0.3", "vscode-languageserver-types": "^3.0.3",
"image-size": "^0.5.2", "image-size": "^0.5.2",
"vscode-nls": "2.0.2" "vscode-nls": "2.0.2"
......
...@@ -132,7 +132,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> { ...@@ -132,7 +132,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
return [rangeToReplace, abbr, []]; return [rangeToReplace, abbr, []];
} }
} }
<<<<<<< HEAD
let extractedResults = extractAbbreviation(editor.document, position); let extractedResults = extractAbbreviation(editor.document, position);
=======
let extractedResults = extractAbbreviation(editor.document, position, false);
>>>>>>> 1531c8d... lookahead not needed when running emmet expand #32478
if (!extractedResults) { if (!extractedResults) {
return [null, '', []]; return [null, '', []];
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册