Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

2 files changed, 5 insertions, 0 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs
index 4f9565441..99fed8689 100644
--- a/crates/ra_ide_api/src/completion/complete_postfix.rs
+++ b/crates/ra_ide_api/src/completion/complete_postfix.rs
@@ -13,6 +13,10 @@ use crate::{
 };
 
 pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
+    if ctx.db.feature_flags.get("completion.enable-postfix") == false {
+        return;
+    }
+
     let dot_receiver = match &ctx.dot_receiver {
         Some(it) => it,
         None => return,
diff --git a/crates/ra_ide_api/src/feature_flags.rs b/crates/ra_ide_api/src/feature_flags.rs
index d3ca7be03..de4ae513d 100644
--- a/crates/ra_ide_api/src/feature_flags.rs
+++ b/crates/ra_ide_api/src/feature_flags.rs
@@ -54,6 +54,7 @@ impl Default for FeatureFlags {
         FeatureFlags::new(&[
             ("lsp.diagnostics", true),
             ("completion.insertion.add-call-parenthesis", true),
+            ("completion.enable-postfix", true),
             ("notifications.workspace-loaded", true),
         ])
     }