refactor

crates/ra_lsp_server/src/main_loop.rs

@@ -1,13 +1,11 @@
 mod handlers;
 mod subscriptions;
 
-use std::{
+use std::{fmt, path::PathBuf, sync::Arc};
-    fmt,
-    path::PathBuf,
-    sync::Arc,
-};
 
-use crossbeam_channel::{unbounded, select, Receiver, Sender, RecvError};
+use crossbeam_channel::{select, unbounded, Receiver, RecvError, Sender};
+use failure::{bail, format_err};
+use failure_derive::Fail;
 use gen_lsp_server::{
     handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse,
 };
@@ -15,11 +13,9 @@ use languageserver_types::NumberOrString;
 use ra_analysis::{Canceled, FileId, LibraryData};
 use ra_vfs::VfsTask;
 use rayon;
-use threadpool::ThreadPool;
 use rustc_hash::FxHashSet;
 use serde::{de::DeserializeOwned, Serialize};
-use failure::{format_err, bail};
+use threadpool::ThreadPool;
-use failure_derive::Fail;
 
 use crate::{
     main_loop::subscriptions::Subscriptions,

crates/ra_lsp_server/src/main_loop/handlers.rs

@@ -93,10 +93,13 @@ pub fn handle_on_type_formatting(
     world: ServerWorld,
     params: req::DocumentOnTypeFormattingParams,
 ) -> Result<Option<Vec<TextEdit>>> {
-    if params.ch != "=" || params.ch != "." {
+    let analysis: Option<Box<Fn(FilePosition) -> Option<SourceChange>>> = match params.ch.as_str() {
-        return Ok(None);
+        "=" => Some(Box::new(|pos| world.analysis().on_eq_typed(pos))),
-    }
+        "." => Some(Box::new(|pos| world.analysis().on_dot_typed(pos))),
+        _ => None,
+    };
 
+    if let Some(ana) = analysis {
         let file_id = params.text_document.try_conv_with(&world)?;
         let line_index = world.analysis().file_line_index(file_id);
         let position = FilePosition {
@@ -104,16 +107,8 @@ pub fn handle_on_type_formatting(
             offset: params.position.conv_with(&line_index),
         };
 
-    let analysis: Vec<Box<Fn(FilePosition) -> Option<SourceChange>>> = vec![
-        Box::new(|pos| world.analysis().on_eq_typed(pos)),
-        Box::new(|pos| world.analysis().on_dot_typed(pos)),
-    ];
-
-    // try all analysis until one succeeds
-    for ana in analysis {
         if let Some(mut action) = ana(position) {
-            return Ok(Some(
+            let change: Vec<TextEdit> = action
-                action
                 .source_file_edits
                 .pop()
                 .unwrap()
@@ -121,8 +116,8 @@ pub fn handle_on_type_formatting(
                 .as_atoms()
                 .iter()
                 .map_conv_with(&line_index)
-                    .collect(),
+                .collect();
-            ));
+            return Ok(Some(change));
         }
     }