Merge branch 'main' into import-theme

Cargo.lock

@@ -1541,7 +1541,6 @@ dependencies = [
  "schemars",
  "serde",
  "serde_derive",
- "settings",
  "settings2",
  "smol",
  "sum_tree",
@@ -7796,7 +7795,6 @@ dependencies = [
  "anyhow",
  "collections",
  "feature_flags2",
- "fs",
  "fs2",
  "futures 0.3.28",
  "gpui2",
@@ -10813,6 +10811,44 @@ dependencies = [
  "uuid 1.4.1",
 ]
 
+[[package]]
+name = "workspace2"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-recursion 1.0.5",
+ "bincode",
+ "call2",
+ "client2",
+ "collections",
+ "db2",
+ "env_logger 0.9.3",
+ "fs2",
+ "futures 0.3.28",
+ "gpui2",
+ "indoc",
+ "install_cli2",
+ "itertools 0.10.5",
+ "language2",
+ "lazy_static",
+ "log",
+ "node_runtime",
+ "parking_lot 0.11.2",
+ "postage",
+ "project2",
+ "schemars",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "settings2",
+ "smallvec",
+ "terminal2",
+ "theme2",
+ "ui2",
+ "util",
+ "uuid 1.4.1",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -11128,6 +11164,7 @@ dependencies = [
  "urlencoding",
  "util",
  "uuid 1.4.1",
+ "workspace2",
 ]
 
 [[package]]