aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-11-01 10:16:24 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-11-01 10:16:24 +0000
commit3ec9f958b39b23b945dd60088843d19fe6cef2d7 (patch)
treed568d87091edbe86161889906e26b064e24820e6 /crates
parent2050812cad7905c33870c36362593360f7216310 (diff)
parent61580f3cb82821c65dc93627d9b3ec9390cce281 (diff)
Merge #179
179: Remove DOC_COMMENT r=matklad a=kjeremy Closes #166 Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_editor/src/lib.rs2
-rw-r--r--crates/ra_syntax/src/grammar.ron1
-rw-r--r--crates/ra_syntax/src/reparsing.rs2
-rw-r--r--crates/ra_syntax/src/syntax_kinds/generated.rs2
-rw-r--r--crates/ra_syntax/src/syntax_kinds/mod.rs2
5 files changed, 3 insertions, 6 deletions
diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index 481f4c9fc..3186eaf1a 100644
--- a/crates/ra_editor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -81,7 +81,7 @@ pub fn highlight(file: &File) -> Vec<HighlightedRange> {
81 let mut res = Vec::new(); 81 let mut res = Vec::new();
82 for node in file.syntax().descendants() { 82 for node in file.syntax().descendants() {
83 let tag = match node.kind() { 83 let tag = match node.kind() {
84 COMMENT | DOC_COMMENT => "comment", 84 COMMENT => "comment",
85 STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string", 85 STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
86 ATTR => "attribute", 86 ATTR => "attribute",
87 NAME_REF => "text", 87 NAME_REF => "text",
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 6951db010..0454fd8e4 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -113,7 +113,6 @@ Grammar(
113 "BYTE_STRING", 113 "BYTE_STRING",
114 "RAW_BYTE_STRING", 114 "RAW_BYTE_STRING",
115 "COMMENT", 115 "COMMENT",
116 "DOC_COMMENT",
117 "SHEBANG", 116 "SHEBANG",
118 ], 117 ],
119 nodes: [ 118 nodes: [
diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs
index eae01b1d5..d3b9a30d6 100644
--- a/crates/ra_syntax/src/reparsing.rs
+++ b/crates/ra_syntax/src/reparsing.rs
@@ -48,7 +48,7 @@ fn reparse_leaf<'node>(
48) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { 48) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> {
49 let node = algo::find_covering_node(node, edit.delete); 49 let node = algo::find_covering_node(node, edit.delete);
50 match node.kind() { 50 match node.kind() {
51 WHITESPACE | COMMENT | DOC_COMMENT | IDENT | STRING | RAW_STRING => { 51 WHITESPACE | COMMENT | IDENT | STRING | RAW_STRING => {
52 let text = get_text_after_edit(node, &edit); 52 let text = get_text_after_edit(node, &edit);
53 let tokens = tokenize(&text); 53 let tokens = tokenize(&text);
54 let token = match tokens[..] { 54 let token = match tokens[..] {
diff --git a/crates/ra_syntax/src/syntax_kinds/generated.rs b/crates/ra_syntax/src/syntax_kinds/generated.rs
index 58e2e9e9c..6568f1a37 100644
--- a/crates/ra_syntax/src/syntax_kinds/generated.rs
+++ b/crates/ra_syntax/src/syntax_kinds/generated.rs
@@ -116,7 +116,6 @@ pub enum SyntaxKind {
116 BYTE_STRING, 116 BYTE_STRING,
117 RAW_BYTE_STRING, 117 RAW_BYTE_STRING,
118 COMMENT, 118 COMMENT,
119 DOC_COMMENT,
120 SHEBANG, 119 SHEBANG,
121 ROOT, 120 ROOT,
122 STRUCT_DEF, 121 STRUCT_DEF,
@@ -378,7 +377,6 @@ impl SyntaxKind {
378 BYTE_STRING => &SyntaxInfo { name: "BYTE_STRING" }, 377 BYTE_STRING => &SyntaxInfo { name: "BYTE_STRING" },
379 RAW_BYTE_STRING => &SyntaxInfo { name: "RAW_BYTE_STRING" }, 378 RAW_BYTE_STRING => &SyntaxInfo { name: "RAW_BYTE_STRING" },
380 COMMENT => &SyntaxInfo { name: "COMMENT" }, 379 COMMENT => &SyntaxInfo { name: "COMMENT" },
381 DOC_COMMENT => &SyntaxInfo { name: "DOC_COMMENT" },
382 SHEBANG => &SyntaxInfo { name: "SHEBANG" }, 380 SHEBANG => &SyntaxInfo { name: "SHEBANG" },
383 ROOT => &SyntaxInfo { name: "ROOT" }, 381 ROOT => &SyntaxInfo { name: "ROOT" },
384 STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" }, 382 STRUCT_DEF => &SyntaxInfo { name: "STRUCT_DEF" },
diff --git a/crates/ra_syntax/src/syntax_kinds/mod.rs b/crates/ra_syntax/src/syntax_kinds/mod.rs
index 0fcd07cbf..d53886676 100644
--- a/crates/ra_syntax/src/syntax_kinds/mod.rs
+++ b/crates/ra_syntax/src/syntax_kinds/mod.rs
@@ -19,7 +19,7 @@ pub(crate) struct SyntaxInfo {
19impl SyntaxKind { 19impl SyntaxKind {
20 pub fn is_trivia(self) -> bool { 20 pub fn is_trivia(self) -> bool {
21 match self { 21 match self {
22 WHITESPACE | COMMENT | DOC_COMMENT => true, 22 WHITESPACE | COMMENT => true,
23 _ => false, 23 _ => false,
24 } 24 }
25 } 25 }