Merge branch 'main' into pr/554

zed-industries · Apr 16, 2024 · 967e6d7 · 967e6d7
2 parents 5375e82 + ab1cd44
commit 967e6d7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -18,6 +18,10 @@
 	path = extensions/biome
 	url = https://github.com/biomejs/biome-zed.git
 
+[submodule "extensions/blackula"]
+	path = extensions/blackula
+	url = https://github.com/JacobCoffee/blackula.git
+
 [submodule "extensions/blanche"]
 	path = extensions/blanche
 	url = https://github.com/kwonoj/zed-blanche.git

diff --git a/extensions.toml b/extensions.toml
@@ -17,12 +17,16 @@ version = "0.0.4"
 
 [beancount]
 submodule = "extensions/beancount"
-version = "0.0.1"
+version = "0.0.2"
 
 [biome]
 submodule = "extensions/biome"
 version = "0.0.2"
 
+[blackula]
+submodule = "extensions/blackula"
+version = "0.1.0"
+
 [blanche]
 submodule = "extensions/blanche"
 version = "0.0.1"
@@ -46,7 +50,7 @@ version = "1.0.0"
 [clojure]
 submodule = "extensions/zed"
 path = "extensions/clojure"
-version = "0.0.1"
+version = "0.0.2"
 
 [colorizer]
 submodule = "extensions/colorizer"
@@ -59,7 +63,7 @@ version = "0.0.1"
 [csharp]
 submodule = "extensions/zed"
 path = "extensions/csharp"
-version = "0.0.1"
+version = "0.0.2"
 
 [csv]
 submodule = "extensions/csv"
@@ -156,7 +160,7 @@ version = "0.0.2"
 [gleam]
 submodule = "extensions/zed"
 path = "extensions/gleam"
-version = "0.1.0"
+version = "0.1.1"
 
 [glsl]
 submodule = "extensions/zed"
@@ -228,7 +232,7 @@ version = "0.0.1"
 [lua]
 submodule = "extensions/zed"
 path = "extensions/lua"
-version = "0.0.1"
+version = "0.0.2"
 
 [macos-classic]
 submodule = "extensions/macos-classic"
@@ -452,7 +456,7 @@ version = "0.0.2"
 [terraform]
 submodule = "extensions/zed"
 path = "extensions/terraform"
-version = "0.0.1"
+version = "0.0.2"
 
 [the-dark-side]
 submodule = "extensions/the-dark-side"
@@ -536,4 +540,4 @@ version = "0.0.1"
 [zig]
 submodule = "extensions/zed"
 path = "extensions/zig"
-version = "0.1.0"
+version = "0.1.1"
diff --git a/extensions/beancount b/extensions/beancount
diff --git a/extensions/blackula b/extensions/blackula
diff --git a/extensions/slint b/extensions/slint
diff --git a/extensions/zed b/extensions/zed
diff --git a/justfile b/justfile
@@ -2,6 +2,10 @@
 package-extensions:
     pnpm package-extensions
 
+# Initializes the submodule at the given path.
+init-submodule SUBMODULE_PATH:
+    git submodule update --init --recursive {{SUBMODULE_PATH}}
+
 # Updates the Git submodules containing extensions.
 submodules:
     git submodule update --init --recursive
