Merge branch 'main' into import-theme

2023-11-06 12:08:46 -05:00
parent 230edeb5f8 bf80c1da5b
commit f8504c349c
64 changed files with 1053 additions and 924 deletions
@@ -2459,8 +2459,10 @@ dependencies = [
 "client",
 "collections",
 "editor",
+ "futures 0.3.28",
 "gpui",
 "language",
+ "log",
 "lsp",
 "postage",
 "project",
@@ -9742,7 +9744,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-vue"
 version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=95b2890#95b28908d90e928c308866f7631e73ef6e1d4b5f"
+source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58#9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"
 dependencies = [
 "cc",
 "tree-sitter",