mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow pre-line single-lined comments to stay on the same line

Browse Source
This commit is contained in:
topecongiro 2017-08-27 14:41:15 +09:00
parent 6554e7c206
commit fd10d25680
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lists.rs
View File

@ -117,13 +117,23 @@ impl ListItem {
self.item.as_ref().map_or("", |s| &*s)
}
pub fn is_multiline(&self) -> bool {
pub fn is_different_group(&self) -> bool {
self.inner_as_ref().contains('\n') || self.pre_comment.is_some() ||
self.post_comment
.as_ref()
.map_or(false, |s| s.contains('\n'))
}
pub fn is_multiline(&self) -> bool {
self.inner_as_ref().contains('\n') ||
self.pre_comment
.as_ref()
.map_or(false, |s| s.contains('\n')) ||
self.post_comment
.as_ref()
.map_or(false, |s| s.contains('\n'))
}
pub fn has_comment(&self) -> bool {
self.pre_comment
.as_ref()
@ -469,7 +479,7 @@ where
let item = item.as_ref();
let inner_item_width = item.inner_as_ref().len();
if !first &&
(item.is_multiline() || !item.post_comment.is_some() ||
(item.is_different_group() || !item.post_comment.is_some() ||
inner_item_width + overhead > max_budget)
{
return max_width;