From ac52d9a1f1a94e2c836c8a04a316f6454936a79a Mon Sep 17 00:00:00 2001
From: Ville Penttinen <villem.penttinen@gmail.com>
Date: Sun, 3 Mar 2019 12:02:55 +0200
Subject: Add optional range parameter to SyntaxTreeParams
When range is provided, instead of showing the syntax for the whole file, we'll
show the syntax tree for the given range.
---
crates/ra_ide_api/src/lib.rs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'crates/ra_ide_api/src')
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 6546d0644..3e7cfbb54 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -38,7 +38,7 @@ mod marks;
use std::sync::Arc;
-use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit, AstNode};
+use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit, AstNode, algo};
use ra_text_edit::TextEdit;
use ra_db::{
SourceDatabase, CheckCanceled,
@@ -245,8 +245,14 @@ impl Analysis {
/// Returns a syntax tree represented as `String`, for debug purposes.
// FIXME: use a better name here.
- pub fn syntax_tree(&self, file_id: FileId) -> String {
- self.db.parse(file_id).syntax().debug_dump()
+ pub fn syntax_tree(&self, file_id: FileId, text_range: Option<TextRange>) -> String {
+ if let Some(text_range) = text_range {
+ let file = self.db.parse(file_id);
+ let node = algo::find_covering_node(file.syntax(), text_range);
+ node.debug_dump()
+ } else {
+ self.db.parse(file_id).syntax().debug_dump()
+ }
}
/// Returns an edit to remove all newlines in the range, cleaning up minor
--
cgit v1.2.3
From 16ecd276f036de9b5dccdbcce55b25a2a5699385 Mon Sep 17 00:00:00 2001
From: Ville Penttinen <villem.penttinen@gmail.com>
Date: Mon, 4 Mar 2019 08:54:54 +0200
Subject: Implement syntax tree support for syntax inside string
This allows us to select a string or portions of it and try parsing it as rust
syntax. This is mostly helpful when developing tests where the test
itself contains some rust syntax as a string.
---
crates/ra_ide_api/src/lib.rs | 11 ++---
crates/ra_ide_api/src/syntax_tree.rs | 85 ++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 8 deletions(-)
create mode 100644 crates/ra_ide_api/src/syntax_tree.rs
(limited to 'crates/ra_ide_api/src')
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 3e7cfbb54..b8a4adbce 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -32,13 +32,14 @@ mod references;
mod impls;
mod assists;
mod diagnostics;
+mod syntax_tree;
#[cfg(test)]
mod marks;
use std::sync::Arc;
-use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit, AstNode, algo};
+use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit};
use ra_text_edit::TextEdit;
use ra_db::{
SourceDatabase, CheckCanceled,
@@ -246,13 +247,7 @@ impl Analysis {
/// Returns a syntax tree represented as `String`, for debug purposes.
// FIXME: use a better name here.
pub fn syntax_tree(&self, file_id: FileId, text_range: Option<TextRange>) -> String {
- if let Some(text_range) = text_range {
- let file = self.db.parse(file_id);
- let node = algo::find_covering_node(file.syntax(), text_range);
- node.debug_dump()
- } else {
- self.db.parse(file_id).syntax().debug_dump()
- }
+ syntax_tree::syntax_tree(&self.db, file_id, text_range)
}
/// Returns an edit to remove all newlines in the range, cleaning up minor
diff --git a/crates/ra_ide_api/src/syntax_tree.rs b/crates/ra_ide_api/src/syntax_tree.rs
new file mode 100644
index 000000000..cdee63d59
--- /dev/null
+++ b/crates/ra_ide_api/src/syntax_tree.rs
@@ -0,0 +1,85 @@
+use ra_db::SourceDatabase;
+use crate::db::RootDatabase;
+use ra_syntax::{
+ SourceFile, SyntaxNode, TextRange, AstNode,
+ algo::{self, visit::{visitor, Visitor}}, ast::{self, AstToken}
+};
+
+pub use ra_db::FileId;
+
+pub(crate) fn syntax_tree(
+ db: &RootDatabase,
+ file_id: FileId,
+ text_range: Option<TextRange>,
+) -> String {
+ if let Some(text_range) = text_range {
+ let file = db.parse(file_id);
+ let node = algo::find_covering_node(file.syntax(), text_range);
+
+ if let Some(tree) = syntax_tree_for_string(node, text_range) {
+ return tree;
+ }
+
+ node.debug_dump()
+ } else {
+ db.parse(file_id).syntax().debug_dump()
+ }
+}
+
+/// Attempts parsing the selected contents of a string literal
+/// as rust syntax and returns its syntax tree
+fn syntax_tree_for_string(node: &SyntaxNode, text_range: TextRange) -> Option<String> {
+ // When the range is inside a string
+ // we'll attempt parsing it as rust syntax
+ // to provide the syntax tree of the contents of the string
+ visitor()
+ .visit(|node: &ast::String| syntax_tree_for_token(node, text_range))
+ .visit(|node: &ast::RawString| syntax_tree_for_token(node, text_range))
+ .accept(node)?
+}
+
+fn syntax_tree_for_token<T: AstToken>(node: &T, text_range: TextRange) -> Option<String> {
+ // Range of the full node
+ let node_range = node.syntax().range();
+ let text = node.text().to_string();
+
+ // We start at some point inside the node
+ // Either we have selected the whole string
+ // or our selection is inside it
+ let start = text_range.start() - node_range.start();
+
+ // how many characters we have selected
+ let len = text_range.len().to_usize();
+
+ let node_len = node_range.len().to_usize();
+
+ let start = start.to_usize();
+
+ // We want to cap our length
+ let len = len.min(node_len);
+
+ // Ensure our slice is inside the actual string
+ let end = if start + len < text.len() { start + len } else { text.len() - start };
+
+ let text = &text[start..end];
+
+ // Remove possible extra string quotes from the start
+ // and the end of the string
+ let text = text
+ .trim_start_matches('r')
+ .trim_start_matches('#')
+ .trim_start_matches('"')
+ .trim_end_matches('#')
+ .trim_end_matches('"')
+ .trim();
+
+ let parsed = SourceFile::parse(&text);
+
+ // If the "file" parsed without errors,
+ // return its syntax
+ if parsed.errors().is_empty() {
+ return Some(parsed.syntax().debug_dump());
+ }
+
+ None
+}
--
cgit v1.2.3
From 1ef2c0613134633ef0fe0d515f7d416e482f07fb Mon Sep 17 00:00:00 2001
From: Ville Penttinen <villem.penttinen@gmail.com>
Date: Mon, 4 Mar 2019 09:19:46 +0200
Subject: Allow syntax strings to contain test markers
We simply remove all the CUSTOM_MARKERS before attempting to parse the file.
This allows for the syntax selection to work with most of the test strings.
---
crates/ra_ide_api/src/syntax_tree.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'crates/ra_ide_api/src')
diff --git a/crates/ra_ide_api/src/syntax_tree.rs b/crates/ra_ide_api/src/syntax_tree.rs
index cdee63d59..bbe9222b4 100644
--- a/crates/ra_ide_api/src/syntax_tree.rs
+++ b/crates/ra_ide_api/src/syntax_tree.rs
@@ -71,7 +71,9 @@ fn syntax_tree_for_token<T: AstToken>(node: &T, text_range: TextRange) -> Option
.trim_start_matches('"')
.trim_end_matches('#')
.trim_end_matches('"')
- .trim();
+ .trim()
+ // Remove custom markers
+ .replace("<|>", "");
let parsed = SourceFile::parse(&text);
--
cgit v1.2.3