Skip to content

Commit 8672eb8

Browse files
authored
Merge pull request #18421 from Veykril/push-uxxwvwnqvomr
Move text-edit into ide-db
2 parents 09547e9 + 27306c5 commit 8672eb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+684
-707
lines changed

Cargo.lock

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ span = { path = "./crates/span", version = "0.0.0" }
7979
stdx = { path = "./crates/stdx", version = "0.0.0" }
8080
syntax = { path = "./crates/syntax", version = "0.0.0" }
8181
syntax-bridge = { path = "./crates/syntax-bridge", version = "0.0.0" }
82-
text-edit = { path = "./crates/text-edit", version = "0.0.0" }
8382
toolchain = { path = "./crates/toolchain", version = "0.0.0" }
8483
tt = { path = "./crates/tt", version = "0.0.0" }
8584
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }

crates/ide-assists/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ tracing.workspace = true
2323
# local deps
2424
stdx.workspace = true
2525
syntax.workspace = true
26-
text-edit.workspace = true
2726
ide-db.workspace = true
2827
hir.workspace = true
2928

crates/ide-assists/src/handlers/bool_to_enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use either::Either;
22
use hir::ModuleDef;
3+
use ide_db::text_edit::TextRange;
34
use ide_db::{
45
assists::{AssistId, AssistKind},
56
defs::Definition,
@@ -19,7 +20,6 @@ use syntax::{
1920
},
2021
AstNode, NodeOrToken, SyntaxKind, SyntaxNode, T,
2122
};
22-
use text_edit::TextRange;
2323

2424
use crate::{
2525
assist_context::{AssistContext, Assists},

crates/ide-assists/src/handlers/destructure_struct_binding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use hir::{sym, HasVisibility};
2+
use ide_db::text_edit::TextRange;
23
use ide_db::{
34
assists::{AssistId, AssistKind},
45
defs::Definition,
@@ -8,7 +9,6 @@ use ide_db::{
89
};
910
use itertools::Itertools;
1011
use syntax::{ast, ted, AstNode, Edition, SmolStr, SyntaxNode, ToSmolStr};
11-
use text_edit::TextRange;
1212

1313
use crate::{
1414
assist_context::{AssistContext, Assists, SourceChangeBuilder},

crates/ide-assists/src/handlers/destructure_tuple_binding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use ide_db::text_edit::TextRange;
12
use ide_db::{
23
assists::{AssistId, AssistKind},
34
defs::Definition,
@@ -8,7 +9,6 @@ use syntax::{
89
ast::{self, make, AstNode, FieldExpr, HasName, IdentPat},
910
ted,
1011
};
11-
use text_edit::TextRange;
1212

1313
use crate::{
1414
assist_context::{AssistContext, Assists, SourceChangeBuilder},

crates/ide-assists/src/handlers/remove_unused_imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use std::collections::hash_map::Entry;
22

33
use hir::{FileRange, HirFileIdExt, InFile, InRealFile, Module, ModuleSource};
4+
use ide_db::text_edit::TextRange;
45
use ide_db::{
56
defs::Definition,
67
search::{FileReference, ReferenceCategory, SearchScope},
@@ -10,7 +11,6 @@ use syntax::{
1011
ast::{self, Rename},
1112
AstNode,
1213
};
13-
use text_edit::TextRange;
1414

1515
use crate::{AssistContext, AssistId, AssistKind, Assists};
1616

crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use hir::{FileRange, Semantics};
2+
use ide_db::text_edit::TextRange;
23
use ide_db::{
34
defs::Definition,
45
search::{SearchScope, UsageSearchResult},
@@ -11,7 +12,6 @@ use syntax::{
1112
},
1213
match_ast, ted, AstNode,
1314
};
14-
use text_edit::TextRange;
1515

1616
use crate::{AssistContext, AssistId, AssistKind, Assists};
1717

crates/ide-completion/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ base-db.workspace = true
2525
ide-db.workspace = true
2626
stdx.workspace = true
2727
syntax.workspace = true
28-
text-edit.workspace = true
2928
# completions crate should depend only on the top-level `hir` package. if you need
3029
# something from some `hir-xxx` subpackage, reexport the API via `hir`.
3130
hir.workspace = true

crates/ide-completion/src/completions/item_list/trait_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
//! ```
3333
3434
use hir::{db::ExpandDatabase, HasAttrs, MacroFileId, Name};
35+
use ide_db::text_edit::TextEdit;
3536
use ide_db::{
3637
documentation::HasDocs, path_transform::PathTransform,
3738
syntax_helpers::prettify_macro_expansion, traits::get_missing_assoc_items, SymbolKind,
@@ -40,7 +41,6 @@ use syntax::{
4041
ast::{self, edit_in_place::AttrsOwnerEdit, make, HasGenericArgs, HasTypeBounds},
4142
format_smolstr, ted, AstNode, SmolStr, SyntaxElement, SyntaxKind, TextRange, ToSmolStr, T,
4243
};
43-
use text_edit::TextEdit;
4444

4545
use crate::{
4646
context::PathCompletionCtx, CompletionContext, CompletionItem, CompletionItemKind,

0 commit comments

Comments
 (0)