stuff

zed/keymap.json

@@ -108,13 +108,13 @@
     },
   },
   {
-    "context": "((os != macos && Editor) && edit_prediction_conflict)",
+    "context": "((os != macos && Editor) && (edit_prediction && (showing_completions || in_leading_whitespace)))",
     "bindings": {
       //"ctrl-l": "editor::AcceptEditPrediction"
     },
   },
   {
-    "context": "((os != macos && Editor) && edit_prediction_conflict)",
+    "context": "((os != macos && Editor) && (edit_prediction && (showing_completions || in_leading_whitespace)))",
     "bindings": {
       "ctrl-i": "editor::AcceptEditPrediction",
     },

zed/settings.json

@@ -285,13 +285,14 @@
     "rust-analyzer": {
       "initialization_options": {
         "cargo": {
-          "features": "all"
+          "features": "all",
+          "targetDir": "zed-target"
         },
         "check": {
           "features": "all"
         },
         "rust": {
-          "analyzerTargetDir": true
+          "analyzerTargetDir": "target/analyzer"
         }
       }
     },