-
+
+
+
-
+
- img +
- hithere + ul>li + ul>li*2 + ul>li.item$*2 + ul>li.item$@44*2 +
- Item 1 + [13, 23, 16, 2], // inner contents of
- Item 1 + [14, 21, 14, 27] // Item 1 + ]; + expectedBalanceInRanges.forEach(([linestart, colstart, lineend, colend]) => { + balanceIn(); + testSelection(editor.selection, colstart, linestart, colend, lineend); + }); + + return Promise.resolve(); + }); + }); + +}); + +function testSelection(selection: Selection, startChar: number, startline: number, endChar?: number, endLine?: number) { + + assert.equal(selection.anchor.line, startline); + assert.equal(selection.anchor.character, startChar); + if (!endLine && endLine !== 0) { + assert.equal(selection.isSingleLine, true); + } else { + assert.equal(selection.active.line, endLine); + } + if (!endChar && endChar !== 0) { + assert.equal(selection.isEmpty, true); + } else { + assert.equal(selection.active.character, endChar); + } +} \ No newline at end of file diff --git a/extensions/emmet/src/test/incrementDecrement.test.ts b/extensions/emmet/src/test/incrementDecrement.test.ts index 9aace12eb3d..a846bc6b782 100644 --- a/extensions/emmet/src/test/incrementDecrement.test.ts +++ b/extensions/emmet/src/test/incrementDecrement.test.ts @@ -4,8 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { Selection, commands } from 'vscode'; +import { Selection } from 'vscode'; import { withRandomFileEditor, closeAllEditors } from './testUtils'; +import { incrementDecrement } from '../incrementDecrement'; suite('Tests for Increment/Decrement Emmet Commands', () => { teardown(closeAllEditors); @@ -17,62 +18,62 @@ suite('Tests for Increment/Decrement Emmet Commands', () => { `; test('incrementNumberByOne', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 10), new Selection(2, 7, 2, 10)]; - return commands.executeCommand('emmet.incrementNumberByOne').then(() => { - assert.equal(doc.getText(), contents.replace('123', '124').replace('999', '1000')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 10), new Selection(2, 7, 2, 10)]; + return incrementDecrement(1).then(() => { + assert.equal(doc.getText(), contents.replace('123', '124').replace('999', '1000')); + return Promise.resolve(); }); + }); }); test('incrementNumberByTen', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 10), new Selection(2, 7, 2, 10)]; - return commands.executeCommand('emmet.incrementNumberByTen').then(() => { - assert.equal(doc.getText(), contents.replace('123', '133').replace('999', '1009')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 10), new Selection(2, 7, 2, 10)]; + return incrementDecrement(10).then(() => { + assert.equal(doc.getText(), contents.replace('123', '133').replace('999', '1009')); + return Promise.resolve(); }); + }); }); test('incrementNumberByOneTenth', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 13), new Selection(2, 7, 2, 12)]; - return commands.executeCommand('emmet.incrementNumberByOneTenth').then(() => { - assert.equal(doc.getText(), contents.replace('123.43', '123.53').replace('999.9', '1000')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 13), new Selection(2, 7, 2, 12)]; + return incrementDecrement(0.1).then(() => { + assert.equal(doc.getText(), contents.replace('123.43', '123.53').replace('999.9', '1000')); + return Promise.resolve(); }); + }); }); test('decrementNumberByOne', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 10), new Selection(3, 7, 3, 10)]; - return commands.executeCommand('emmet.decrementNumberByOne').then(() => { - assert.equal(doc.getText(), contents.replace('123', '122').replace('100', '99')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 10), new Selection(3, 7, 3, 10)]; + return incrementDecrement(-1).then(() => { + assert.equal(doc.getText(), contents.replace('123', '122').replace('100', '99')); + return Promise.resolve(); }); + }); }); test('decrementNumberByTen', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 10), new Selection(3, 7, 3, 10)]; - return commands.executeCommand('emmet.decrementNumberByTen').then(() => { - assert.equal(doc.getText(), contents.replace('123', '113').replace('100', '90')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 10), new Selection(3, 7, 3, 10)]; + return incrementDecrement(-10).then(() => { + assert.equal(doc.getText(), contents.replace('123', '113').replace('100', '90')); + return Promise.resolve(); }); + }); }); test('decrementNumberByOneTenth', function (): any { - return withRandomFileEditor(contents, (editor, doc) => { - editor.selections = [new Selection(1, 7, 1, 13), new Selection(3, 7, 3, 10)]; - return commands.executeCommand('emmet.decrementNumberByOneTenth').then(() => { - assert.equal(doc.getText(), contents.replace('123.43', '123.33').replace('100', '99.9')); - return Promise.resolve(); - }); + return withRandomFileEditor(contents, 'txt', (editor, doc) => { + editor.selections = [new Selection(1, 7, 1, 13), new Selection(3, 7, 3, 10)]; + return incrementDecrement(-0.1).then(() => { + assert.equal(doc.getText(), contents.replace('123.43', '123.33').replace('100', '99.9')); + return Promise.resolve(); }); + }); }); }); \ No newline at end of file diff --git a/extensions/emmet/src/test/reflectCssValue.test.ts b/extensions/emmet/src/test/reflectCssValue.test.ts new file mode 100644 index 00000000000..228c62ed960 --- /dev/null +++ b/extensions/emmet/src/test/reflectCssValue.test.ts @@ -0,0 +1,62 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { Selection, commands } from 'vscode'; +import { withRandomFileEditor, closeAllEditors } from './testUtils'; +import { reflectCssValue } from '../reflectCssValue'; + +suite('Tests for Emmet: Reflect CSS Value command', () => { + teardown(closeAllEditors); + + const cssContents = ` + .header { + margin: 10px; + padding: 10px; + transform: rotate(50deg); + -moz-transform: rotate(20deg); + -o-transform: rotate(50deg); + -webkit-transform: rotate(50deg); + -ms-transform: rotate(50deg); + } + `; + + const htmlContents = ` + + + + `; + + test('Reflect Css Value in css file', function (): any { + return withRandomFileEditor(cssContents, '.css', (editor, doc) => { + editor.selections = [new Selection(5, 10, 5, 10)]; + return reflectCssValue().then(() => { + assert.equal(doc.getText(), cssContents.replace(/\(50deg\)/g, '(20deg)')); + return Promise.resolve(); + }); + }); + }); + + test('Reflect Css Value in html file', function (): any { + return withRandomFileEditor(htmlContents, '.html', (editor, doc) => { + editor.selections = [new Selection(7, 20, 7, 20)]; + return reflectCssValue().then(() => { + assert.equal(doc.getText(), htmlContents.replace(/\(50deg\)/g, '(20deg)')); + return Promise.resolve(); + }); + }); + }); + +}); \ No newline at end of file diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts new file mode 100644 index 00000000000..23a09e18a4c --- /dev/null +++ b/extensions/emmet/src/test/tagActions.test.ts @@ -0,0 +1,127 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { Selection } from 'vscode'; +import { withRandomFileEditor, closeAllEditors } from './testUtils'; +import { removeTag } from '../removeTag'; +import { updateTag } from '../updateTag'; +import { matchTag } from '../matchTag'; +import { splitJoinTag } from '../splitJoinTag'; + +suite('Tests for Emmet actions on html tags', () => { + teardown(closeAllEditors); + + const contents = ` +
- Hello +
- There +
- Bye
Hello
+ - Bye
- Hello + There +
- Bye +
- +
- There +
- Bye
- Hello +
- There +
- Bye
- Another Node +
- Bye
- There + new Selection(7, 2, 10, 7) // The
- Bye
- Another Node +
- Bye
- Hello -
- There -
- Bye
Hello
- - Bye
+
+ ${bemFilterExample}
+
+`;
+
+const htmlContentsForWrapTests = `
+
+`;
+
+const wrapBlockElementExpected = `
+
+`;
+
+const wrapInlineElementExpected = `
+
+`;
+
+const wrapSnippetExpected = `
+
+`;
+
+const wrapMultiLineAbbrExpected = `
+
+`;
+
+suite('Tests for Expand Abbreviations (HTML)', () => {
+ teardown(() => {
+ // Reset config and close all editors
+ return workspace.getConfiguration('emmet').update('excludeLanguages', []).then(closeAllEditors);
+ });
+
+ test('Expand snippets (HTML)', () => {
+ return testHtmlExpandAbbreviation(new Selection(3, 23, 3, 23), 'img', '![\"\"](\"\")
');
+ });
+
+ test('Expand abbreviation (HTML)', () => {
+ return testHtmlExpandAbbreviation(new Selection(5, 25, 5, 25), 'ul>li', '
');
+ });
+
+ test('No expanding text inside open tag (HTML)', () => {
+ return testHtmlExpandAbbreviation(new Selection(2, 4, 2, 4), '', '', true);
+ });
+
+ test('Expand css when inside style tag (HTML)', () => {
+ return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
+ editor.selection = new Selection(13, 3, 13, 6);
+ let expandPromise = expandAbbreviation({ language: 'css' });
+ if (!expandPromise) {
+ return Promise.resolve();
+ }
+ return expandPromise.then(() => {
+ assert.equal(editor.document.getText(), htmlContents.replace('m10', 'margin: 10px;'));
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('No expanding when html is excluded in the settings', () => {
+ return workspace.getConfiguration('emmet').update('excludeLanguages', ['html']).then(() => {
+ return testHtmlExpandAbbreviation(new Selection(9, 6, 9, 6), '', '', true).then(() => {
+ return workspace.getConfiguration('emmet').update('excludeLanguages', []);
+ });
+ });
+ });
+
+ test('Expand using bem filter', () => {
+ return testHtmlExpandAbbreviation(new Selection(16, 55, 16, 55), bemFilterExample, expectedBemFilterOutput);
+ });
+
+});
+
+suite('Tests for Expand Abbreviations (CSS)', () => {
+ teardown(closeAllEditors);
+
+ test('Expand abbreviation (CSS)', () => {
+ return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
+ editor.selection = new Selection(4, 1, 4, 4);
+ return expandAbbreviation(null).then(() => {
+ assert.equal(editor.document.getText(), cssContents.replace('m10', 'margin: 10px;'));
+ return Promise.resolve();
+ });
+ });
+
+ });
+});
+
+suite('Tests for Wrap with Abbreviations', () => {
+ teardown(closeAllEditors);
+
+ const multiCursors = [new Selection(2, 6, 2, 6), new Selection(3, 6, 3, 6)];
+ const multiCursorsWithSelection = [new Selection(2, 2, 2, 28), new Selection(3, 2, 3, 33)];
+ const multiCursorsWithFullLineSelection = [new Selection(2, 0, 2, 28), new Selection(3, 0, 3, 33)];
+
+
+ test('Wrap with block element using multi cursor', () => {
+ return testWrapWithAbbreviation(multiCursors, 'div', wrapBlockElementExpected);
+ });
+
+ test('Wrap with inline element using multi cursor', () => {
+ return testWrapWithAbbreviation(multiCursors, 'span', wrapInlineElementExpected);
+ });
+
+ test('Wrap with snippet using multi cursor', () => {
+ return testWrapWithAbbreviation(multiCursors, 'a', wrapSnippetExpected);
+ });
+
+ test('Wrap with multi line abbreviation using multi cursor', () => {
+ return testWrapWithAbbreviation(multiCursors, 'ul>li', wrapMultiLineAbbrExpected);
+ });
+
+ test('Wrap with block element using multi cursor selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithSelection, 'div', wrapBlockElementExpected);
+ });
+
+ test('Wrap with inline element using multi cursor selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithSelection, 'span', wrapInlineElementExpected);
+ });
+
+ test('Wrap with snippet using multi cursor selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithSelection, 'a', wrapSnippetExpected);
+ });
+
+ test('Wrap with multi line abbreviation using multi cursor selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithSelection, 'ul>li', wrapMultiLineAbbrExpected);
+ });
+
+ test('Wrap with block element using multi cursor full line selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'div', wrapBlockElementExpected);
+ });
+
+ test('Wrap with inline element using multi cursor full line selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'span', wrapInlineElementExpected);
+ });
+
+ test('Wrap with snippet using multi cursor full line selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'a', wrapSnippetExpected);
+ });
+
+ test('Wrap with multi line abbreviation using multi cursor full line selection', () => {
+ return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'ul>li', wrapMultiLineAbbrExpected);
+ });
+
+});
+
+
+
+function testHtmlExpandAbbreviation(selection: Selection, abbreviation: string, expandedText: string, shouldFail?: boolean): Thenable- \n\t\t\t\n\t\t
- \n\t\t\t\n\t\t\t\n\t\t
- \n\t\t\t\n\t\t\t\n\t\t
- \n\t\t\t\n\t\t\t\n\t\t
+
+
+
+
+
+
+
+`;
+
+ test('Emmet Next/Prev Edit point in html file', function (): any {
+ return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+ editor.selections = [new Selection(1, 5, 1, 5)];
+
+ let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [20, 0]];
+ expectedNextEditPoints.forEach(([line, col]) => {
+ fetchEditPoint('next');
+ testSelection(editor.selection, col, line);
+ });
+
+ let expectedPrevEditPoints = [[10, 2], [6, 8], [4, 16], [0, 0]];
+ expectedPrevEditPoints.forEach(([line, col]) => {
+ fetchEditPoint('prev');
+ testSelection(editor.selection, col, line);
+ });
+
+ return Promise.resolve();
+ });
+ });
+
+ test('Emmet Select Next/Prev Item in html file', function (): any {
+ return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+ editor.selections = [new Selection(2, 2, 2, 2)];
+
+ let expectedNextItemPoints: [number, number, number][] = [
+ [2, 1, 5], // html
+ [2, 6, 15], // lang="en"
+ [2, 12, 14], // en
+ [3, 1, 5], // head
+ [4, 2, 6], // meta
+ [4, 7, 17], // charset=""
+ [5, 2, 6], // meta
+ [5, 7, 22], // name="viewport"
+ [5, 13, 21], // viewport
+ [5, 23, 70], // content="width=device-width, initial-scale=1.0"
+ [5, 32, 69], // width=device-width, initial-scale=1.0
+ [5, 32, 51], // width=device-width,
+ [5, 52, 69], // initial-scale=1.0
+ [6, 2, 7] // title
+ ];
+ expectedNextItemPoints.forEach(([line, colstart, colend]) => {
+ fetchSelectItem('next');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ editor.selections = [new Selection(6, 15, 6, 15)];
+ expectedNextItemPoints.reverse().forEach(([line, colstart, colend]) => {
+ fetchSelectItem('prev');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ return Promise.resolve();
+ });
+ });
+
+ test('Emmet Select Next/Prev Item in css file', function (): any {
+ return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+ editor.selections = [new Selection(0, 0, 0, 0)];
+
+ let expectedNextItemPoints: [number, number, number][] = [
+ [1, 0, 4], // .boo
+ [2, 1, 19], // margin: 20px 10px;
+ [2, 9, 18], // 20px 10px
+ [2, 9, 13], // 20px
+ [2, 14, 18], // 10px
+ [3, 1, 36], // background-image: url('tryme.png');
+ [3, 19, 35], // url('tryme.png')
+ [6, 0, 9], // .boo .hoo
+ [7, 1, 14], // margin: 10px;
+ [7, 9, 13], // 10px
+ ];
+ expectedNextItemPoints.forEach(([line, colstart, colend]) => {
+ fetchSelectItem('next');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ editor.selections = [new Selection(9, 0, 9, 0)];
+ expectedNextItemPoints.reverse().forEach(([line, colstart, colend]) => {
+ fetchSelectItem('prev');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ return Promise.resolve();
+ });
+ });
+
+ test('Emmet Select Next/Prev Item in scss file with nested rules', function (): any {
+ return withRandomFileEditor(scssContents, '.scss', (editor, doc) => {
+ editor.selections = [new Selection(0, 0, 0, 0)];
+
+ let expectedNextItemPoints: [number, number, number][] = [
+ [1, 0, 4], // .boo
+ [2, 1, 19], // margin: 20px 10px;
+ [2, 9, 18], // 20px 10px
+ [2, 9, 13], // 20px
+ [2, 14, 18], // 10px
+ [3, 1, 36], // background-image: url('tryme.png');
+ [3, 19, 35], // url('tryme.png')
+ [5, 1, 10], // .boo .hoo
+ [6, 2, 15], // margin: 10px;
+ [6, 10, 14], // 10px
+ ];
+ expectedNextItemPoints.forEach(([line, colstart, colend]) => {
+ fetchSelectItem('next');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ editor.selections = [new Selection(8, 0, 8, 0)];
+ expectedNextItemPoints.reverse().forEach(([line, colstart, colend]) => {
+ fetchSelectItem('prev');
+ testSelection(editor.selection, colstart, line, colend);
+ });
+
+ return Promise.resolve();
+ });
+ });
+
+ test('Emmet Balance Out in html file', function (): any {
+ return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
+
+ editor.selections = [new Selection(14, 6, 14, 10)];
+ let expectedBalanceOutRanges: [number, number, number, number][] = [
+ [14, 3, 14, 32], // -
+ [13, 2, 16, 7], // outer contents of
-
+ [12, 21, 17, 1], // inner contents of
+ [12, 1, 17, 7], // outer contents of
+ [8, 6, 18, 0], // inner contents of
+ [8, 0, 18, 7], // outer contents of
+ [2, 16, 19, 0], // inner contents of
+ [2, 0, 19, 7], // outer contents of
+ ];
+ expectedBalanceOutRanges.forEach(([linestart, colstart, lineend, colend]) => {
+ balanceOut();
+ testSelection(editor.selection, colstart, linestart, colend, lineend);
+ });
+
+ editor.selections = [new Selection(12, 7, 12, 7)];
+ let expectedBalanceInRanges: [number, number, number, number][] = [
+ [13, 2, 16, 7], // outer contents of
-
+ [13, 23, 16, 2], // inner contents of
-
+ [14, 3, 14, 32], //
+
+ `;
+
+ test('update tag with multiple cursors', () => {
+ const expectedContents = `
+ -
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 17, 3, 17), // cursor inside tags
+ new Selection(4, 5, 4, 5), // cursor inside opening tag
+ new Selection(5, 35, 5, 35), // cursor inside closing tag
+ ];
+
+ return updateTag('section').then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+
+ test('remove tag with mutliple cursors', () => {
+ const expectedContents = `
+ -
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 17, 3, 17), // cursor inside tags
+ new Selection(4, 5, 4, 5), // cursor inside opening tag
+ new Selection(5, 35, 5, 35), // cursor inside closing tag
+ ];
+
+ return removeTag().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('split/join tag with mutliple cursors', () => {
+ const expectedContents = `
+ -
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 17, 3, 17), // join tag
+ new Selection(7, 5, 7, 5), // split tag
+ ];
+
+ return splitJoinTag().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('match tag with mutliple cursors', () => {
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(1, 0, 1, 0), // just before tag starts, i.e before <
+ new Selection(1, 1, 1, 1), // just before tag name starts
+ new Selection(1, 2, 1, 2), // inside tag name
+ new Selection(1, 6, 1, 6), // after tag name but before opening tag ends
+ new Selection(1, 18, 1, 18), // just before opening tag ends
+ new Selection(1, 19, 1, 19), // just after opening tag ends
+ ];
+
+ matchTag();
+
+ editor.selections.forEach(selection => {
+ assert.equal(selection.active.line, 8);
+ assert.equal(selection.active.character, 3);
+ assert.equal(selection.anchor.line, 8);
+ assert.equal(selection.anchor.character, 3);
+ });
+
+ return Promise.resolve();
+ });
+ });
+});
+
diff --git a/extensions/emmet/src/test/testUtils.ts b/extensions/emmet/src/test/testUtils.ts
index 3548946b570..c90691c0916 100644
--- a/extensions/emmet/src/test/testUtils.ts
+++ b/extensions/emmet/src/test/testUtils.ts
@@ -14,9 +14,9 @@ function rndName() {
return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10);
}
-export function createRandomFile(contents = ''): Thenable-
+
+
+ `;
+
+ test('toggle comment with multiple cursors, but no selection (HTML)', () => {
+ const expectedContents = `
+ -
+
-
+
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 17, 3, 17), // cursor inside the inner span element
+ new Selection(4, 5, 4, 5), // cursor inside opening tag
+ new Selection(5, 35, 5, 35), // cursor inside closing tag
+ new Selection(7, 3, 7, 3) // cursor inside open tag of -
+
+
+
+
- one of of whose children is already commented
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment with multiple cursors and whole node selected (HTML)', () => {
+ const expectedContents = `
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 7, 3, 25), // Hello<
+ new Selection(4, 3, 4, 30), // -
+
+
+
- one of of whose children is already commented
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment when multiple nodes are completely under single selection (HTML)', () => {
+ const expectedContents = `
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 4, 4, 30)
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment when multiple nodes are partially under single selection (HTML)', () => {
+ const expectedContents = `
+ -
+
+
-
+
+
+
+ `;
+ return withRandomFileEditor(contents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(3, 24, 4, 20),
+ new Selection(7, 2, 9, 10) // The -
+
+
- one of of whose children is already commented
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+});
+
+suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
+ teardown(closeAllEditors);
+
+ const contents = `
+ .one {
+ margin: 10px;
+ padding: 10px;
+ }
+ .two {
+ height: 42px;
+ /*display: none;*/
+ }
+ .three {
+ width: 42px;
+ }`;
+
+ test('toggle comment with multiple cursors, but no selection (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*margin: 10px;*/
+ padding: 10px;
+ }
+ /*.two {
+ height: 42px;
+ display: none;
+ }*/
+ .three {
+ width: 42px;
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 5, 2, 5), // cursor inside a property
+ new Selection(5, 4, 5, 4), // cursor inside selector
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment with multiple cursors and whole node selected (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*margin: 10px;*/
+ /*padding: 10px;*/
+ }
+ /*.two {
+ height: 42px;
+ display: none;
+ }*/
+ .three {
+ width: 42px;
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 2, 2, 15), // A property completely selected
+ new Selection(3, 0, 3, 16), // A property completely selected along with whitespace
+ new Selection(5, 1, 8, 1), // A rule completely selected
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+
+
+ test('toggle comment when multiple nodes are completely under single selection (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*margin: 10px;
+ padding: 10px;*/
+ }
+ /*.two {
+ height: 42px;
+ display: none;
+ }
+ .three {
+ width: 42px;
+ }*/`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 0, 3, 16), // 2 properties completely under a single selection along with whitespace
+ new Selection(5, 1, 11, 2), // 2 rules completely under a single selection
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment when multiple nodes are partially under single selection (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*margin: 10px;
+ padding: 10px;*/
+ }
+ /*.two {
+ height: 42px;
+ display: none;
+ }
+ .three {
+ width: 42px;
+ }*/`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 7, 3, 10), // 2 properties partially under a single selection
+ new Selection(5, 2, 11, 0), // 2 rules partially under a single selection
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+
+});
+
+
+suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
+ teardown(closeAllEditors);
+
+ const contents = `
+ .one {
+ height: 42px;
+
+ .two {
+ width: 42px;
+ }
+
+ .three {
+ padding: 10px;
+ }
+ }`;
+
+ test('toggle comment with multiple cursors, but no selection (SCSS)', () => {
+ const expectedContents = `
+ .one {
+ /*height: 42px;*/
+
+ /*.two {
+ width: 42px;
+ }*/
+
+ .three {
+ /*padding: 10px;*/
+ }
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 5, 2, 5), // cursor inside a property
+ new Selection(4, 4, 4, 4), // cursor inside a nested rule
+ new Selection(9, 5, 9, 5) // cursor inside a property inside a nested rule
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment with multiple cursors and whole node selected (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*height: 42px;*/
+
+ /*.two {
+ width: 42px;
+ }*/
+
+ .three {
+ /*padding: 10px;*/
+ }
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 2, 2, 15), // A property completely selected
+ new Selection(4, 2, 6, 3), // A rule completely selected
+ new Selection(9, 3, 9, 17) // A property inside a nested rule completely selected
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+
+
+ test('toggle comment when multiple nodes are completely under single selection (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*height: 42px;
+
+ .two {
+ width: 42px;
+ }*/
+
+ .three {
+ padding: 10px;
+ }
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 2, 6, 3), // A properties and a nested rule completely under a single selection
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('toggle comment when multiple nodes are partially under single selection (CSS)', () => {
+ const expectedContents = `
+ .one {
+ /*height: 42px;
+
+ .two {
+ width: 42px;
+ }*/
+
+ .three {
+ padding: 10px;
+ }
+ }`;
+ return withRandomFileEditor(contents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 6, 6, 1), // A properties and a nested rule partially under a single selection
+ ];
+
+ return toggleComment().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+
+});
\ No newline at end of file
diff --git a/extensions/emmet/src/test/updateImageSize.test.ts b/extensions/emmet/src/test/updateImageSize.test.ts
new file mode 100644
index 00000000000..6c648dd9485
--- /dev/null
+++ b/extensions/emmet/src/test/updateImageSize.test.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Selection } from 'vscode';
+import { withRandomFileEditor, closeAllEditors } from './testUtils';
+import { updateImageSize } from '../updateImageSize';
+import * as path from 'path';
+
+suite('Tests for Emmet actions on html tags', () => {
+ teardown(closeAllEditors);
+ const filePath = path.join(__dirname, '../../../../resources/linux/code.png');
+
+ test('update image css with multiple cursors in css file', () => {
+ const cssContents = `
+ .one {
+ margin: 10px;
+ padding: 10px;
+ background-image: url(https://github.com/Microsoft/vscode/blob/master/resources/linux/code.png);
+ }
+ .two {
+ background-image: url(https://github.com/Microsoft/vscode/blob/master/resources/linux/code.png);
+ height: 42px;
+ }
+ .three {
+ background-image: url(${filePath});
+ width: 42px;
+ }
+ `;
+ const expectedContents = `
+ .one {
+ margin: 10px;
+ padding: 10px;
+ background-image: url(https://github.com/Microsoft/vscode/blob/master/resources/linux/code.png);
+ width: 32px;
+ height: 32px;
+ }
+ .two {
+ background-image: url(https://github.com/Microsoft/vscode/blob/master/resources/linux/code.png);
+ width: 32px;
+ height: 32px;
+ }
+ .three {
+ background-image: url(${filePath});
+ height: 1024px;
+ width: 1024px;
+ }
+ `;
+ return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
+ editor.selections = [
+ new Selection(4, 50, 4, 50),
+ new Selection(7, 50, 7, 50),
+ new Selection(11, 50, 11, 50)
+ ];
+
+ return updateImageSize().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('update image size in css in html file with multiple cursors', () => {
+ const htmlWithCssContents = `
+
+
+
+ `;
+ const expectedContents = `
+
+
+
+ `;
+ return withRandomFileEditor(htmlWithCssContents, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(6, 50, 6, 50),
+ new Selection(9, 50, 9, 50),
+ new Selection(13, 50, 13, 50)
+ ];
+
+ return updateImageSize().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+ test('update image size in img tag in html file with multiple cursors', () => {
+ const htmlwithimgtag = `
+
+
+
+
+ `;
+ const expectedContents = `
+
+
+
+
+ `;
+ return withRandomFileEditor(htmlwithimgtag, 'html', (editor, doc) => {
+ editor.selections = [
+ new Selection(2, 50, 2, 50),
+ new Selection(3, 50, 3, 50),
+ new Selection(4, 50, 4, 50)
+ ];
+
+ return updateImageSize().then(() => {
+ assert.equal(doc.getText(), expectedContents);
+ return Promise.resolve();
+ });
+ });
+ });
+
+});
diff --git a/extensions/emmet/src/test/updateTag.test.ts b/extensions/emmet/src/test/updateTag.test.ts
deleted file mode 100644
index 58f72a439ea..00000000000
--- a/extensions/emmet/src/test/updateTag.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { Selection, commands } from 'vscode';
-import { withRandomFileEditor, closeAllEditors } from './testUtils';
-
-suite('Tests for Emmet: Update Tag', () => {
- teardown(closeAllEditors);
-
- const contents = `
-
-
- `;
-
- /* test('update tag with multiple cursors', () => {
- const expectedContents = `
- -
-
-
- `;
- return withRandomFileEditor(contents, (editor, doc) => {
- editor.selections = [
- new Selection(3, 17, 3, 17), // cursor inside tags
- new Selection(4, 14, 4, 14), // cursor inside opening tag
- new Selection(5, 47, 5, 47), // cursor inside closing tag
- ];
-
- return commands.executeCommand('emmet.updateTag', 'section').then(() => {
- assert.equal(doc.getText(), expectedContents);
- return Promise.resolve();
- });
- });
- }); */
-});
\ No newline at end of file
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
index 8f9200b96c5..d91e67016d7 100644
--- a/extensions/emmet/src/toggleComment.ts
+++ b/extensions/emmet/src/toggleComment.ts
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
-import { getNodesInBetween, getNode, parse } from './util';
+import { getNodesInBetween, getNode, parseDocument, sameNodes } from './util';
import { Node, Stylesheet } from 'EmmetNode';
import { isStyleSheet } from 'vscode-emmet-helper';
@@ -13,7 +13,7 @@ const endCommentStylesheet = '*/';
const startCommentHTML = '';
-export function toggleComment() {
+export function toggleComment(): Thenable-
-
\n\t$TM_SELECTED_TEXT\n
$0').insert();
+
+ let expected = [
+ 'start',
+ '\t',
+ '\t\t\t-one',
+ '\t\t\t-two',
+ '\t
',
+ 'end'
+ ].join('\n');
+
+ assert.equal(editor.getModel().getValue(), expected);
+
+ editor.getModel().setValue([
+ 'start',
+ '\t\t-one',
+ '\t-two',
+ 'end'
+ ].join('\n'));
+
+ editor.getModel().updateOptions({ insertSpaces: false });
+ editor.setSelection(new Selection(2, 2, 3, 7));
+
+ new SnippetSession(editor, '\n\t$TM_SELECTED_TEXT\n
$0').insert();
+
+ expected = [
+ 'start',
+ '\t',
+ '\t\t\t-one',
+ '\t\t-two',
+ '\t
',
+ 'end'
+ ].join('\n');
+
+ assert.equal(editor.getModel().getValue(), expected);
+ });
});
diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
index fc9c6715b20..07c264b307f 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts
@@ -9,7 +9,7 @@ import { isWindows } from 'vs/base/common/platform';
import URI from 'vs/base/common/uri';
import { Selection } from 'vs/editor/common/core/selection';
import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/browser/snippetVariables';
-import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
+import { SnippetParser, Variable } from 'vs/editor/contrib/snippet/browser/snippetParser';
import { Model } from 'vs/editor/common/model/model';
suite('Snippet Variables Resolver', function () {
@@ -31,59 +31,70 @@ suite('Snippet Variables Resolver', function () {
model.dispose();
});
+ function assertVariableResolve(resolver: EditorSnippetVariableResolver, varName: string, expected: string) {
+ const snippet = new SnippetParser().parse(`$${varName}`);
+ const variable =