diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-15 19:38:10 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-01-15 19:38:10 +0000 |
commit | c78d269b66dd7e02321bf447eef1375c81f66a1e (patch) | |
tree | 8ec28f0ecd713783aa4d7032bdf324ace7bc8911 /crates/ra_hir/src/source_analyzer.rs | |
parent | aa2e13b37f4508168fb064a79d0190fa705d8a47 (diff) | |
parent | aaef88db0e2602e010f78e26a80d974be12c1f71 (diff) |
Merge #2837
2837: Accidentally quadratic r=matklad a=matklad
Our syntax highlighting is accdentally quadratic. Current state of the PR fixes it in a pretty crude way, looks like for the proper fix we need to redo how source-analyzer works.
**NB:** don't be scared by diff stats, that's mostly a test-data file
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/source_analyzer.rs')
-rw-r--r-- | crates/ra_hir/src/source_analyzer.rs | 138 |
1 files changed, 41 insertions, 97 deletions
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs index 76e0bff34..4f8fc9602 100644 --- a/crates/ra_hir/src/source_analyzer.rs +++ b/crates/ra_hir/src/source_analyzer.rs | |||
@@ -14,26 +14,22 @@ use hir_def::{ | |||
14 | BodySourceMap, | 14 | BodySourceMap, |
15 | }, | 15 | }, |
16 | expr::{ExprId, PatId}, | 16 | expr::{ExprId, PatId}, |
17 | nameres::ModuleSource, | 17 | resolver::{self, resolver_for_scope, Resolver, TypeNs, ValueNs}, |
18 | resolver::{self, resolver_for_scope, HasResolver, Resolver, TypeNs, ValueNs}, | ||
19 | DefWithBodyId, TraitId, | 18 | DefWithBodyId, TraitId, |
20 | }; | 19 | }; |
21 | use hir_expand::{ | 20 | use hir_expand::{ |
22 | hygiene::Hygiene, name::AsName, AstId, HirFileId, InFile, MacroCallId, MacroCallKind, | 21 | hygiene::Hygiene, name::AsName, AstId, HirFileId, InFile, MacroCallId, MacroCallKind, |
23 | }; | 22 | }; |
24 | use hir_ty::{InEnvironment, InferenceResult, TraitEnvironment}; | 23 | use hir_ty::{InEnvironment, InferenceResult, TraitEnvironment}; |
25 | use ra_prof::profile; | ||
26 | use ra_syntax::{ | 24 | use ra_syntax::{ |
27 | ast::{self, AstNode}, | 25 | ast::{self, AstNode}, |
28 | match_ast, AstPtr, | 26 | AstPtr, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextUnit, |
29 | SyntaxKind::*, | ||
30 | SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextUnit, | ||
31 | }; | 27 | }; |
32 | use rustc_hash::FxHashSet; | 28 | use rustc_hash::FxHashSet; |
33 | 29 | ||
34 | use crate::{ | 30 | use crate::{ |
35 | db::HirDatabase, Adt, Const, DefWithBody, Enum, EnumVariant, FromSource, Function, ImplBlock, | 31 | db::HirDatabase, Adt, Const, DefWithBody, EnumVariant, Function, Local, MacroDef, Name, Path, |
36 | Local, MacroDef, Name, Path, ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, | 32 | ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, |
37 | }; | 33 | }; |
38 | 34 | ||
39 | /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of | 35 | /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of |
@@ -109,37 +105,43 @@ impl SourceAnalyzer { | |||
109 | node: InFile<&SyntaxNode>, | 105 | node: InFile<&SyntaxNode>, |
110 | offset: Option<TextUnit>, | 106 | offset: Option<TextUnit>, |
111 | ) -> SourceAnalyzer { | 107 | ) -> SourceAnalyzer { |
112 | let _p = profile("SourceAnalyzer::new"); | 108 | crate::source_binder::SourceBinder::new(db).analyze(node, offset) |
113 | let def_with_body = def_with_body_from_child_node(db, node); | 109 | } |
114 | if let Some(def) = def_with_body { | 110 | |
115 | let (_body, source_map) = db.body_with_source_map(def.into()); | 111 | pub(crate) fn new_for_body( |
116 | let scopes = db.expr_scopes(def.into()); | 112 | db: &impl HirDatabase, |
117 | let scope = match offset { | 113 | def: DefWithBodyId, |
118 | None => scope_for(&scopes, &source_map, node), | 114 | node: InFile<&SyntaxNode>, |
119 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), | 115 | offset: Option<TextUnit>, |
120 | }; | 116 | ) -> SourceAnalyzer { |
121 | let resolver = resolver_for_scope(db, def.into(), scope); | 117 | let (_body, source_map) = db.body_with_source_map(def); |
122 | SourceAnalyzer { | 118 | let scopes = db.expr_scopes(def); |
123 | resolver, | 119 | let scope = match offset { |
124 | body_owner: Some(def), | 120 | None => scope_for(&scopes, &source_map, node), |
125 | body_source_map: Some(source_map), | 121 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), |
126 | infer: Some(db.infer(def.into())), | 122 | }; |
127 | scopes: Some(scopes), | 123 | let resolver = resolver_for_scope(db, def, scope); |
128 | file_id: node.file_id, | 124 | SourceAnalyzer { |
129 | } | 125 | resolver, |
130 | } else { | 126 | body_owner: Some(def.into()), |
131 | SourceAnalyzer { | 127 | body_source_map: Some(source_map), |
132 | resolver: node | 128 | infer: Some(db.infer(def)), |
133 | .value | 129 | scopes: Some(scopes), |
134 | .ancestors() | 130 | file_id: node.file_id, |
135 | .find_map(|it| try_get_resolver_for_node(db, node.with_value(&it))) | 131 | } |
136 | .unwrap_or_default(), | 132 | } |
137 | body_owner: None, | 133 | |
138 | body_source_map: None, | 134 | pub(crate) fn new_for_resolver( |
139 | infer: None, | 135 | resolver: Resolver, |
140 | scopes: None, | 136 | node: InFile<&SyntaxNode>, |
141 | file_id: node.file_id, | 137 | ) -> SourceAnalyzer { |
142 | } | 138 | SourceAnalyzer { |
139 | resolver, | ||
140 | body_owner: None, | ||
141 | body_source_map: None, | ||
142 | infer: None, | ||
143 | scopes: None, | ||
144 | file_id: node.file_id, | ||
143 | } | 145 | } |
144 | } | 146 | } |
145 | 147 | ||
@@ -366,64 +368,6 @@ impl SourceAnalyzer { | |||
366 | } | 368 | } |
367 | } | 369 | } |
368 | 370 | ||
369 | fn try_get_resolver_for_node(db: &impl HirDatabase, node: InFile<&SyntaxNode>) -> Option<Resolver> { | ||
370 | match_ast! { | ||
371 | match (node.value) { | ||
372 | ast::Module(it) => { | ||
373 | let src = node.with_value(it); | ||
374 | Some(crate::Module::from_declaration(db, src)?.id.resolver(db)) | ||
375 | }, | ||
376 | ast::SourceFile(it) => { | ||
377 | let src = node.with_value(ModuleSource::SourceFile(it)); | ||
378 | Some(crate::Module::from_definition(db, src)?.id.resolver(db)) | ||
379 | }, | ||
380 | ast::StructDef(it) => { | ||
381 | let src = node.with_value(it); | ||
382 | Some(Struct::from_source(db, src)?.id.resolver(db)) | ||
383 | }, | ||
384 | ast::EnumDef(it) => { | ||
385 | let src = node.with_value(it); | ||
386 | Some(Enum::from_source(db, src)?.id.resolver(db)) | ||
387 | }, | ||
388 | ast::ImplBlock(it) => { | ||
389 | let src = node.with_value(it); | ||
390 | Some(ImplBlock::from_source(db, src)?.id.resolver(db)) | ||
391 | }, | ||
392 | ast::TraitDef(it) => { | ||
393 | let src = node.with_value(it); | ||
394 | Some(Trait::from_source(db, src)?.id.resolver(db)) | ||
395 | }, | ||
396 | _ => match node.value.kind() { | ||
397 | FN_DEF | CONST_DEF | STATIC_DEF => { | ||
398 | let def = def_with_body_from_child_node(db, node)?; | ||
399 | let def = DefWithBodyId::from(def); | ||
400 | Some(def.resolver(db)) | ||
401 | } | ||
402 | // FIXME add missing cases | ||
403 | _ => None | ||
404 | } | ||
405 | } | ||
406 | } | ||
407 | } | ||
408 | |||
409 | fn def_with_body_from_child_node( | ||
410 | db: &impl HirDatabase, | ||
411 | child: InFile<&SyntaxNode>, | ||
412 | ) -> Option<DefWithBody> { | ||
413 | let _p = profile("def_with_body_from_child_node"); | ||
414 | child.cloned().ancestors_with_macros(db).find_map(|node| { | ||
415 | let n = &node.value; | ||
416 | match_ast! { | ||
417 | match n { | ||
418 | ast::FnDef(def) => { return Function::from_source(db, node.with_value(def)).map(DefWithBody::from); }, | ||
419 | ast::ConstDef(def) => { return Const::from_source(db, node.with_value(def)).map(DefWithBody::from); }, | ||
420 | ast::StaticDef(def) => { return Static::from_source(db, node.with_value(def)).map(DefWithBody::from); }, | ||
421 | _ => { None }, | ||
422 | } | ||
423 | } | ||
424 | }) | ||
425 | } | ||
426 | |||
427 | fn scope_for( | 371 | fn scope_for( |
428 | scopes: &ExprScopes, | 372 | scopes: &ExprScopes, |
429 | source_map: &BodySourceMap, | 373 | source_map: &BodySourceMap, |