mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove DOC_COMMENT

Browse source 
Closes #166
This commit is contained in:
Jeremy A. Kolb 2018-10-31 17:38:18 -04:00
parent 2b210d98b8
commit 61580f3cb8
5 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_editor/src/lib.rs
View file

@ -81,7 +81,7 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
let mut res = Vec::new(); let mut res = Vec::new();
for node in file.syntax().descendants() { for node in file.syntax().descendants() {
let tag = match node.kind() { let tag = match node.kind() {
COMMENT | DOC_COMMENT => "comment", COMMENT => "comment",
STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string", STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
ATTR => "attribute", ATTR => "attribute",
NAME_REF => "text", NAME_REF => "text",

1
crates/ra_syntax/src/grammar.ron
View file

@ -113,7 +113,6 @@ Grammar(
"BYTE_STRING", "BYTE_STRING",
"RAW_BYTE_STRING", "RAW_BYTE_STRING",
"COMMENT", "COMMENT",
"DOC_COMMENT",
"SHEBANG", "SHEBANG",
], ],
nodes: [ nodes: [

2
crates/ra_syntax/src/reparsing.rs
View file

@ -48,7 +48,7 @@ fn reparse_leaf<'node>(
) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { ) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> {
let node = algo::find_covering_node(node, edit.delete); let node = algo::find_covering_node(node, edit.delete);
match node.kind() { match node.kind() {
WHITESPACE | COMMENT | DOC_COMMENT | IDENT | STRING | RAW_STRING => { WHITESPACE | COMMENT | IDENT | STRING | RAW_STRING => {
let text = get_text_after_edit(node, &edit); let text = get_text_after_edit(node, &edit);
let tokens = tokenize(&text); let tokens = tokenize(&text);
let token = match tokens[..] { let token = match tokens[..] {

2
crates/ra_syntax/src/syntax_kinds/generated.rs
View file

@ -116,7 +116,6 @@ pub enum SyntaxKind {
BYTE_STRING, BYTE_STRING,
RAW_BYTE_STRING, RAW_BYTE_STRING,
COMMENT, COMMENT,
DOC_COMMENT,
SHEBANG, SHEBANG,
ROOT, ROOT,
STRUCT_DEF, STRUCT_DEF,
@ -378,7 +377,6 @@ impl SyntaxKind {
BYTE_STRING => &SyntaxInfo { name: "BYTE_STRING" }, BYTE_STRING => &SyntaxInfo { name: "BYTE_STRING" },
RAW_BYTE_STRING => &SyntaxInfo { name: "RAW_BYTE_STRING" }, RAW_BYTE_STRING => &SyntaxInfo { name: "RAW_BYTE_STRING" },
COMMENT => &SyntaxInfo { name: "COMMENT" }, COMMENT => &SyntaxInfo { name: "COMMENT" },
DOC_COMMENT => &SyntaxInfo { name: "DOC_COMMENT" },
SHEBANG => &SyntaxInfo { name: "SHEBANG" }, SHEBANG => &SyntaxInfo { name: "SHEBANG" },
ROOT => &SyntaxInfo { name: "ROOT" }, ROOT => &SyntaxInfo { name: "ROOT" },
STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" }, STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" },

2
crates/ra_syntax/src/syntax_kinds/mod.rs
View file

@ -19,7 +19,7 @@ pub(crate) struct SyntaxInfo {
impl SyntaxKind { impl SyntaxKind {
pub fn is_trivia(self) -> bool { pub fn is_trivia(self) -> bool {
match self { match self {
WHITESPACE | COMMENT | DOC_COMMENT => true, WHITESPACE | COMMENT => true,
_ => false, _ => false,
} }
} }