Merge #4131

4131: Switch to text-size r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -5,7 +5,7 @@ use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
     algo::{self, find_covering_element, find_node_at_offset},
-    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextUnit,
+    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
     TokenAtOffset,
 };
 use ra_text_edit::TextEditBuilder;
@@ -178,7 +178,7 @@ impl<'a> AssistGroup<'a> {
 #[derive(Default)]
 pub(crate) struct ActionBuilder {
     edit: TextEditBuilder,
-    cursor_position: Option<TextUnit>,
+    cursor_position: Option<TextSize>,
     target: Option<TextRange>,
     file: AssistFile,
 }
@@ -211,12 +211,12 @@ impl ActionBuilder {
     }
 
     /// Append specified `text` at the given `offset`
-    pub(crate) fn insert(&mut self, offset: TextUnit, text: impl Into<String>) {
+    pub(crate) fn insert(&mut self, offset: TextSize, text: impl Into<String>) {
         self.edit.insert(offset, text.into())
     }
 
     /// Specify desired position of the cursor after the assist is applied.
-    pub(crate) fn set_cursor(&mut self, offset: TextUnit) {
+    pub(crate) fn set_cursor(&mut self, offset: TextSize) {
         self.cursor_position = Some(offset)
     }
 

crates/ra_assists/src/assist_ctx.rs

@@ -2,7 +2,7 @@ use ra_syntax::{
     ast::{self, AstNode},
     Direction, SmolStr,
     SyntaxKind::{IDENT, WHITESPACE},
-    TextRange, TextUnit,
+    TextRange, TextSize,
 };
 use stdx::SepBy;
 
@@ -60,7 +60,6 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
             .collect::<Vec<SmolStr>>();
         let has_more_derives = !new_attr_input.is_empty();
         let new_attr_input = new_attr_input.iter().sep_by(", ").surround_with("(", ")").to_string();
-        let new_attr_input_len = new_attr_input.len();
 
         let mut buf = String::new();
         buf.push_str("\n\nimpl ");
@@ -70,8 +69,9 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
         buf.push_str(" {\n");
 
         let cursor_delta = if has_more_derives {
+            let delta = input.syntax().text_range().len() - TextSize::of(&new_attr_input);
             edit.replace(input.syntax().text_range(), new_attr_input);
-            input.syntax().text_range().len() - TextUnit::from_usize(new_attr_input_len)
+            delta
         } else {
             let attr_range = attr.syntax().text_range();
             edit.delete(attr_range);
@@ -81,13 +81,13 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
                 .next_sibling_or_token()
                 .filter(|t| t.kind() == WHITESPACE)
                 .map(|t| t.text_range())
-                .unwrap_or_else(|| TextRange::from_to(TextUnit::from(0), TextUnit::from(0)));
+                .unwrap_or_else(|| TextRange::new(TextSize::from(0), TextSize::from(0)));
             edit.delete(line_break_range);
 
             attr_range.len() + line_break_range.len()
         };
 
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf) - cursor_delta);
+        edit.set_cursor(start_offset + TextSize::of(&buf) - cursor_delta);
         buf.push_str("\n}");
         edit.insert(start_offset, buf);
     })

crates/ra_assists/src/handlers/add_custom_impl.rs

@@ -1,7 +1,7 @@
 use ra_syntax::{
     ast::{self, AstNode, AttrsOwner},
     SyntaxKind::{COMMENT, WHITESPACE},
-    TextUnit,
+    TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -37,17 +37,17 @@ pub(crate) fn add_derive(ctx: AssistCtx) -> Option<Assist> {
         let offset = match derive_attr {
             None => {
                 edit.insert(node_start, "#[derive()]\n");
-                node_start + TextUnit::of_str("#[derive(")
+                node_start + TextSize::of("#[derive(")
             }
-            Some(tt) => tt.syntax().text_range().end() - TextUnit::of_char(')'),
+            Some(tt) => tt.syntax().text_range().end() - TextSize::of(')'),
         };
         edit.target(nominal.syntax().text_range());
         edit.set_cursor(offset)
     })
 }
 
 // Insert `derive` after doc comments.
-fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextUnit> {
+fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextSize> {
     let non_ws_child = nominal
         .syntax()
         .children_with_tokens()

crates/ra_assists/src/handlers/add_derive.rs

@@ -37,8 +37,8 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx) -> Option<Assist> {
     let stmt_range = stmt.syntax().text_range();
     let eq_range = stmt.eq_token()?.text_range();
     // Assist should only be applicable if cursor is between 'let' and '='
-    let let_range = TextRange::from_to(stmt_range.start(), eq_range.start());
-    let cursor_in_range = ctx.frange.range.is_subrange(&let_range);
+    let let_range = TextRange::new(stmt_range.start(), eq_range.start());
+    let cursor_in_range = let_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }

crates/ra_assists/src/handlers/add_explicit_type.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode, NameOwner},
-    TextUnit,
+    TextSize,
 };
 use stdx::format_to;
 
@@ -65,7 +65,7 @@ impl From<{0}> for {1} {{
                 variant_name
             );
             edit.insert(start_offset, buf);
-            edit.set_cursor(start_offset + TextUnit::of_str("\n\n"));
+            edit.set_cursor(start_offset + TextSize::of("\n\n"));
         },
     )
 }

crates/ra_assists/src/handlers/add_from_impl_for_enum.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode},
-    SyntaxKind, SyntaxNode, TextUnit,
+    SyntaxKind, SyntaxNode, TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistFile, AssistId};
@@ -69,8 +69,8 @@ pub(crate) fn add_function(ctx: AssistCtx) -> Option<Assist> {
 }
 
 struct FunctionTemplate {
-    insert_offset: TextUnit,
-    cursor_offset: TextUnit,
+    insert_offset: TextSize,
+    cursor_offset: TextSize,
     fn_def: ast::SourceFile,
     file: AssistFile,
 }
@@ -129,7 +129,7 @@ impl FunctionBuilder {
                 let fn_def = indent_once.increase_indent(fn_def);
                 let fn_def = ast::make::add_trailing_newlines(1, fn_def);
                 let fn_def = indent.increase_indent(fn_def);
-                (fn_def, it.syntax().text_range().start() + TextUnit::from_usize(1))
+                (fn_def, it.syntax().text_range().start() + TextSize::of('{'))
             }
         };
 

crates/ra_assists/src/handlers/add_function.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode, NameOwner, TypeParamsOwner},
-    TextUnit,
+    TextSize,
 };
 use stdx::{format_to, SepBy};
 
@@ -51,7 +51,7 @@ pub(crate) fn add_impl(ctx: AssistCtx) -> Option<Assist> {
             format_to!(buf, "<{}>", generic_params)
         }
         buf.push_str(" {\n");
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf));
+        edit.set_cursor(start_offset + TextSize::of(&buf));
         buf.push_str("\n}");
         edit.insert(start_offset, buf);
     })

crates/ra_assists/src/handlers/add_impl.rs

@@ -3,7 +3,7 @@ use ra_syntax::{
     ast::{
         self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner,
     },
-    TextUnit, T,
+    TextSize, T,
 };
 use stdx::{format_to, SepBy};
 
@@ -77,16 +77,16 @@ pub(crate) fn add_new(ctx: AssistCtx) -> Option<Assist> {
                     .text_range()
                     .end();
 
-                Some((start, TextUnit::from_usize(1)))
+                Some((start, TextSize::of("\n")))
             })
             .unwrap_or_else(|| {
                 buf = generate_impl_text(&strukt, &buf);
                 let start = strukt.syntax().text_range().end();
 
-                (start, TextUnit::from_usize(3))
+                (start, TextSize::of("\n}\n"))
             });
 
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf) - end_offset);
+        edit.set_cursor(start_offset + TextSize::of(&buf) - end_offset);
         edit.insert(start_offset, buf);
     })
 }

crates/ra_assists/src/handlers/add_new.rs

@@ -26,7 +26,7 @@ pub(crate) fn apply_demorgan(ctx: AssistCtx) -> Option<Assist> {
     let op = expr.op_kind()?;
     let op_range = expr.op_token()?.text_range();
     let opposite_op = opposite_logic_op(op)?;
-    let cursor_in_range = ctx.frange.range.is_subrange(&op_range);
+    let cursor_in_range = op_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }