about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-05-31 18:22:41 +0000
committerbors <bors@rust-lang.org>2022-05-31 18:22:41 +0000
commite25cbf85849a48e02701736375c784b3e3e0e3fc (patch)
tree9c29775d54c6f240d3d9b0238c460db24ee81e7e
parente10799536a22a777891f5a971626e79c17097f9e (diff)
parent1234d8647f42460df7e857514ee1534dc55372e5 (diff)
Auto merge of #12430 - Veykril:completions, r=Veykril
minor: Remove unused code
-rw-r--r--crates/ide-completion/src/context.rs1
-rw-r--r--crates/ide-completion/src/patterns.rs17
2 files changed, 0 insertions, 18 deletions
diff --git a/crates/ide-completion/src/context.rs b/crates/ide-completion/src/context.rs
index b70d6f9e8dc..f3e316ff3c1 100644
--- a/crates/ide-completion/src/context.rs
+++ b/crates/ide-completion/src/context.rs
@@ -383,7 +383,6 @@ impl<'a> CompletionContext<'a> {
     // FIXME: This shouldn't exist
     pub(crate) fn is_path_disallowed(&self) -> bool {
         !self.qualifier_ctx.none()
-            || matches!(self.prev_sibling, Some(ImmediatePrevSibling::Visibility))
             || (matches!(self.name_ctx(), Some(NameContext { .. })) && self.pattern_ctx.is_none())
             || matches!(self.pattern_ctx, Some(PatternContext { record_pat: Some(_), .. }))
             || matches!(
diff --git a/crates/ide-completion/src/patterns.rs b/crates/ide-completion/src/patterns.rs
index 0e146df712d..cc599a02cb2 100644
--- a/crates/ide-completion/src/patterns.rs
+++ b/crates/ide-completion/src/patterns.rs
@@ -23,7 +23,6 @@ pub(crate) enum ImmediatePrevSibling {
     IfExpr,
     TraitDefName,
     ImplDefType,
-    Visibility,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -77,17 +76,6 @@ pub(crate) fn determine_prev_sibling(name_like: &ast::NameLike) -> Option<Immedi
         _ => node,
     };
     let prev_sibling = non_trivia_sibling(node.into(), Direction::Prev)?.into_node()?;
-    if prev_sibling.kind() == ERROR {
-        let prev_sibling = prev_sibling.first_child()?;
-        let res = match_ast! {
-            match prev_sibling {
-                // vis followed by random ident will always error the parser
-                ast::Visibility(_) => ImmediatePrevSibling::Visibility,
-                _ => return None,
-            }
-        };
-        return Some(res);
-    }
     let res = match_ast! {
         match prev_sibling {
             ast::ExprStmt(it) => {
@@ -442,9 +430,4 @@ mod tests {
         check_prev_sibling(r"fn foo() { if true {} w$0", ImmediatePrevSibling::IfExpr);
         check_prev_sibling(r"fn foo() { if true {}; w$0", None);
     }
-
-    #[test]
-    fn test_vis_prev_sibling() {
-        check_prev_sibling(r"pub w$0", ImmediatePrevSibling::Visibility);
-    }
 }