From e8dfb92641f64b772204d7670c7286cb9b8b398b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 22 Aug 2018 12:58:34 +0300
Subject: Simplify

---
 crates/libeditor/src/code_actions.rs | 11 +++--------
 crates/libeditor/src/lib.rs          |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'crates/libeditor/src')

diff --git a/crates/libeditor/src/code_actions.rs b/crates/libeditor/src/code_actions.rs
index 80c396337..500d52c2a 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/libeditor/src/code_actions.rs
@@ -11,12 +11,7 @@ use libsyntax2::{
 
 pub struct ActionResult {
     pub edit: Edit,
-    pub cursor_position: CursorPosition,
-}
-
-pub enum CursorPosition {
-    Same,
-    Offset(TextUnit),
+    pub cursor_position: Option<TextUnit>,
 }
 
 pub fn flip_comma<'a>(file: &'a ParsedFile, offset: TextUnit) -> Option<impl FnOnce() -> ActionResult + 'a> {
@@ -31,7 +26,7 @@ pub fn flip_comma<'a>(file: &'a ParsedFile, offset: TextUnit) -> Option<impl FnO
         edit.replace(right.range(), left.text());
         ActionResult {
             edit: edit.finish(),
-            cursor_position: CursorPosition::Same,
+            cursor_position: None,
         }
     })
 }
@@ -58,7 +53,7 @@ pub fn add_derive<'a>(file: &'a ParsedFile, offset: TextUnit) -> Option<impl FnO
         };
         ActionResult {
             edit: edit.finish(),
-            cursor_position: CursorPosition::Offset(offset),
+            cursor_position: Some(offset),
         }
     })
 }
diff --git a/crates/libeditor/src/lib.rs b/crates/libeditor/src/lib.rs
index abd104af2..12d0a30dd 100644
--- a/crates/libeditor/src/lib.rs
+++ b/crates/libeditor/src/lib.rs
@@ -21,7 +21,7 @@ pub use self::{
     symbols::{StructureNode, file_structure, FileSymbol, file_symbols},
     edit::{EditBuilder, Edit, AtomEdit},
     code_actions::{
-        ActionResult, CursorPosition, find_node,
+        ActionResult, find_node,
         flip_comma, add_derive,
     },
 };
-- 
cgit v1.2.3