Remove 2 suffix for editor

Co-authored-by: Mikayla <mikayla@zed.dev>
DivineDominion · Jan 3, 2024 · 588976d · 588976d
1 parent bcad3a5
commit 588976d
Show file tree

Hide file tree

Showing 85 changed files with 6,500 additions and 41,034 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 
 [dependencies]
 auto_update = { path = "../auto_update" }
-editor = { path = "../editor2", package = "editor2" }
+editor = { path = "../editor" }
 language = { path = "../language2", package = "language2" }
 gpui = { path = "../gpui2", package = "gpui2" }
 project = { path = "../project2", package = "project2" }
@@ -25,4 +25,4 @@ futures.workspace = true
 smallvec.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor2", package = "editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/assistant2/Cargo.toml b/crates/assistant2/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 ai = { package = "ai2", path = "../ai2" }
 client = { package = "client2", path = "../client2" }
 collections = { path = "../collections"}
-editor = { package = "editor2", path = "../editor2" }
+editor = { path = "../editor" }
 fs = { package = "fs2", path = "../fs2" }
 gpui = { package = "gpui2", path = "../gpui2" }
 language = { package = "language2", path = "../language2" }
@@ -45,7 +45,7 @@ tiktoken-rs.workspace = true
 
 [dev-dependencies]
 ai = { package = "ai2", path = "../ai2", features = ["test-support"]}
-editor = { package = "editor2", path = "../editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 project = { package = "project2", path = "../project2", features = ["test-support"] }
 
 ctor.workspace = true

diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 
 [dependencies]
 collections = { path = "../collections" }
-editor = { package = "editor2", path = "../editor2" }
+editor = { path = "../editor" }
 gpui = { package = "gpui2", path = "../gpui2" }
 ui = { package = "ui2", path = "../ui2" }
 language = { package = "language2", path = "../language2" }
@@ -23,6 +23,6 @@ outline = { package = "outline2", path = "../outline2" }
 itertools = "0.10"
 
 [dev-dependencies]
-editor = { package = "editor2", path = "../editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
 workspace = { package = "workspace2", path = "../workspace2", features = ["test-support"] }
diff --git a/crates/collab2/Cargo.toml b/crates/collab2/Cargo.toml
@@ -66,7 +66,7 @@ gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
 call = { package = "call2", path = "../call2", features = ["test-support"] }
 client = { package = "client2", path = "../client2", features = ["test-support"] }
 channel = { package = "channel2", path = "../channel2" }
-editor = { package = "editor2", path = "../editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 language = { package = "language2", path = "../language2", features = ["test-support"] }
 fs = { package = "fs2", path = "../fs2", features = ["test-support"] }
 git = { package = "git3", path = "../git3", features = ["test-support"] }

diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
@@ -31,7 +31,7 @@ clock = { path = "../clock" }
 collections = { path = "../collections" }
 # context_menu = { path = "../context_menu" }
 # drag_and_drop = { path = "../drag_and_drop" }
-editor = { package="editor2", path = "../editor2" }
+editor = { path = "../editor" }
 feedback = { path = "../feedback" }
 fuzzy = { package = "fuzzy2", path = "../fuzzy2" }
 gpui = { package = "gpui2", path = "../gpui2" }
@@ -68,7 +68,7 @@ smallvec.workspace = true
 call = { package = "call2", path = "../call2", features = ["test-support"] }
 client = { package = "client2", path = "../client2", features = ["test-support"] }
 collections = { path = "../collections", features = ["test-support"] }
-editor = { package = "editor2", path = "../editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
 notifications = { package = "notifications2", path = "../notifications2", features = ["test-support"] }
 project = { package = "project2", path = "../project2", features = ["test-support"] }

diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 
 [dependencies]
 collections = { path = "../collections" }
-editor = { package = "editor2", path = "../editor2" }
+editor = { path = "../editor" }
 fuzzy = { package = "fuzzy2", path = "../fuzzy2" }
 gpui = { package = "gpui2", path = "../gpui2" }
 picker = { path = "../picker" }
@@ -26,7 +26,7 @@ serde.workspace = true
 
 [dev-dependencies]
 gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
-editor = { package = "editor2", path = "../editor2", features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 language = { package="language2", path = "../language2", features = ["test-support"] }
 project = { package="project2", path = "../project2", features = ["test-support"] }
 menu = { package = "menu2", path = "../menu2" }