Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[html] Format onPaste issues with HTML. Fixes #21218

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-04-21 13:59:46 +02:00
parent 2ef2602cc8
commit ef9e03c8ad
10 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/html/server/src/test/fixtures/expected/19813-4spaces.html vendored
View File

@@ -17,6 +17,7 @@
</script>
</head>
<body> </body>
<body>
</body>
</html>

3
extensions/html/server/src/test/fixtures/expected/19813-tab.html vendored
View File

@@ -17,6 +17,7 @@
</script>
</head>
<body> </body>
<body>
</body>
</html>

3
extensions/html/server/src/test/fixtures/expected/19813.html vendored
View File

@@ -17,6 +17,7 @@
</script>
</head>
<body> </body>
<body>
</body>
</html>

1
extensions/html/server/src/test/fixtures/expected/21634.html vendored
View File

@@ -1,4 +1,5 @@
<app-route path="/module" element="page-module" bindRouter onUrlChange="updateModel"></app-route>
<script>
Polymer({
});

14
extensions/html/server/src/test/formatting.test.ts
View File

@@ -15,7 +15,7 @@ import { format } from '../modes/formatting';
suite('HTML Embedded Formatting', () => {
function assertFormat(value: string, expected: string, options?: any, formatOptions?: FormattingOptions): void {
function assertFormat(value: string, expected: string, options?: any, formatOptions?: FormattingOptions, message?: string): void {
var languageModes = getLanguageModes({ css: true, javascript: true });
if (options) {
languageModes.getAllModes().forEach(m => m.configure(options));
@@ -41,13 +41,13 @@ suite('HTML Embedded Formatting', () => {
let result = format(languageModes, document, range, formatOptions, { css: true, javascript: true });
let actual = applyEdits(document, result);
assert.equal(actual, expected);
assert.equal(actual, expected, message);
}
function assertFormatWithFixture(fixtureName: string, expectedPath: string, options?: any, formatOptions?: FormattingOptions): void {
let input = fs.readFileSync(path.join(__dirname, 'fixtures', 'inputs', fixtureName)).toString();
let expected = fs.readFileSync(path.join(__dirname, 'fixtures', 'expected', expectedPath)).toString();
assertFormat(input, expected, options, formatOptions);
assertFormat(input, expected, options, formatOptions, expectedPath);
}
test('HTML only', function (): any {
@@ -64,10 +64,9 @@ suite('HTML Embedded Formatting', () => {
assertFormat('<html><head>\n <script>\nvar x=4;\nconsole.log("Hi");\n</script></head></html>', '<html>\n\n<head>\n <script>\n var x = 4;\n console.log("Hi");\n\n </script>\n</head>\n\n</html>');
assertFormat('<html><head>\n |<script>\nvar x=5;\n</script>|</head></html>', '<html><head>\n <script>\n var x = 5;\n\n </script></head></html>');
assertFormat('<html><head>\n <script>\n|var x=6;|\n</script></head></html>', '<html><head>\n <script>\n var x = 6;\n</script></head></html>');
});
test('HTLM & Scripts - Fixtures', function() {
test('HTLM & Scripts - Fixtures', function () {
assertFormatWithFixture('19813.html', '19813.html');
assertFormatWithFixture('19813.html', '19813-4spaces.html', void 0, FormattingOptions.create(4, true));
assertFormatWithFixture('19813.html', '19813-tab.html', void 0, FormattingOptions.create(1, false));
@@ -99,6 +98,11 @@ suite('HTML Embedded Formatting', () => {
assertFormat('<html><head><script>\nvar x=1;\n</script></head></html>', '<html>\n\n<head>\n <script>\n var x = 1;\n\n </script>\n</head>\n\n</html>\n', options);
});
test('Inside script', function (): any {
assertFormat('<html><head>\n <script>\n|var x=6;|\n</script></head></html>', '<html><head>\n <script>\n var x = 6;\n</script></head></html>');
assertFormat('<html><head>\n <script>\n|var x=6;\nvar y= 9;|\n</script></head></html>', '<html><head>\n <script>\n var x = 6;\n var y = 9;\n</script></head></html>');
});
});
function applyEdits(document: TextDocument, edits: TextEdit[]): string {