Adopt SnippetString and publish 1.2.1

package.json

@@ -1,13 +1,13 @@
 {
   "name": "monaco-html",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "HTML plugin for the Monaco Editor",
   "scripts": {
     "compile": "gulp compile",
     "watch": "gulp watch",
     "prepublish": "gulp release",
-    "install-service-next": "npm install vscode-html-languageservice@next -f -D",
-    "install-service-local": "npm install ../vscode-html-languageservice -f -D"
+    "install-service-next": "npm install vscode-html-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",
+    "install-service-local": "npm install ../vscode-html-languageservice -f -D && npm install ../vscode-languageserver-node/types -f -D"
   },
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -25,13 +25,13 @@
     "gulp-tsb": "^2.0.0",
     "gulp-uglify": "^1.5.3",
     "merge-stream": "^1.0.0",
-    "monaco-editor-core": "^0.7.0",
+    "monaco-editor-core": "^0.8.1",
     "monaco-languages": "^0.6.1",
     "monaco-typescript": "^2.0.1",
     "object-assign": "^4.1.0",
     "rimraf": "^2.5.2",
-    "typescript": "2.0.3",
-    "vscode-html-languageservice": "1.0.0-next.6",
-    "vscode-languageserver-types": "^1.0.4-next.2"
+    "typescript": "^2.1.5",
+    "vscode-html-languageservice": "^2.0.0-next.6",
+    "vscode-languageserver-types": "^3.0.2-beta.5"
   }
 }

src/languageFeatures.ts

@@ -204,16 +204,6 @@ function toTextEdit(textEdit: ls.TextEdit): monaco.editor.ISingleEditOperation {
 	}
 }
 
-function fromTextEdit(editOp: monaco.editor.ISingleEditOperation): ls.TextEdit {
-	if (!editOp) {
-		return void 0;
-	}
-	return {
-		range: fromRange(Range.lift(editOp.range)),
-		newText: editOp.text
-	}
-}
-
 interface DataCompletionItem extends monaco.languages.CompletionItem {
 	data?: any;
 }
@@ -233,17 +223,25 @@ function toCompletionItem(entry: ls.CompletionItem): DataCompletionItem {
 }
 
 function fromCompletionItem(entry: DataCompletionItem): ls.CompletionItem {
-	return {
+	let item : ls.CompletionItem = {
 		label: entry.label,
-		insertText: entry.insertText,
 		sortText: entry.sortText,
 		filterText: entry.filterText,
 		documentation: entry.documentation,
 		detail: entry.detail,
 		kind: fromCompletionItemKind(entry.kind),
-		textEdit: fromTextEdit(entry.textEdit),
 		data: entry.data
 	};
+	if (typeof entry.insertText === 'object' && typeof entry.insertText.value === 'string') {
+		item.insertText = entry.insertText.value;
+		item.insertTextFormat = ls.InsertTextFormat.Snippet
+	} else {
+		item.insertText = <string> entry.insertText;
+	}
+	if (entry.range) {
+		item.textEdit = ls.TextEdit.replace(fromRange(entry.range), item.insertText);
+	}
+	return item;
 }
 
 
@@ -261,28 +259,35 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
 		const resource = model.uri;
 
 		return wireCancellationToken(token, this._worker(resource).then(worker => {
-			return worker.doComplete(resource.toString(), fromPosition(position)).then(info => {
-				if (!info) {
-					return;
-				}
-				let items: monaco.languages.CompletionItem[] = info.items.map(entry => {
-					return {
-						label: entry.label,
-						insertText: entry.insertText,
-						sortText: entry.sortText,
-						filterText: entry.filterText,
-						documentation: entry.documentation,
-						detail: entry.detail,
-						kind: toCompletionItemKind(entry.kind),
-						textEdit: toTextEdit(entry.textEdit)
-					};
-				});
-
-				return <monaco.languages.CompletionList>{
-					isIncomplete: info.isIncomplete,
-					items: items
+			return worker.doComplete(resource.toString(), fromPosition(position));
+		}).then(info => {
+			if (!info) {
+				return;
+			}
+			let items: monaco.languages.CompletionItem[] = info.items.map(entry => {
+				let item : monaco.languages.CompletionItem = {
+					label: entry.label,
+					insertText: entry.insertText,
+					sortText: entry.sortText,
+					filterText: entry.filterText,
+					documentation: entry.documentation,
+					detail: entry.detail,
+					kind: toCompletionItemKind(entry.kind),
 				};
+				if (entry.textEdit) {
+					item.range = toRange(entry.textEdit.range);
+					item.insertText = entry.textEdit.newText;
+				}
+				if (entry.insertTextFormat === ls.InsertTextFormat.Snippet) {
+					item.insertText = { value: <string> item.insertText };
+				}
+				return item;
 			});
+
+			return {
+				isIncomplete: info.isIncomplete,
+				items: items
+			};
 		}));
 	}
 }

src/monaco.contribution.ts

@@ -47,13 +47,15 @@ const formatDefaults: monaco.languages.html.HTMLFormatConfiguration = {
 	tabSize: 4,
 	insertSpaces: false,
 	wrapLineLength: 120,
-	unformatted: 'a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, q, samp, script, select, small, span, strong, sub, sup, textarea, tt, var',
+	unformatted: 'default": "a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, q, samp, select, small, span, strong, sub, sup, textarea, tt, var',
+	contentUnformatted: 'pre',
 	indentInnerHtml: false,
 	preserveNewLines: true,
 	maxPreserveNewLines: null,
 	indentHandlebars: false,
 	endWithNewline: false,
-	extraLiners: 'head, body, /html'
+	extraLiners: 'head, body, /html',
+	wrapAttributes: 'auto'
 };
 
 const htmlOptionsDefault: monaco.languages.html.Options = {

src/monaco.d.ts

@@ -9,12 +9,14 @@ declare module monaco.languages.html {
         readonly insertSpaces: boolean;
         readonly wrapLineLength: number;
         readonly unformatted: string;
+        readonly contentUnformatted: string;
         readonly indentInnerHtml: boolean;
         readonly preserveNewLines: boolean;
         readonly maxPreserveNewLines: number;
         readonly indentHandlebars: boolean;
         readonly endWithNewline: boolean;
         readonly extraLiners: string;
+        readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline';
     }
 
     export interface CompletionConfiguration {