merge conflict

helix-view/src/editor.rs

@@ -963,14 +963,6 @@ pub struct Editor {
  /// avoid calculating the cursor position multiple
  /// times during rendering and should not be set by other functions.
  pub cursor_cache: Cell<Option<Option<Position>>>,
- /// When a new completion request is sent to the server old
- /// unfinished request must be dropped. Each completion
- /// request is associated with a channel that cancels
- /// when the channel is dropped. That channel is stored
- /// here. When a new completion request is sent this
- /// field is set and any old requests are automatically
- /// canceled as a result
- pub completion_request_handle: Option<oneshot::Sender<()>>,
 
  pub handlers: Handlers,
 
@@ -1096,7 +1088,6 @@ impl Editor {
  config_events: unbounded_channel(),
  needs_redraw: false,
  cursor_cache: Cell::new(None),
- completion_request_handle: None,
  handlers,
  mouse_down_range: None,
  readonly,