diff --git a/extensions/html/language-configuration.json b/extensions/html/language-configuration.json
index b1912be7ab1..372ec249687 100644
--- a/extensions/html/language-configuration.json
+++ b/extensions/html/language-configuration.json
@@ -25,8 +25,8 @@
],
"folding": {
"markers": {
- "start": "^\\s*<--\\s*#region\\b",
- "end": "^^\\s*<--\\s*#endregion\\b"
+ "start": "^\\s*",
+ "end": "^^\\s*"
}
}
}
\ No newline at end of file
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 441cf4bb411..0d7caeee3ad 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -9,22 +9,22 @@
},
"dependencies": {
"vscode-css-languageservice": "^3.0.1",
- "vscode-html-languageservice": "^2.0.11",
+ "vscode-html-languageservice": "^2.0.12",
"vscode-languageserver": "^3.5.0",
"vscode-nls": "^2.0.2",
"vscode-uri": "^1.0.1"
},
"devDependencies": {
- "@types/node": "7.0.43",
- "@types/mocha": "2.2.33"
+ "@types/mocha": "2.2.33",
+ "@types/node": "7.0.43"
},
"scripts": {
"compile": "gulp compile-extension:html-server",
"watch": "gulp watch-extension:html-server",
- "install-service-next": "npm install vscode-css-languageservice@next -f -S && npm install vscode-html-languageservice@next -f -S",
- "install-service-local": "npm install ../../../../vscode-css-languageservice -f -S && npm install ../../../../vscode-html-languageservice -f -S",
- "install-server-next": "npm install vscode-languageserver@next -f -S",
- "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f -S",
+ "install-service-next": "yarn add vscode-css-languageservice@next && yarn add vscode-html-languageservice@next",
+ "install-service-local": "npm install ../../../../vscode-css-languageservice -f && npm install ../../../../vscode-html-languageservice -f",
+ "install-server-next": "yarn add vscode-languageserver@next",
+ "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f",
"test": "../../../node_modules/.bin/mocha"
}
}
diff --git a/extensions/html/server/yarn.lock b/extensions/html/server/yarn.lock
index 21d3712941c..535c25480b6 100644
--- a/extensions/html/server/yarn.lock
+++ b/extensions/html/server/yarn.lock
@@ -17,9 +17,9 @@ vscode-css-languageservice@^3.0.1:
vscode-languageserver-types "3.5.0"
vscode-nls "^2.0.1"
-vscode-html-languageservice@^2.0.11:
- version "2.0.11"
- resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.0.11.tgz#84da1ba56a1334d56b1b3ed4a8d51874c1f5436d"
+vscode-html-languageservice@^2.0.12:
+ version "2.0.12"
+ resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.0.12.tgz#de85796138561414a43755471c77b0e28f264582"
dependencies:
vscode-languageserver-types "3.5.0"
vscode-nls "^2.0.2"
diff --git a/extensions/html/snippets/html.snippets.json b/extensions/html/snippets/html.snippets.json
index ef44d3ce416..0e171e4cc8f 100644
--- a/extensions/html/snippets/html.snippets.json
+++ b/extensions/html/snippets/html.snippets.json
@@ -7,13 +7,13 @@
"",
"\t",
"\t",
- "\t{{Page Title}}",
+ "\t${1:Page Title}",
"\t",
- "\t",
- "\t",
+ "\t",
+ "\t",
"",
"",
- "\t{{}}",
+ "\t$0",
"",
"