language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

simple comparison instead of regex

Browse source
This commit is contained in:
Luciano Bestia 2021-02-05 14:32:03 +01:00
parent 9f1d341ee9
commit 084b21bc36
3 changed files with 8 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ide/Cargo.toml
View file

@ -31,13 +31,10 @@ assists = { path = "../assists", version = "0.0.0" }
ssr = { path = "../ssr", version = "0.0.0" }
completion = { path = "../completion", version = "0.0.0" }
lazy_static = "1.4.0"
regex = "1.4.3"
env_logger = { version = "0.8.1", default-features = false }
# ide should depend only on the top-level `hir` package. if you need
# something from some `hir_xxx` subpackage, reexport the API via `hir`.
hir = { path = "../hir", version = "0.0.0" }
[dev-dependencies]
expect-test = "1.1"
env_logger = { version = "0.8.1", default-features = false }

28
crates/ide/src/folding_ranges.rs
View file

@ -9,8 +9,6 @@ use syntax::{
SyntaxNode, TextRange, TextSize,
};
use lazy_static::lazy_static;
#[derive(Debug, PartialEq, Eq)]
pub enum FoldKind {
Comment,
@ -53,17 +51,10 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
// Fold groups of comments
if let Some(comment) = ast::Comment::cast(token) {
if !visited_comments.contains(&comment) {
// regions are not really comments
use regex::Regex;
lazy_static! {
static ref RE_START: Regex =
Regex::new(r"^\s*//\s*#?region\b").unwrap();
static ref RE_END: Regex =
Regex::new(r"^\s*//\s*#?endregion\b").unwrap();
}
if RE_START.is_match(comment.text()) {
// regions are not real comments
if comment.text().trim().starts_with("// region:") {
regions_starts.push(comment.syntax().text_range().start());
} else if RE_END.is_match(comment.text()) {
} else if comment.text().trim().starts_with("// endregion") {
if !regions_starts.is_empty() {
res.push(Fold {
range: TextRange::new(
@ -202,15 +193,10 @@ fn contiguous_range_for_comment(
}
if let Some(c) = ast::Comment::cast(token) {
if c.kind() == group_kind {
// regions are not really comments
use regex::Regex;
lazy_static! {
static ref RE_START: Regex =
Regex::new(r"^\s*//\s*#?region\b").unwrap();
static ref RE_END: Regex =
Regex::new(r"^\s*//\s*#?endregion\b").unwrap();
}
if RE_START.is_match(c.text()) || RE_END.is_match(c.text()) {
// regions are not real comments
if c.text().trim().starts_with("// region:")
|| c.text().trim().starts_with("// endregion")
{
break;
} else {
visited.insert(c.clone());