maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Emmet Toggle Comment HTML 💄

Browse source
This commit is contained in:
Raymond Zhao 2020-12-18 18:01:15 +00:00 committed by GitHub
parent ea15eb4e5a
commit 6ad2dccc78
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
extensions/emmet/src/test/toggleComment.test.ts
View file

@ -26,7 +26,7 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
<div><li><span>Bye</span></li></div>
</ul>
<ul>
<!--<li>Previously Commented Node</li>-->
<!-- <li>Previously Commented Node</li> -->
<li>Another Node</li>
</ul>
<span/>
@ -47,14 +47,14 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const expectedContents = `
<div class="hello">
<ul>
<li><!--<span>Hello</span>--></li>
<!--<li><span>There</span></li>-->
<!--<div><li><span>Bye</span></li></div>-->
<li><!-- <span>Hello</span> --></li>
<!-- <li><span>There</span></li> -->
<!-- <div><li><span>Bye</span></li></div> -->
</ul>
<!--<ul>
<!-- <ul>
<li>Previously Commented Node</li>
<li>Another Node</li>
</ul>-->
</ul> -->
<span/>
<style>
.boo {
@ -89,14 +89,14 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const expectedContents = `
<div class="hello">
<ul>
<li><!--<span>Hello</span>--></li>
<!--<li><span>There</span></li>-->
<li><!-- <span>Hello</span> --></li>
<!-- <li><span>There</span></li> -->
<div><li><span>Bye</span></li></div>
</ul>
<!--<ul>
<!-- <ul>
<li>Previously Commented Node</li>
<li>Another Node</li>
</ul>-->
</ul> -->
<span/>
<style>
.boo {
@ -130,12 +130,12 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const expectedContents = `
<div class="hello">
<ul>
<!--<li><span>Hello</span></li>
<li><span>There</span></li>-->
<!-- <li><span>Hello</span></li>
<li><span>There</span></li> -->
<div><li><span>Bye</span></li></div>
</ul>
<ul>
<!--<li>Previously Commented Node</li>-->
<!-- <li>Previously Commented Node</li> -->
<li>Another Node</li>
</ul>
<span/>
@ -168,14 +168,14 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const expectedContents = `
<div class="hello">
<ul>
<!--<li><span>Hello</span></li>
<li><span>There</span></li>-->
<!-- <li><span>Hello</span></li>
<li><span>There</span></li> -->
<div><li><span>Bye</span></li></div>
</ul>
<!--<ul>
<!-- <ul>
<li>Previously Commented Node</li>
<li>Another Node</li>
</ul>-->
</ul> -->
<span/>
<style>
.boo {
@ -206,16 +206,16 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const expectedContents = `
<div class="hello">
<ul>
<li><!--<span>Hello</span>--></li>
<!--<li><span>There</span></li>-->
<li><!-- <span>Hello</span> --></li>
<!-- <li><span>There</span></li> -->
<div><li><span>Bye</span></li></div>
</ul>
<!--<ul>
<!-- <ul>
<li>Previously Commented Node</li>
<li>Another Node</li>
</ul>-->
</ul> -->
<span/>
<!--<style>
<!-- <style>
.boo {
margin: 10px;
padding: 20px;
@ -224,7 +224,7 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
margin: 10px;
padding: 20px;
}
</style>-->
</style> -->
</div>
`;
return withRandomFileEditor(contents, 'html', (editor, doc) => {
@ -252,16 +252,16 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
const templateContents = `
<script type="text/template">
<li><span>Hello</span></li>
<li><!--<span>There</span>--></li>
<li><!-- <span>There</span> --></li>
<div><li><span>Bye</span></li></div>
<span/>
</script>
`;
const expectedContents = `
<script type="text/template">
<!--<li><span>Hello</span></li>-->
<!-- <li><span>Hello</span></li> -->
<li><span>There</span></li>
<div><li><!--<span>Bye</span>--></li></div>
<div><li><!-- <span>Bye</span> --></li></div>
<span/>
</script>
`;
@ -733,9 +733,9 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
</div>
`;
const expectedContents = `
<!--<div>
<!-- <div>
<p>Hello</p>
</div>-->
</div> -->
`;
return withRandomFileEditor(contents, 'html', (editor, doc) => {
editor.selections = [

4
extensions/emmet/src/toggleComment.ts
View file

@ -11,8 +11,8 @@ import { DocumentStreamReader } from './bufferStream';
const startCommentStylesheet = '/*';
const endCommentStylesheet = '*/';
const startCommentHTML = '<!--';
const endCommentHTML = '-->';
const startCommentHTML = '<!-- ';
const endCommentHTML = ' -->';
export function toggleComment(): Thenable<boolean> | undefined {
if (!validate() || !vscode.window.activeTextEditor) {