From 95f8310514238fc2c3b4d1ddecbd1b79d2c963a2 Mon Sep 17 00:00:00 2001 From: David Lattimore Date: Tue, 30 Jun 2020 15:55:20 +1000 Subject: Structured search debugging --- crates/ra_ssr/src/matching.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'crates/ra_ssr/src/matching.rs') diff --git a/crates/ra_ssr/src/matching.rs b/crates/ra_ssr/src/matching.rs index 54413a151..53d802e77 100644 --- a/crates/ra_ssr/src/matching.rs +++ b/crates/ra_ssr/src/matching.rs @@ -8,9 +8,7 @@ use crate::{ use hir::Semantics; use ra_db::FileRange; use ra_syntax::ast::{AstNode, AstToken}; -use ra_syntax::{ - ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, -}; +use ra_syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken}; use rustc_hash::FxHashMap; use std::{cell::Cell, iter::Peekable}; @@ -44,8 +42,8 @@ macro_rules! fail_match { /// Information about a match that was found. #[derive(Debug)] -pub(crate) struct Match { - pub(crate) range: TextRange, +pub struct Match { + pub(crate) range: FileRange, pub(crate) matched_node: SyntaxNode, pub(crate) placeholder_values: FxHashMap, pub(crate) ignored_comments: Vec, @@ -135,7 +133,7 @@ impl<'db, 'sema> MatchState<'db, 'sema> { match_state.attempt_match_node(&match_inputs, &pattern_tree, code)?; match_state.validate_range(&sema.original_range(code))?; match_state.match_out = Some(Match { - range: sema.original_range(code).range, + range: sema.original_range(code), matched_node: code.clone(), placeholder_values: FxHashMap::default(), ignored_comments: Vec::new(), -- cgit v1.2.3