clippy: Drop or-patterns for now because they're not on stable rust yet
This commit is contained in:
parent
91462af546
commit
0e9ecccfc1
3 changed files with 15 additions and 13 deletions
|
@ -384,13 +384,11 @@ impl Client {
|
|||
let capabilities = self.capabilities.as_ref().unwrap();
|
||||
|
||||
let sync_capabilities = match capabilities.text_document_sync {
|
||||
Some(
|
||||
lsp::TextDocumentSyncCapability::Kind(kind)
|
||||
| lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
|
||||
change: Some(kind),
|
||||
..
|
||||
}),
|
||||
) => kind,
|
||||
Some(lsp::TextDocumentSyncCapability::Kind(kind))
|
||||
| Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
|
||||
change: Some(kind),
|
||||
..
|
||||
})) => kind,
|
||||
// None | SyncOptions { changes: None }
|
||||
_ => return Ok(()),
|
||||
};
|
||||
|
@ -540,7 +538,7 @@ impl Client {
|
|||
|
||||
// check if we're able to format
|
||||
match capabilities.document_formatting_provider {
|
||||
Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
|
||||
Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
|
||||
// None | Some(false)
|
||||
_ => return Ok(Vec::new()),
|
||||
};
|
||||
|
@ -569,7 +567,7 @@ impl Client {
|
|||
|
||||
// check if we're able to format
|
||||
match capabilities.document_range_formatting_provider {
|
||||
Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
|
||||
Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
|
||||
// None | Some(false)
|
||||
_ => return Ok(Vec::new()),
|
||||
};
|
||||
|
|
|
@ -821,15 +821,15 @@ pub fn command_mode(cx: &mut Context) {
|
|||
let parts = input.split_ascii_whitespace().collect::<Vec<&str>>();
|
||||
|
||||
match *parts.as_slice() {
|
||||
["q" | "quit"] => {
|
||||
["q"] | ["quit"] => {
|
||||
editor.close(editor.view().id);
|
||||
// editor.should_close = true,
|
||||
}
|
||||
["o" | "open", path] => {
|
||||
["o", path] | ["open", path] => {
|
||||
use helix_view::editor::Action;
|
||||
editor.open(path.into(), Action::Replace);
|
||||
}
|
||||
["w" | "write"] => {
|
||||
["w"] | ["write"] => {
|
||||
// TODO: non-blocking via save() command
|
||||
let id = editor.view().doc;
|
||||
let doc = &mut editor.documents[id];
|
||||
|
|
|
@ -182,7 +182,11 @@ impl Component for Prompt {
|
|||
// char or shift char
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
modifiers: KeyModifiers::NONE | KeyModifiers::SHIFT,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
modifiers: KeyModifiers::SHIFT,
|
||||
} => {
|
||||
self.insert_char(c);
|
||||
(self.callback_fn)(cx.editor, &self.line, PromptEvent::Update);
|
||||
|
|
Loading…
Reference in a new issue