Get syntax from arguments and document editor language when wrapping.

Matthew Kwiecien · Matthew Kwiecien · commit 7221f92ee2db · 2019-02-09T12:59:16.000-06:00
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
@@ -54,7 +54,11 @@ function doWrapping(individualLines: boolean, args: any) {
 			return;
 		}
 	}
-	const syntax = 'html';
+	args = args || {};
+	if (!args['language']) {
+		args['language'] = editor.document.languageId;
+	}
+	const syntax = getSyntaxFromArgs(args) || 'html';
 	const rootNode = parseDocument(editor.document, false);
 
 	let inPreview = false;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,11 @@ function doWrapping(individualLines: boolean, args: any) {`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`- const syntax = 'html';`
	`57`	`+ args = args \|\| {};`
	`58`	`+ if (!args['language']) {`
	`59`	`+ args['language'] = editor.document.languageId;`
	`60`	`+ }`
	`61`	`+ const syntax = getSyntaxFromArgs(args) \|\| 'html';`
`58`	`62`	`const rootNode = parseDocument(editor.document, false);`
`59`	`63`
`60`	`64`	`let inPreview = false;`