squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Simplify code

Browse source
This commit is contained in:
Aleksey Kladov 2020-11-12 11:45:18 +01:00
parent f73b874157
commit 81ac99f60a
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
crates/syntax/src/ast/token_ext.rs
View file

@ -14,16 +14,15 @@ use crate::{
impl ast::Comment { impl ast::Comment {
pub fn kind(&self) -> CommentKind { pub fn kind(&self) -> CommentKind {
kind_by_prefix(self.text()) CommentKind::from_text(self.text())
} }
pub fn prefix(&self) -> &'static str { pub fn prefix(&self) -> &'static str {
for (prefix, k) in COMMENT_PREFIX_TO_KIND.iter() { let &(prefix, _kind) = CommentKind::BY_PREFIX
if *k == self.kind() && self.text().starts_with(prefix) { .iter()
return prefix; .find(|&(prefix, kind)| self.kind() == *kind && self.text().starts_with(prefix))
} .unwrap();
} prefix
unreachable!()
} }
} }
@ -55,29 +54,25 @@ pub enum CommentPlacement {
Outer, Outer,
} }
const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = { impl CommentKind {
use {CommentPlacement::*, CommentShape::*}; const BY_PREFIX: [(&'static str, CommentKind); 8] = [
&[ ("/**/", CommentKind { shape: CommentShape::Block, doc: None }),
("////", CommentKind { shape: Line, doc: None }), ("////", CommentKind { shape: CommentShape::Line, doc: None }),
("///", CommentKind { shape: Line, doc: Some(Outer) }), ("///", CommentKind { shape: CommentShape::Line, doc: Some(CommentPlacement::Outer) }),
("//!", CommentKind { shape: Line, doc: Some(Inner) }), ("//!", CommentKind { shape: CommentShape::Line, doc: Some(CommentPlacement::Inner) }),
("/**", CommentKind { shape: Block, doc: Some(Outer) }), ("/**", CommentKind { shape: CommentShape::Block, doc: Some(CommentPlacement::Outer) }),
("/*!", CommentKind { shape: Block, doc: Some(Inner) }), ("/*!", CommentKind { shape: CommentShape::Block, doc: Some(CommentPlacement::Inner) }),
("//", CommentKind { shape: Line, doc: None }), ("//", CommentKind { shape: CommentShape::Line, doc: None }),
("/*", CommentKind { shape: Block, doc: None }), ("/*", CommentKind { shape: CommentShape::Block, doc: None }),
] ];
};
fn kind_by_prefix(text: &str) -> CommentKind { pub(crate) fn from_text(text: &str) -> CommentKind {
if text == "/**/" { let &(_prefix, kind) = CommentKind::BY_PREFIX
return CommentKind { shape: CommentShape::Block, doc: None }; .iter()
.find(|&(prefix, _kind)| text.starts_with(prefix))
.unwrap();
kind
} }
for (prefix, kind) in COMMENT_PREFIX_TO_KIND.iter() {
if text.starts_with(prefix) {
return *kind;
}
}
panic!("bad comment text: {:?}", text)
} }
impl ast::Whitespace { impl ast::Whitespace {