+3 −0		.gitignore
+0 −10		extension.json
+11 −0		extension.toml
+48 −0		.github/workflows/bump_patch_version.yml
+1 −1		CONTRIBUTING.md
+56 −79		Cargo.lock
+2 −2		Cargo.toml
+1 −1		Procfile
+5 −4		assets/keymaps/vim.json
+31 −8		assets/settings/default.json
+5 −3		crates/assistant/src/assistant_panel.rs
+1 −1		crates/collab/Cargo.toml
+11 −6		crates/collab/src/api/extensions.rs
+26 −6		crates/collab/src/tests/editor_tests.rs
+2 −0		crates/collab_ui/src/chat_panel/message_editor.rs
+41 −12		crates/diagnostics/src/diagnostics.rs
+1 −0		crates/editor/src/actions.rs
+106 −25		crates/editor/src/editor.rs
+13 −7		crates/editor/src/editor_settings.rs
+351 −153		crates/editor/src/element.rs
+118 −55		crates/editor/src/git/blame.rs
+25 −1		crates/extensions_ui/src/components/extension_card.rs
+1 −0		crates/extensions_ui/src/extension_suggest.rs
+54 −10		crates/extensions_ui/src/extensions_ui.rs
+2 −0		crates/gpui/src/geometry.rs
+1 −1		crates/gpui/src/platform/blade/blade_atlas.rs
+152 −72		crates/gpui/src/platform/linux/wayland/client.rs
+16 −6		crates/gpui/src/platform/linux/wayland/cursor.rs
+1 −0		crates/gpui/src/platform/mac/platform.rs
+1 −1		crates/gpui/src/platform/mac/text_system.rs
+3 −6		crates/gpui/src/platform/windows/window.rs
+8 −4		crates/gpui/src/window/element_cx.rs
+1 −1		crates/language/src/language.rs
+39 −4		crates/language/src/markdown.rs
+75 −17		crates/language/src/task_context.rs
+0 −1		crates/languages/Cargo.toml
+18 −0		crates/languages/src/bash.rs
+44 −15		crates/languages/src/c.rs
+1 −1		crates/languages/src/go.rs
+10 −8		crates/languages/src/lib.rs
+0 −52		crates/languages/src/nu.rs
+0 −4		crates/languages/src/nu/brackets.scm
+0 −10		crates/languages/src/nu/config.toml
+0 −284		crates/languages/src/nu/highlights.scm
+0 −3		crates/languages/src/nu/indents.scm
+26 −1		crates/languages/src/python.rs
+13 −12		crates/languages/src/rust.rs
+36 −7		crates/lsp/src/lsp.rs
+23 −6		crates/project/src/project.rs
+45 −1		crates/project/src/project_settings.rs
+151 −10		crates/project/src/project_tests.rs
+63 −19		crates/project/src/task_inventory.rs
+9 −0		crates/project/src/terminals.rs
+2 −0		crates/search/src/buffer_search.rs
+1 −3		crates/search/src/project_search.rs
+22 −1		crates/sum_tree/src/sum_tree.rs
+27 −3		crates/task/src/task_template.rs
+82 −92		crates/tasks_ui/src/lib.rs
+95 −11		crates/terminal/src/terminal.rs
+5 −0		crates/terminal/src/terminal_settings.rs
+1 −0		crates/terminal_view/Cargo.toml
+13 −5		crates/terminal_view/src/terminal_panel.rs
+36 −1		crates/time_format/src/time_format.rs
+2 −0		crates/ui/src/styles/color.rs
+1 −1		crates/vim/src/normal/search.rs
+5 −1		crates/workspace/src/pane.rs
+24 −1		crates/workspace/src/persistence.rs
+1 −0		crates/workspace/src/persistence/model.rs
+75 −15		crates/workspace/src/workspace.rs
+18 −0		crates/workspace/src/workspace_settings.rs
+2 −3		crates/zed/src/main.rs
+1 −1		crates/zed/src/zed/app_menus.rs
+126 −1		docs/src/configuring_zed.md
+1 −1		extensions/clojure/Cargo.toml
+1 −1		extensions/clojure/extension.toml
+4 −5		extensions/clojure/src/clojure.rs
+1 −1		extensions/csharp/Cargo.toml
+1 −1		extensions/csharp/extension.toml
+4 −5		extensions/csharp/src/csharp.rs
+2 −2		extensions/dart/extension.toml
+1 −1		extensions/gleam/Cargo.toml
+1 −1		extensions/gleam/extension.toml
+4 −5		extensions/gleam/src/gleam.rs
+1 −1		extensions/lua/Cargo.toml
+2 −2		extensions/lua/extension.toml
+5 −6		extensions/lua/src/lua.rs
+1 −1		extensions/terraform/Cargo.toml
+1 −1		extensions/terraform/extension.toml
+4 −5		extensions/terraform/src/terraform.rs
+1 −1		extensions/zig/Cargo.toml
+1 −1		extensions/zig/extension.toml
+28 −12		extensions/zig/src/zig.rs
+1 −3		script/bundle-mac