Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

CSS and HTML Line Comment #2133

Merged
merged 4 commits into from
Dec 5, 2012
Merged

CSS and HTML Line Comment #2133

merged 4 commits into from
Dec 5, 2012

Conversation

TomMalbran
Copy link
Contributor

Adding line comment to CSS and HTML as suggested here: #2119

The implementation is like Sublime's where the entire line (avoiding empty spaces at the start) gets commented if there is no selection, and just does a block-comment if there is a selection.

@ghost ghost assigned redmunds Nov 16, 2012
@redmunds
Copy link
Contributor

I expected this feature to work the same as line commenting with // in a JavaScript file, so this does not works as I expected it to in these cases:

  1. If I put IP in a line in a CSS file, then the line is wrapped with /* ... / as I expect. But, since it's a "line" comment feature, then I expected the entire line to be commented, so / would start at column 0, not after the indent.
  2. If I select a range of text, I expect each line that has something selected to have it's line commented in it's entirely. So, with this text (with start/stop selection indicated by | char):
 ab|c
 123
 x|yz

In a JS file results in this:

// abc
// 123
// xyz

So I would expect a CSS file to be commented like this:

/* abc*/
/* 123*/
/* xyz*/

The result I get is what I wold expect from the block commenting feature:

 ab/*c
 123
 x*/yz

I don't see the purpose of this feature if it's going to do the same as block commenting.

*
* The implementation uses blockCommentPrefixSuffix, with the exception of the case where
* there is no selection on a uncommented and not empty line. In this case the whole lines gets
* commented in a bock-comment.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: bock

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder: fix this typo

@peterflynn
Copy link
Member

I could see it both ways. The current implementation here is consistent with Sublime, so it can't be that bad :-)

@redmunds, re "what's the point?" -- to me part of the motivation for this is just discoverability and muscle memory. If you hit the shortcut you're used to using for comments in JS and it does nothing in a CSS file, it feels a little broken. But there is also a difference in behavior: if you have nothing selected, the block-comment command inserts an empty comment at the cursor position instead of commenting the whole line.

@redmunds
Copy link
Contributor

@peterflynn I think that along with muscle memory comes expectation of similar behavior. To extend the case above, I think a result of:

/*
 abc
 123
 xyz
*/

is OK. The expectation for me is more about what gets commented than how it gets commented.

The other case I forgot to mention is a range selected in the middle of a line:

 abc |123| xyz

results in:

 abc /*123*/ xyz

where I expected:

/* abc 123 xyz*/

I think this would be easy to implement with existing code, so I guess it's just a matter of deciding on expected behavior.

@redmunds
Copy link
Contributor

Done with initial review.

@TomMalbran
Copy link
Contributor Author

I was thinking of doing something that would make the line-comment, comment the complete lines in the selection, since for block-commenting there is the other function. But I went with Sublime's approach in this pull.

This different behavior seems easy enough to implement, since the only hard part of restoring the original selection should always do the same thing.

@redmunds
Copy link
Contributor

Tom,

Sorry I didn't see your updates. Be sure to add a comment after you push changes to trigger an e-mail to get the attention of the reviewer. Anyway, we're trying to close down sprint 17, so I won't get to this until maybe next week.

Thanks, Randy

@TomMalbran
Copy link
Contributor Author

@redmunds Its ok. I did figure you were all too busy finishing the main features for this sprint, and this can wait. But i didn't knew about the mail trigger, will do it next time.

Thanks

selEnd = sel.end,
prefixExp = new RegExp("^" + StringUtils.regexEscape(prefix), "g"),
lineSelection = sel.start.ch === 0 && sel.end.ch === 0 && sel.start.line !== sel.end.line,
multipleLine = sel.start.line !== sel.end.line,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change these variable names to something like isLineSelection and isMultipleLine to indicate that they are boolean values?

@redmunds
Copy link
Contributor

redmunds commented Dec 3, 2012

Done with review. This works great! Just a couple minor comments.

@TomMalbran
Copy link
Contributor Author

Thanks. Fixed the tipo, the variables naming and the if nesting.

@redmunds
Copy link
Contributor

redmunds commented Dec 5, 2012

Looks good. Thanks. Merging.

redmunds added a commit that referenced this pull request Dec 5, 2012
@redmunds redmunds merged commit 529eab7 into adobe:master Dec 5, 2012
peterflynn added a commit that referenced this pull request Dec 14, 2012
…e line

comments differently), #2133 (single-line block comment mode when Line
Comment invoked in CSS/HTML/etc. - enable test coverage), and #2148 (don't
replace whole selection - which means tests must work around #2335).
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants