[html] editor.action.formatDocument removes <script> property. Fixes microsoft#36574

aeschli · aeschli · commit fc6640df6f5a · 2017-11-15T12:48:36.000+01:00
diff --git a/extensions/html/server/src/modes/javascriptMode.ts b/extensions/html/server/src/modes/javascriptMode.ts
@@ -253,7 +253,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			let start = currentTextDocument.offsetAt(range.start);
 			let end = currentTextDocument.offsetAt(range.end);
 			let lastLineRange = null;
-			if (range.end.character === 0 || isWhitespaceOnly(currentTextDocument.getText().substr(end - range.end.character, range.end.character))) {
+			if (range.end.line > range.start.line && (range.end.character === 0 || isWhitespaceOnly(currentTextDocument.getText().substr(end - range.end.character, range.end.character)))) {
 				end -= range.end.character;
 				lastLineRange = Range.create(Position.create(range.end.line, 0), range.end);
 			}
diff --git a/extensions/html/server/src/test/formatting.test.ts b/extensions/html/server/src/test/formatting.test.ts
@@ -107,6 +107,10 @@ suite('HTML Embedded Formatting', () => {
 		assertFormat('<html><head>\n  |<script>\nvar x=6;\n</script>\n|</head></html>', '<html><head>\n  <script>\n    var x = 6;\n  </script>\n</head></html>');
 	});
 
+	test('bug 36574', function (): any {
+		assertFormat('<script src="/js/main.js"> </script>', '<script src="/js/main.js"> </script>');
+	});
+
 });
 
 function applyEdits(document: TextDocument, edits: TextEdit[]): string {

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume`
`253`	`253`	`let start = currentTextDocument.offsetAt(range.start);`
`254`	`254`	`let end = currentTextDocument.offsetAt(range.end);`
`255`	`255`	`let lastLineRange = null;`
`256`		`- if (range.end.character === 0 \|\| isWhitespaceOnly(currentTextDocument.getText().substr(end - range.end.character, range.end.character))) {`
	`256`	`+ if (range.end.line > range.start.line && (range.end.character === 0 \|\| isWhitespaceOnly(currentTextDocument.getText().substr(end - range.end.character, range.end.character)))) {`
`257`	`257`	`end -= range.end.character;`
`258`	`258`	`lastLineRange = Range.create(Position.create(range.end.line, 0), range.end);`
`259`	`259`	`}`