mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal: Refactor our record pat/expr handling in completion context

Browse Source
This commit is contained in:
Lukas Wirth 2022-05-24 13:24:36 +02:00
parent 697ade6f8d
commit 6a8b8a6039
9 changed files with 151 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/ide-completion/src/completions/expr.rs
View File

@ -5,7 +5,7 @@
use syntax::T;
use crate::{
context::{PathCompletionCtx, PathKind, PathQualifierCtx},
context::{NameRefContext, PathCompletionCtx, PathKind, PathQualifierCtx},
CompletionContext, Completions,
};
@ -15,14 +15,25 @@ pub(crate) fn complete_expr_path(acc: &mut Completions, ctx: &CompletionContext)
return;
}
let (is_absolute_path, qualifier, in_block_expr, in_loop_body, in_functional_update) =
match ctx.path_context() {
Some(&PathCompletionCtx {
kind: PathKind::Expr { in_block_expr, in_loop_body, in_functional_update },
let (is_absolute_path, qualifier, in_block_expr, in_loop_body, is_func_update) =
match ctx.nameref_ctx() {
Some(NameRefContext {
path_ctx:
Some(PathCompletionCtx {
kind: PathKind::Expr { in_block_expr, in_loop_body },
is_absolute_path,
ref qualifier,
qualifier,
..
}) => (is_absolute_path, qualifier, in_block_expr, in_loop_body, in_functional_update),
}),
record_expr,
..
}) => (
*is_absolute_path,
qualifier,
*in_block_expr,
*in_loop_body,
record_expr.as_ref().map_or(false, |&(_, it)| it),
),
_ => return,
};
@ -165,7 +176,7 @@ pub(crate) fn complete_expr_path(acc: &mut Completions, ctx: &CompletionContext)
}
});
if !in_functional_update {
if !is_func_update {
let mut add_keyword =
|kw, snippet| super::keyword::add_keyword(acc, ctx, kw, snippet);

6
crates/ide-completion/src/completions/keyword.rs
View File

@ -5,12 +5,12 @@
use syntax::T;
use crate::{
context::PathKind, patterns::ImmediateLocation, CompletionContext, CompletionItem,
CompletionItemKind, Completions,
context::{NameRefContext, PathKind},
CompletionContext, CompletionItem, CompletionItemKind, Completions,
};
pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionContext) {
if matches!(ctx.completion_location, Some(ImmediateLocation::RecordExpr(_))) {
if matches!(ctx.nameref_ctx(), Some(NameRefContext { record_expr: Some(_), .. })) {
cov_mark::hit!(no_keyword_completion_in_record_lit);
return;
}

6
crates/ide-completion/src/completions/pattern.rs
View File

@ -15,7 +15,6 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
Some(ctx) => ctx,
_ => return,
};
let refutable = patctx.refutability == PatternRefutability::Refutable;
if let Some(path_ctx) = ctx.path_context() {
pattern_path_completion(acc, ctx, path_ctx);
@ -47,6 +46,11 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
}
}
if patctx.record_pat.is_some() {
return;
}
let refutable = patctx.refutability == PatternRefutability::Refutable;
let single_variant_enum = |enum_: hir::Enum| ctx.db.enum_data(enum_.into()).variants.len() == 1;
if let Some(hir::Adt::Enum(e)) =

30
crates/ide-completion/src/completions/record.rs
View File

@ -3,16 +3,19 @@
use syntax::{ast::Expr, T};
use crate::{
patterns::ImmediateLocation, CompletionContext, CompletionItem, CompletionItemKind,
CompletionRelevance, CompletionRelevancePostfixMatch, Completions,
context::{NameRefContext, PatternContext},
CompletionContext, CompletionItem, CompletionItemKind, CompletionRelevance,
CompletionRelevancePostfixMatch, Completions,
};
pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
let missing_fields = match &ctx.completion_location {
Some(
ImmediateLocation::RecordExpr(record_expr)
| ImmediateLocation::RecordExprUpdate(record_expr),
) => {
let missing_fields = if let Some(PatternContext { record_pat: Some(record_pat), .. }) =
&ctx.pattern_ctx
{
ctx.sema.record_pattern_missing_fields(record_pat)
} else if let Some(NameRefContext { record_expr: Some((record_expr, _)), .. }) =
ctx.nameref_ctx()
{
let ty = ctx.sema.type_of_expr(&Expr::RecordExpr(record_expr.clone()));
if let Some(hir::Adt::Union(un)) = ty.as_ref().and_then(|t| t.original.as_adt()) {
@ -20,10 +23,8 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
// an empty Vec on a union literal. This is normally
// reasonable, but here we'd like to present the full list
// of fields if the literal is empty.
let were_fields_specified = record_expr
.record_expr_field_list()
.and_then(|fl| fl.fields().next())
.is_some();
let were_fields_specified =
record_expr.record_expr_field_list().and_then(|fl| fl.fields().next()).is_some();
match were_fields_specified {
false => un.fields(ctx.db).into_iter().map(|f| (f, f.ty(ctx.db))).collect(),
@ -59,11 +60,8 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
}
missing_fields
}
}
Some(ImmediateLocation::RecordPat(record_pat)) => {
ctx.sema.record_pattern_missing_fields(record_pat)
}
_ => return None,
} else {
return None;
};
for (field, ty) in missing_fields {

73
crates/ide-completion/src/context.rs
View File

@ -48,7 +48,6 @@ pub(super) enum PathKind {
Expr {
in_block_expr: bool,
in_loop_body: bool,
in_functional_update: bool,
},
Type,
Attr {
@ -115,6 +114,8 @@ pub(super) struct PatternContext {
pub(super) parent_pat: Option<ast::Pat>,
pub(super) ref_token: Option<SyntaxToken>,
pub(super) mut_token: Option<SyntaxToken>,
/// The record pattern this name or ref is a field of
pub(super) record_pat: Option<ast::RecordPat>,
}
#[derive(Debug)]
@ -166,8 +167,11 @@ pub(super) enum NameKind {
pub(super) struct NameRefContext {
/// NameRef syntax in the original file
pub(super) nameref: Option<ast::NameRef>,
// FIXME: these fields are actually disjoint -> enum
pub(super) dot_access: Option<DotAccess>,
pub(super) path_ctx: Option<PathCompletionCtx>,
/// The record expression this nameref is a field of
pub(super) record_expr: Option<(ast::RecordExpr, bool)>,
}
#[derive(Debug)]
@ -375,14 +379,15 @@ pub(crate) fn after_if(&self) -> bool {
pub(crate) fn is_path_disallowed(&self) -> bool {
self.previous_token_is(T![unsafe])
|| matches!(self.prev_sibling, Some(ImmediatePrevSibling::Visibility))
|| matches!(
self.completion_location,
Some(ImmediateLocation::RecordPat(_) | ImmediateLocation::RecordExpr(_))
)
|| matches!(
self.name_ctx(),
Some(NameContext { kind: NameKind::Module(_) | NameKind::Rename, .. })
)
|| matches!(self.pattern_ctx, Some(PatternContext { record_pat: Some(_), .. }))
|| matches!(
self.nameref_ctx(),
Some(NameRefContext { record_expr: Some((_, false)), .. })
)
}
pub(crate) fn path_context(&self) -> Option<&PathCompletionCtx> {
@ -1023,14 +1028,13 @@ fn classify_name(
ast::Enum(_) => NameKind::Enum,
ast::Fn(_) => NameKind::Function,
ast::IdentPat(bind_pat) => {
let is_name_in_field_pat = bind_pat
.syntax()
.parent()
.and_then(ast::RecordPatField::cast)
.map_or(false, |pat_field| pat_field.name_ref().is_none());
if !is_name_in_field_pat {
pat_ctx = Some(pattern_context_for(original_file, bind_pat.into()));
pat_ctx = Some({
let mut pat_ctx = pattern_context_for(original_file, bind_pat.into());
if let Some(record_field) = ast::RecordPatField::for_field_name(&name) {
pat_ctx.record_pat = find_node_in_file_compensated(original_file, &record_field.parent_record_pat());
}
pat_ctx
});
NameKind::IdentPat
},
@ -1062,7 +1066,33 @@ fn classify_name_ref(
) -> (NameRefContext, Option<PatternContext>) {
let nameref = find_node_at_offset(&original_file, name_ref.syntax().text_range().start());
let mut nameref_ctx = NameRefContext { dot_access: None, path_ctx: None, nameref };
let mut nameref_ctx =
NameRefContext { dot_access: None, path_ctx: None, nameref, record_expr: None };
if let Some(record_field) = ast::RecordExprField::for_field_name(&name_ref) {
nameref_ctx.record_expr =
find_node_in_file_compensated(original_file, &record_field.parent_record_lit())
.zip(Some(false));
return (nameref_ctx, None);
}
if let Some(record_field) = ast::RecordPatField::for_field_name_ref(&name_ref) {
let pat_ctx =
pattern_context_for(original_file, record_field.parent_record_pat().clone().into());
return (
nameref_ctx,
Some(PatternContext {
param_ctx: None,
has_type_ascription: false,
ref_token: None,
mut_token: None,
record_pat: find_node_in_file_compensated(
original_file,
&record_field.parent_record_pat(),
),
..pat_ctx
}),
);
}
let segment = match_ast! {
match parent {
@ -1115,8 +1145,11 @@ fn classify_name_ref(
})
.unwrap_or(false)
};
let is_in_func_update = |it: &SyntaxNode| {
it.parent().map_or(false, |it| ast::RecordExprFieldList::can_cast(it.kind()))
let mut fill_record_expr = |syn: &SyntaxNode| {
if let Some(record_expr) = syn.ancestors().nth(2).and_then(ast::RecordExpr::cast) {
nameref_ctx.record_expr =
find_node_in_file_compensated(original_file, &record_expr).zip(Some(true));
}
};
let kind = path.syntax().ancestors().find_map(|it| {
@ -1125,11 +1158,12 @@ fn classify_name_ref(
match it {
ast::PathType(_) => Some(PathKind::Type),
ast::PathExpr(it) => {
fill_record_expr(it.syntax());
path_ctx.has_call_parens = it.syntax().parent().map_or(false, |it| ast::CallExpr::can_cast(it.kind()));
let in_block_expr = is_in_block(it.syntax());
let in_loop_body = is_in_loop_body(it.syntax());
let in_functional_update = is_in_func_update(it.syntax());
Some(PathKind::Expr { in_block_expr, in_loop_body, in_functional_update })
Some(PathKind::Expr { in_block_expr, in_loop_body })
},
ast::TupleStructPat(it) => {
path_ctx.has_call_parens = true;
@ -1163,8 +1197,8 @@ fn classify_name_ref(
return Some(parent.and_then(ast::MacroExpr::cast).map(|it| {
let in_loop_body = is_in_loop_body(it.syntax());
let in_block_expr = is_in_block(it.syntax());
let in_functional_update = is_in_func_update(it.syntax());
PathKind::Expr { in_block_expr, in_loop_body, in_functional_update }
fill_record_expr(it.syntax());
PathKind::Expr { in_block_expr, in_loop_body }
}));
},
}
@ -1299,6 +1333,7 @@ fn pattern_context_for(original_file: &SyntaxNode, pat: ast::Pat) -> PatternCont
parent_pat: pat.syntax().parent().and_then(ast::Pat::cast),
mut_token,
ref_token,
record_pat: None,
}
}

39
crates/ide-completion/src/patterns.rs
View File

@ -53,19 +53,6 @@ pub(crate) enum ImmediateLocation {
// Only set from a type arg
/// Original file ast node
GenericArgList(ast::GenericArgList),
/// The record expr of the field name we are completing
///
/// Original file ast node
RecordExpr(ast::RecordExpr),
/// The record expr of the functional update syntax we are completing
///
/// Original file ast node
RecordExprUpdate(ast::RecordExpr),
/// The record pat of the field name we are completing
///
/// Original file ast node
// FIXME: This should be moved to pattern_ctx
RecordPat(ast::RecordPat),
}
pub(crate) fn determine_prev_sibling(name_like: &ast::NameLike) -> Option<ImmediatePrevSibling> {
@ -136,27 +123,8 @@ pub(crate) fn determine_location(
name_like: &ast::NameLike,
) -> Option<ImmediateLocation> {
let node = match name_like {
ast::NameLike::NameRef(name_ref) => {
if ast::RecordExprField::for_field_name(name_ref).is_some() {
return sema
.find_node_at_offset_with_macros(original_file, offset)
.map(ImmediateLocation::RecordExpr);
}
if ast::RecordPatField::for_field_name_ref(name_ref).is_some() {
return sema
.find_node_at_offset_with_macros(original_file, offset)
.map(ImmediateLocation::RecordPat);
}
maximize_name_ref(name_ref)
}
ast::NameLike::Name(name) => {
if ast::RecordPatField::for_field_name(name).is_some() {
return sema
.find_node_at_offset_with_macros(original_file, offset)
.map(ImmediateLocation::RecordPat);
}
name.syntax().clone()
}
ast::NameLike::NameRef(name_ref) => maximize_name_ref(name_ref),
ast::NameLike::Name(name) => name.syntax().clone(),
ast::NameLike::Lifetime(lt) => lt.syntax().clone(),
};
@ -199,9 +167,6 @@ pub(crate) fn determine_location(
ast::SourceFile(_) => ImmediateLocation::ItemList,
ast::ItemList(_) => ImmediateLocation::ItemList,
ast::RefExpr(_) => ImmediateLocation::RefExpr,
ast::RecordExprFieldList(_) => sema
.find_node_at_offset_with_macros(original_file, offset)
.map(ImmediateLocation::RecordExprUpdate)?,
ast::TupleField(_) => ImmediateLocation::TupleField,
ast::TupleFieldList(_) => ImmediateLocation::TupleField,
ast::TypeBound(_) => ImmediateLocation::TypeBound,

5
crates/ide-completion/src/tests/pattern.rs
View File

@ -338,7 +338,10 @@ struct Foo { bar: Bar }
struct Bar(u32);
fn outer(Foo { bar$0 }: Foo) {}
"#,
expect![[r#""#]],
expect![[r#"
kw mut
kw ref
"#]],
)
}

6
crates/ide-completion/src/tests/record.rs
View File

@ -41,6 +41,8 @@ fn foo(s: Struct) {
"#,
expect![[r#"
fd bar u32
kw mut
kw ref
"#]],
);
}
@ -58,6 +60,8 @@ fn foo(e: Enum) {
"#,
expect![[r#"
fd bar u32
kw mut
kw ref
"#]],
);
}
@ -93,6 +97,8 @@ fn foo(f: Struct) {
",
expect![[r#"
fd field u32
kw mut
kw ref
"#]],
);
}

4
crates/syntax/src/ast/node_ext.rs
View File

@ -510,6 +510,10 @@ pub fn for_field_name(field_name: &ast::Name) -> Option<ast::RecordPatField> {
}
}
pub fn parent_record_pat(&self) -> ast::RecordPat {
self.syntax().ancestors().find_map(ast::RecordPat::cast).unwrap()
}
/// Deals with field init shorthand
pub fn field_name(&self) -> Option<NameOrNameRef> {
if let Some(name_ref) = self.name_ref() {