Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dependency from gpui from editor2

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-03 09:05:58 +01:00
parent fbee6b5352
commit 800c2685ea
6 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -1866,7 +1866,6 @@ dependencies = [
"async-tar", "async-tar",
"clock", "clock",
"collections", "collections",
"context_menu",
"fs", "fs",
"futures 0.3.28", "futures 0.3.28",
"gpui2", "gpui2",
@ -2631,7 +2630,6 @@ dependencies = [
"client2", "client2",
"clock", "clock",
"collections", "collections",
"context_menu",
"convert_case 0.6.0", "convert_case 0.6.0",
"copilot2", "copilot2",
"ctor", "ctor",
@ -2654,7 +2652,7 @@ dependencies = [
"postage", "postage",
"project2", "project2",
"rand 0.8.5", "rand 0.8.5",
"rich_text", "rich_text2",
"rpc2", "rpc2",
"schemars", "schemars",
"serde", "serde",
@ -3578,7 +3576,6 @@ dependencies = [
"foreign-types", "foreign-types",
"futures 0.3.28", "futures 0.3.28",
"gpui2_macros", "gpui2_macros",
"gpui_macros",
"image", "image",
"itertools 0.10.5", "itertools 0.10.5",
"lazy_static", "lazy_static",

2
crates/copilot2/Cargo.toml
View file

@ -20,7 +20,7 @@ test-support = [
[dependencies] [dependencies]
collections = { path = "../collections" } collections = { path = "../collections" }
context_menu = { path = "../context_menu" } # context_menu = { path = "../context_menu" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
language = { package = "language2", path = "../language2" } language = { package = "language2", path = "../language2" }
settings = { package = "settings2", path = "../settings2" } settings = { package = "settings2", path = "../settings2" }

6
crates/editor2/Cargo.toml
View file

@ -29,7 +29,7 @@ copilot = { package="copilot2", path = "../copilot2" }
db = { package="db2", path = "../db2" } db = { package="db2", path = "../db2" }
drag_and_drop = { path = "../drag_and_drop" } drag_and_drop = { path = "../drag_and_drop" }
collections = { path = "../collections" } collections = { path = "../collections" }
context_menu = { path = "../context_menu" } # context_menu = { path = "../context_menu" }
fuzzy = { package = "fuzzy2", path = "../fuzzy2" } fuzzy = { package = "fuzzy2", path = "../fuzzy2" }
git = { path = "../git" } git = { path = "../git" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
@ -38,7 +38,7 @@ lsp = { package = "lsp2", path = "../lsp2" }
multi_buffer = { package = "multi_buffer2", path = "../multi_buffer2" } multi_buffer = { package = "multi_buffer2", path = "../multi_buffer2" }
project = { package = "project2", path = "../project2" } project = { package = "project2", path = "../project2" }
rpc = { package = "rpc2", path = "../rpc2" } rpc = { package = "rpc2", path = "../rpc2" }
rich_text = { path = "../rich_text" } rich_text = { package = "rich_text2", path = "../rich_text2" }
settings = { package="settings2", path = "../settings2" } settings = { package="settings2", path = "../settings2" }
snippet = { path = "../snippet" } snippet = { path = "../snippet" }
sum_tree = { path = "../sum_tree" } sum_tree = { path = "../sum_tree" }
@ -46,7 +46,7 @@ text = { package="text2", path = "../text2" }
theme = { package="theme2", path = "../theme2" } theme = { package="theme2", path = "../theme2" }
util = { path = "../util" } util = { path = "../util" }
sqlez = { path = "../sqlez" } sqlez = { path = "../sqlez" }
workspace = { package="workspace2", path = "../workspace2" } workspace = { package = "workspace2", path = "../workspace2" }
aho-corasick = "1.1" aho-corasick = "1.1"
anyhow.workspace = true anyhow.workspace = true

2
crates/editor2/src/editor.rs
View file

@ -622,7 +622,7 @@ pub struct Editor {
// inlay_background_highlights: TreeMap<Option<TypeId>, InlayBackgroundHighlight>, // inlay_background_highlights: TreeMap<Option<TypeId>, InlayBackgroundHighlight>,
nav_history: Option<ItemNavHistory>, nav_history: Option<ItemNavHistory>,
context_menu: RwLock<Option<ContextMenu>>, context_menu: RwLock<Option<ContextMenu>>,
mouse_context_menu: View<context_menu::ContextMenu>, // mouse_context_menu: View<context_menu::ContextMenu>,
completion_tasks: Vec<(CompletionId, Task<Option<()>>)>, completion_tasks: Vec<(CompletionId, Task<Option<()>>)>,
next_completion_id: CompletionId, next_completion_id: CompletionId,
available_code_actions: Option<(Model<Buffer>, Arc<[CodeAction]>)>, available_code_actions: Option<(Model<Buffer>, Arc<[CodeAction]>)>,

1
crates/editor2/src/mouse_context_menu.rs
View file

@ -1,5 +1,4 @@
use crate::{DisplayPoint, Editor, EditorMode, SelectMode}; use crate::{DisplayPoint, Editor, EditorMode, SelectMode};
use context_menu::ContextMenuItem;
use gpui::{Pixels, Point, ViewContext}; use gpui::{Pixels, Point, ViewContext};
pub fn deploy_context_menu( pub fn deploy_context_menu(

1
crates/gpui2/Cargo.toml
View file

@ -15,7 +15,6 @@ doctest = false
[dependencies] [dependencies]
collections = { path = "../collections" } collections = { path = "../collections" }
gpui_macros = { path = "../gpui_macros" }
gpui2_macros = { path = "../gpui2_macros" } gpui2_macros = { path = "../gpui2_macros" }
util = { path = "../util" } util = { path = "../util" }
sum_tree = { path = "../sum_tree" } sum_tree = { path = "../sum_tree" }