Remove text_edit crate

Summary:
The `text_edit` crate contains a single file. Move it to the `ide_db` crate, and remove the whole `text_edit` crate.

This is in line with Rust Analyzer.

Reviewed By: alanz

Differential Revision: D87539326

fbshipit-source-id: cdc8f71902bc084eca79ae54ca71584ac48ed637

Cargo.lock

@@ -446,10 +446,10 @@ dependencies = [
  "crossbeam-channel",
  "elp_eqwalizer",
  "elp_ide",
+ "elp_ide_db",
  "elp_log",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "env_logger",
  "expect-test",
  "fs_extra",
@@ -572,7 +572,6 @@ dependencies = [
  "elp_ide_ssr",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "elp_types_db",
  "env_logger",
  "expect-test",
@@ -604,7 +603,6 @@ dependencies = [
  "cov-mark",
  "elp_ide_db",
  "elp_syntax",
- "elp_text_edit",
  "expect-test",
  "fxhash",
  "hir",
@@ -645,7 +643,6 @@ dependencies = [
  "elp_erlang_service",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "elp_types_db",
  "expect-test",
  "fxhash",
@@ -666,6 +663,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
+ "text-size",
  "toml",
  "tracing",
 ]
@@ -738,7 +736,6 @@ version = "1.1.0"
 dependencies = [
  "eetf",
  "elp_ide_db",
- "elp_text_edit",
  "expect-test",
  "fxhash",
  "indexmap 2.9.0",
@@ -758,14 +755,6 @@ dependencies = [
  "tree-sitter-erlang",
 ]
 
-[[package]]
-name = "elp_text_edit"
-version = "1.1.0"
-dependencies = [
- "itertools 0.10.5",
- "text-size",
-]
-
 [[package]]
 name = "elp_types_db"
 version = "1.1.0"

Cargo.toml

@@ -30,7 +30,6 @@ elp_ide_ssr = { path = "./crates/ide_ssr" }
 elp_log = { path = "./crates/elp_log" }
 elp_project_model = { path = "./crates/project_model" }
 elp_syntax = { path = "./crates/syntax" }
-elp_text_edit = { path = "./crates/text_edit" }
 elp_types_db = { path = "./crates/types_db" }
 hir = { path = "./crates/hir" }
 

crates/elp/Cargo.toml

@@ -18,10 +18,10 @@ workspace = true
 [dependencies]
 elp_eqwalizer.workspace = true
 elp_ide.workspace = true
+elp_ide_db.workspace = true
 elp_log.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 hir.workspace = true
 
 always-assert.workspace = true

crates/elp/src/bin/lint_cli.rs

@@ -52,12 +52,12 @@ use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use elp_ide::elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextSize;
 use elp_log::telemetry;
 use elp_project_model::AppName;
 use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
-use elp_text_edit::TextSize;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 use hir::FormIdx;

crates/elp/src/to_proto.rs

@@ -48,9 +48,9 @@ use elp_ide::elp_ide_db::elp_base_db::FilePosition;
 use elp_ide::elp_ide_db::elp_base_db::FileRange;
 use elp_ide::elp_ide_db::rename::RenameError;
 use elp_ide::elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::Indel;
+use elp_ide_db::text_edit::TextEdit;
 use elp_project_model::ProjectBuildData;
-use elp_text_edit::Indel;
-use elp_text_edit::TextEdit;
 use lsp_types::CompletionItemTag;
 use lsp_types::Hover;
 use lsp_types::HoverContents;

crates/ide/Cargo.toml

@@ -10,12 +10,11 @@ workspace = true
 elp_eqwalizer.workspace = true
 elp_erlang_service.workspace = true
 elp_ide_assists.workspace = true
-elp_ide_completion.workspace = true
 elp_ide_db.workspace = true
+elp_ide_completion.workspace = true
 elp_ide_ssr.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 elp_types_db.workspace = true
 hir.workspace = true
 

crates/ide/src/diagnostics.rs

@@ -44,6 +44,7 @@ use elp_ide_db::metadata::Kind;
 use elp_ide_db::metadata::Metadata;
 use elp_ide_db::metadata::Source;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_ide_ssr::Match;
 use elp_ide_ssr::SsrSearchScope;
 use elp_ide_ssr::match_pattern;
@@ -63,7 +64,6 @@ use elp_syntax::ast::edit::IndentLevel;
 use elp_syntax::ast::edit::start_of_line;
 use elp_syntax::label::Label;
 use elp_syntax::ted::Element;
-use elp_text_edit::TextEdit;
 use elp_types_db::TypedSemantic;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;

crates/ide/src/diagnostics/boolean_precedence.rs

@@ -24,11 +24,11 @@ use elp_ide_assists::helpers::unwrap_parens;
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::BinaryOp;
 use elp_syntax::ast::LogicOp;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::AnyExprRef;

crates/ide/src/diagnostics/debugging_function.rs

@@ -11,7 +11,7 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::Semantic;
 
 use crate::FunctionMatch;

crates/ide/src/diagnostics/dependent_header.rs

@@ -14,10 +14,10 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::ast::RecordName;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::InFile;
 use hir::Name;

crates/ide/src/diagnostics/deprecated_function.rs

@@ -21,10 +21,10 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use hir::AnyExpr;
 use hir::Expr;
 use hir::FunctionDef;

crates/ide/src/diagnostics/edoc.rs

@@ -14,9 +14,9 @@ use elp_ide_assists::helpers;
 use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use fxhash::FxHashSet;
 use hir::Attribute;
 use hir::Semantic;

crates/ide/src/diagnostics/effect_free_statement.rs

@@ -17,11 +17,11 @@ use std::iter;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxElement;
 use elp_syntax::SyntaxKind;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExprId;
 use hir::Expr;
 use hir::ExprId;

crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs

@@ -15,8 +15,8 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FilePosition;
 use elp_ide_db::find_best_token;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextSize;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextSize;
 use elp_types_db::eqwalizer::StructuredDiagnostic;
 use elp_types_db::eqwalizer::tc_diagnostics::ExpectedSubtype;
 use elp_types_db::eqwalizer::tc_diagnostics::TypeError;

crates/ide/src/diagnostics/head_mismatch.rs

@@ -13,13 +13,13 @@ use std::hash::Hash;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SyntaxToken;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::AstNode;
 use elp_syntax::ast::ClauseSeparator;
 use elp_syntax::syntax_node::SyntaxNode;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashMap;
 use hir::Semantic;
 

crates/ide/src/diagnostics/macro_precedence_suprise.rs

@@ -17,7 +17,7 @@ use elp_ide_assists::Assist;
 use elp_ide_assists::helpers::add_parens_edit;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprRef;
 use hir::Expr;

crates/ide/src/diagnostics/meck.rs

@@ -10,8 +10,8 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use hir::AnyExprId;
 use hir::Expr;
 use hir::FunctionDef;

crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs

@@ -20,8 +20,8 @@ use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::AnyExpr;
 use hir::CompileOptionId;

crates/ide/src/diagnostics/misspelled_attribute.rs

@@ -10,9 +10,9 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::ast::AstNode;
 use elp_syntax::ast::WildAttribute;
-use elp_text_edit::TextEdit;
 use hir::Attribute;
 use hir::Semantic;
 

crates/ide/src/diagnostics/module_mismatch.rs

@@ -15,11 +15,11 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxNode;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::Semantic;
 
 use crate::Diagnostic;

crates/ide/src/diagnostics/nonstandard_integer_formatting.rs

@@ -15,8 +15,8 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::BasedInteger;
 use hir::Expr;

crates/ide/src/diagnostics/record_tuple_match.rs

@@ -15,7 +15,7 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::AnyExpr;
 use hir::FunctionDef;
 use hir::Literal;

crates/ide/src/diagnostics/replace_call.rs

@@ -15,9 +15,9 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExprId;
 use hir::CallTarget;
 use hir::Expr;

crates/ide/src/diagnostics/replace_in_spec.rs

@@ -16,8 +16,8 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SmolStr;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::AnyExpr;
 use hir::InFile;

crates/ide/src/diagnostics/trivial_match.rs

@@ -17,9 +17,9 @@ use std::collections::HashMap;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::BinarySeg;

crates/ide/src/diagnostics/undefined_macro.rs

@@ -15,7 +15,7 @@ use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::path_for_file;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextEdit;
+use elp_ide_db::text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::Semantic;
 use lazy_static::lazy_static;

crates/ide/src/diagnostics/undocumented_function.rs

@@ -11,9 +11,9 @@
 // Diagnostic: undocumented-function
 use elp_ide_assists::helpers::unwrap_parens;
 use elp_ide_db::elp_base_db::FileId;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::Atom;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::AsName;
 use hir::FunctionDef;

crates/ide/src/diagnostics/undocumented_module.rs

@@ -12,8 +12,8 @@ use elp_ide_assists::Assist;
 use elp_ide_assists::helpers;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use hir::Semantic;
 
 use crate::diagnostics::DiagnosticCode;

crates/ide/src/diagnostics/unspecific_include.rs

@@ -14,9 +14,9 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::generated_file_include_lib;
 use elp_ide_db::elp_base_db::path_for_file;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::InFile;
 use hir::Semantic;
 

crates/ide/src/diagnostics/unused_function_args.rs

@@ -18,9 +18,9 @@ use std::collections::HashSet;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::FunctionClauseDef;

crates/ide/src/diagnostics/unused_include.rs

@@ -17,9 +17,9 @@ use elp_ide_db::SearchScope;
 use elp_ide_db::SymbolDefinition;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SmolStr;
 use elp_syntax::ast::AstNode;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 use hir::FormIdx;

crates/ide/src/diagnostics/unused_macro.rs

@@ -19,9 +19,9 @@ use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::SymbolDefinition;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::TextRange;
-use elp_text_edit::TextEdit;
 use hir::Semantic;
 
 use crate::diagnostics::DiagnosticCode;

crates/ide/src/diagnostics_collection.rs

@@ -266,8 +266,8 @@ mod tests {
     use std::iter::once;
 
     use elp_ide_db::elp_base_db::FileId;
+    use elp_ide_db::text_edit::TextRange;
     use elp_syntax::label::Label;
-    use elp_text_edit::TextRange;
     use fxhash::FxHashMap;
     use fxhash::FxHashSet;
 

crates/ide/src/rename.rs

@@ -175,11 +175,11 @@ pub(crate) mod tests {
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::assert_eq_text;
     use elp_ide_db::elp_base_db::fixture::WithFixture as _;
+    use elp_ide_db::text_edit::TextEdit;
     use elp_project_model::test_fixture::trim_indent;
     use elp_syntax::AstNode;
     use elp_syntax::algo;
     use elp_syntax::ast;
-    use elp_text_edit::TextEdit;
     use hir::AnyExprId;
     use hir::InFile;
     use hir::Semantic;

crates/ide/src/tests.rs

@@ -20,8 +20,8 @@ use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::assert_eq_text;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
+use elp_ide_db::text_edit::TextRange;
 use elp_project_model::test_fixture::trim_indent;
-use elp_text_edit::TextRange;
 use expect_test::Expect;
 use itertools::Itertools;
 

crates/ide_assists/Cargo.toml

@@ -9,7 +9,6 @@ workspace = true
 [dependencies]
 elp_ide_db.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 hir.workspace = true
 
 cov-mark.workspace = true

crates/ide_assists/src/handlers/add_doc.rs

@@ -12,9 +12,9 @@ use std::fmt::Write;
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
-use elp_text_edit::TextSize;
 use hir::FunctionDef;
 
 use crate::AssistContext;

crates/ide_assists/src/handlers/flip_sep.rs

@@ -10,12 +10,12 @@
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
 use elp_syntax::Direction;
 use elp_syntax::SyntaxKind;
 use elp_syntax::SyntaxToken;
 use elp_syntax::algo::non_trivia_sibling;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::InFile;
 

crates/ide_assists/src/handlers/implement_behaviour.rs

@@ -12,10 +12,10 @@ use std::cmp::max;
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::ast::BehaviourAttribute;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use hir::Callback;
 use hir::CallbackId;
 use hir::InFile;

crates/ide_assists/src/handlers/inline_function.rs

@@ -22,6 +22,7 @@ use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::find_best_token;
 use elp_ide_db::helpers::get_call;
 use elp_ide_db::rename::SafetyChecks;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::NodeOrToken;
 use elp_syntax::SyntaxKind;
@@ -32,7 +33,6 @@ use elp_syntax::TextSize;
 use elp_syntax::ast;
 use elp_syntax::ast::HasArity;
 use elp_syntax::ast::edit::IndentLevel;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::FunctionDef;
 use hir::InFile;

crates/ide_assists/src/helpers.rs

@@ -20,6 +20,8 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::helpers::top_insert_position;
 use elp_ide_db::rename::is_safe_function;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::Direction;
@@ -34,8 +36,6 @@ use elp_syntax::algo;
 use elp_syntax::algo::skip_inline_comment;
 use elp_syntax::ast;
 use elp_syntax::match_ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextSize;
 use fxhash::FxHashSet;
 use hir::Attribute;
 use hir::Body;

crates/ide_db/Cargo.toml

@@ -12,7 +12,6 @@ elp_eqwalizer.workspace = true
 elp_erlang_service.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 elp_types_db.workspace = true
 hir.workspace = true
 
@@ -37,6 +36,7 @@ stdx.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 tempfile.workspace = true
+text-size.workspace = true
 toml.workspace = true
 tracing.workspace = true
 

crates/ide_db/src/helpers.rs

@@ -15,9 +15,9 @@ use elp_syntax::SourceFile;
 use elp_syntax::SyntaxKind;
 use elp_syntax::SyntaxNode;
 use elp_syntax::SyntaxToken;
+use elp_syntax::TextSize;
 use elp_syntax::TokenAtOffset;
 use elp_syntax::ast;
-use elp_text_edit::TextSize;
 use hir::FormList;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

crates/ide_db/src/lib.rs

@@ -60,6 +60,7 @@ mod line_index;
 // @fb-only
 pub mod metadata;
 mod search;
+pub mod text_edit;
 
 // ---------------------------------------------------------------------
 pub mod assists;
@@ -420,8 +421,8 @@ impl TypedSemantic for RootDatabase {
 mod tests {
     use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::WithFixture;
-    use elp_text_edit::TextRange;
 
+    use super::text_edit::TextRange;
     use crate::RootDatabase;
 
     #[test]

crates/ide_db/src/rename.rs

@@ -20,7 +20,6 @@ use elp_base_db::FileRange;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::ast::in_erlang_module;
-use elp_text_edit::TextEdit;
 use hir::InFile;
 use hir::Semantic;
 
@@ -28,6 +27,7 @@ use crate::SymbolDefinition;
 use crate::helpers::get_call;
 use crate::search::NameLike;
 use crate::source_change::SourceChange;
+use crate::text_edit::TextEdit;
 
 pub type RenameResult<T> = Result<T, RenameError>;
 

crates/ide_db/src/source_change.rs

@@ -20,14 +20,14 @@ use std::mem;
 use elp_base_db::AnchoredPathBuf;
 use elp_base_db::FileId;
 use elp_syntax::SyntaxNode;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextEditBuilder;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
+use elp_syntax::TextRange;
+use elp_syntax::TextSize;
 use fxhash::FxHashMap;
 use stdx::never;
 
 use crate::helpers::SnippetCap;
+use crate::text_edit::TextEdit;
+use crate::text_edit::TextEditBuilder;
 use crate::tree_diff::diff;
 
 #[derive(Default, Debug, Clone)]

crates/ide_db/src/text_edit.rs

@@ -15,7 +15,6 @@
 //! `rust-analyzer` never mutates text itself and only sends diffs to clients,
 //! so `TextEdit` is the ultimate representation of the work done by
 //! rust-analyzer.
-
 use std::cmp::max;
 
 use itertools::Itertools;

crates/ide_db/src/tree_diff.rs

@@ -15,10 +15,11 @@ use std::hash::BuildHasherDefault;
 use elp_syntax::NodeOrToken;
 use elp_syntax::SyntaxElement;
 use elp_syntax::SyntaxNode;
-use elp_text_edit::TextEditBuilder;
 use fxhash::FxHashMap;
 use indexmap::IndexMap;
 
+use crate::text_edit::TextEditBuilder;
+
 type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<fxhash::FxHasher>>;
 
 #[derive(Debug, Hash, PartialEq, Eq)]
@@ -176,11 +177,12 @@ mod tests {
     use elp_syntax::SourceFile;
     use elp_syntax::SyntaxElement;
     use elp_syntax::SyntaxKind;
-    use elp_text_edit::TextEdit;
     use expect_test::Expect;
     use expect_test::expect;
     use itertools::Itertools;
 
+    use crate::text_edit::TextEdit;
+
     #[test]
     fn replace_node_token() {
         cov_mark::check!(diff_node_token_replace);

crates/syntax/Cargo.toml

@@ -7,8 +7,6 @@ version.workspace = true
 workspace = true
 
 [dependencies]
-elp_text_edit.workspace = true
-
 eetf.workspace = true
 fxhash.workspace = true
 indexmap.workspace = true

crates/text_edit/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "elp_text_edit"
-edition.workspace = true
-version.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-itertools.workspace = true
-text-size.workspace = true