Fix #37

microsoft · Dec 30, 2020 · 4d59a1e · 4d59a1e
1 parent 4a97cc0
commit 4d59a1e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/emmetHelper.ts b/src/emmetHelper.ts
@@ -631,7 +631,7 @@ export function getExpandOptions(syntax: string, emmetConfig?: VSCodeEmmetConfig
 		'output.compactBoolean': profile['compactBooleanAttributes'] ?? preferences['profile.allowCompactBoolean'],
 		// 'output.booleanAttributes': string[],
 		// 'output.reverseAttributes': boolean,
-		'output.selfClosingStyle': profile['selfClosingStyle'],
+		'output.selfClosingStyle': profile['selfClosingStyle'] ?? getClosingStyle(syntax),
 		'output.field': emmetSnippetField,
 		// 'output.text': TextOutput,
 		// 'markup.href': boolean,
@@ -683,6 +683,15 @@ export function getExpandOptions(syntax: string, emmetConfig?: VSCodeEmmetConfig
 	};
 }
 
+function getClosingStyle(syntax: string): string {
+	switch (syntax) {
+		case 'xhtml': return 'xhtml';
+		case 'xml': return 'xml';
+		case 'xsl': return 'xml';
+		default: return 'html';
+	}
+}
+
 function splitVendorPrefix(abbreviation: string): { prefixOptions: string, abbreviationWithoutPrefix: string } {
 	if (!vendorPrefixesEnabled) {
 		return {

diff --git a/src/test/expand.test.ts b/src/test/expand.test.ts
@@ -95,6 +95,9 @@ describe('Expand Abbreviations', () => {
 	testExpandWithCompletion('css', 'opa1', 'opacity: 1;');
 	testExpandWithCompletion('css', 'opa.a', 'opacity: .a;');
 
+	// https://github.com/microsoft/vscode-emmet-helper/issues/37
+	testExpandWithCompletion('xsl', 'cp/', '<xsl:copy select="${0}"/>')
+
 	// escaped dollar signs should not change after going through Emmet expansion only
 	// VS Code automatically removes the backslashes after the expansion
 	testExpand('html', 'span{\\$5}', '<span>\\$5</span>');