From deab4caa7b1ba81c1b7e6561bc270bbde6467f13 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 12 Jul 2019 19:41:13 +0300 Subject: make Parse fields private this is in preparation for the new rowan API --- crates/ra_assists/src/assist_ctx.rs | 4 ++-- crates/ra_assists/src/ast_editor.rs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/ra_assists/src') diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs index 0ba5f3ae6..34b207154 100644 --- a/crates/ra_assists/src/assist_ctx.rs +++ b/crates/ra_assists/src/assist_ctx.rs @@ -71,11 +71,11 @@ impl<'a, DB: HirDatabase> AssistCtx<'a, DB> { where F: FnOnce(AssistCtx) -> T, { - let source_file = &db.parse(frange.file_id).tree; + let parse = db.parse(frange.file_id); let assist = if should_compute_edit { Assist::Resolved(vec![]) } else { Assist::Unresolved(vec![]) }; - let ctx = AssistCtx { db, frange, source_file, should_compute_edit, assist }; + let ctx = AssistCtx { db, frange, source_file: parse.tree(), should_compute_edit, assist }; f(ctx) } diff --git a/crates/ra_assists/src/ast_editor.rs b/crates/ra_assists/src/ast_editor.rs index ba816eb65..7b743c9f0 100644 --- a/crates/ra_assists/src/ast_editor.rs +++ b/crates/ra_assists/src/ast_editor.rs @@ -278,8 +278,8 @@ impl AstBuilder { } fn ast_node_from_file_text(text: &str) -> TreeArc { - let file = SourceFile::parse(text).tree; - let res = file.syntax().descendants().find_map(N::cast).unwrap().to_owned(); + let parse = SourceFile::parse(text); + let res = parse.tree().syntax().descendants().find_map(N::cast).unwrap().to_owned(); res } @@ -287,7 +287,8 @@ mod tokens { use once_cell::sync::Lazy; use ra_syntax::{AstNode, SourceFile, SyntaxKind::*, SyntaxToken, TreeArc, T}; - static SOURCE_FILE: Lazy> = Lazy::new(|| SourceFile::parse(",\n; ;").tree); + static SOURCE_FILE: Lazy> = + Lazy::new(|| SourceFile::parse(",\n; ;").tree().to_owned()); pub(crate) fn comma() -> SyntaxToken<'static> { SOURCE_FILE -- cgit v1.2.3