Skip to content

Commit

Permalink
Merge branch 'main' into pr/1228
Browse files Browse the repository at this point in the history
  • Loading branch information
maxdeviant committed Aug 13, 2024
2 parents fbbc003 + 004f902 commit d2f5726
Show file tree
Hide file tree
Showing 25 changed files with 59 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
cancel-in-progress: true

env:
ZED_EXTENSION_CLI_SHA: 5e44f5fa448f4405af38993794cf5736b822e265
ZED_EXTENSION_CLI_SHA: 423c7b999a07d5f5ab82c58ac99f6b0684be50d0

jobs:
package:
Expand Down
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
path = extensions/awk
url = https://github.com/dangh/zed-awk.git

[submodule "extensions/aylin-theme"]
path = extensions/aylin-theme
url = https://github.com/biaqat/aylin-theme-zed.git

[submodule "extensions/base16"]
path = extensions/base16
url = https://github.com/bswinnerton/base16-zed.git
Expand Down Expand Up @@ -114,6 +118,10 @@
path = extensions/brainfuck
url = https://github.com/JosephTLyons/zed-brainfuck.git

[submodule "extensions/c3"]
path = extensions/c3
url = https://github.com/AineeJames/c3-zed.git

[submodule "extensions/cadence"]
path = extensions/cadence
url = https://github.com/janezpodhostnik/cadence.zed.git
Expand Down Expand Up @@ -654,6 +662,10 @@
path = extensions/penumbra
url = https://github.com/jbisits/penumbra-zed.git

[submodule "extensions/perm"]
path = extensions/perm
url = https://github.com/theoriginalstove/perm.git

[submodule "extensions/pest"]
path = extensions/pest
url = https://github.com/pest-parser/zed-pest.git
Expand Down
2 changes: 1 addition & 1 deletion AUTHORING_EXTENSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
zed_extension_api = "0.0.4"
zed_extension_api = "0.0.6"
```

Make sure to use the latest version of the `zed_extension_api` available on crates.io.
Expand Down
36 changes: 24 additions & 12 deletions extensions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.1.1"

[ada]
submodule = "extensions/ada"
version = "0.1.0"
version = "0.2.0"

[adwaita-pastel]
submodule = "extensions/adwaita-pastel"
Expand Down Expand Up @@ -64,6 +64,10 @@ version = "0.1.0"
submodule = "extensions/awk"
version = "0.0.1"

[aylin-theme]
submodule = "extensions/aylin-theme"
version = "0.5.0"

[base16]
submodule = "extensions/base16"
version = "0.1.0"
Expand Down Expand Up @@ -120,6 +124,10 @@ version = "0.0.1"
submodule = "extensions/brainfuck"
version = "0.0.3"

[c3]
submodule = "extensions/c3"
version = "0.0.1"

[cadence]
submodule = "extensions/cadence"
version = "0.0.1"
Expand Down Expand Up @@ -298,7 +306,7 @@ version = "0.0.2"

[exquisite]
submodule = "extensions/exquisite"
version = "0.1.1"
version = "0.1.3"

[fish]
submodule = "extensions/fish"
Expand Down Expand Up @@ -404,7 +412,7 @@ version = "0.0.4"

[gruber-flavors]
submodule = "extensions/gruber-flavors"
version = "0.5.0"
version = "0.6.0"

[gruvbox-material]
submodule = "extensions/gruvbox-material"
Expand Down Expand Up @@ -502,7 +510,7 @@ version = "0.0.1"

[lilypond]
submodule = "extensions/lilypond"
version = "0.0.2"
version = "0.0.3"

[liquid]
submodule = "extensions/liquid"
Expand Down Expand Up @@ -571,7 +579,7 @@ version = "0.0.1"

[meson]
submodule = "extensions/meson"
version = "0.1.0"
version = "0.1.1"

[min-theme]
submodule = "extensions/min-theme"
Expand All @@ -595,7 +603,7 @@ version = "0.1.2"

[msun-dark]
submodule = "extensions/msun-dark"
version = "0.0.5"
version = "0.0.6"

[muted]
submodule = "extensions/muted"
Expand Down Expand Up @@ -730,6 +738,10 @@ version = "1.0.1"
submodule = "extensions/penumbra"
version = "0.0.1"

[perm]
submodule = "extensions/perm"
version = "0.0.4"

[pest]
submodule = "extensions/pest"
version = "0.1.0"
Expand Down Expand Up @@ -757,7 +769,7 @@ version = "0.0.4"

[polar-theme]
submodule = "extensions/polar-theme"
version = "0.5.0"
version = "0.6.0"

[prisma]
submodule = "extensions/zed"
Expand All @@ -779,7 +791,7 @@ version = "0.0.1"

[quiet-light-theme]
submodule = "extensions/quiet-light-theme"
version = "0.5.0"
version = "0.6.0"

[quill]
submodule = "extensions/quill"
Expand Down Expand Up @@ -825,7 +837,7 @@ version = "0.0.1"
[ruby]
submodule = "extensions/zed"
path = "extensions/ruby"
version = "0.0.8"
version = "0.1.0"

[ruff]
submodule = "extensions/zed"
Expand Down Expand Up @@ -970,7 +982,7 @@ version = "0.0.1"

[tokyo-night]
submodule = "extensions/tokyo-night"
version = "0.2.0"
version = "0.3.0"

[toml]
submodule = "extensions/zed"
Expand All @@ -979,7 +991,7 @@ version = "0.1.1"

[tomorrow-theme]
submodule = "extensions/tomorrow-theme"
version = "0.6.0"
version = "0.7.0"

[tsar]
submodule = "extensions/tsar"
Expand All @@ -1004,7 +1016,7 @@ version = "0.0.1"

[ultimate-dark-neo]
submodule = "extensions/ultimate-dark-neo"
version = "0.0.4"
version = "0.0.5"

[unison]
submodule = "extensions/unison"
Expand Down
2 changes: 1 addition & 1 deletion extensions/ada
1 change: 1 addition & 0 deletions extensions/aylin-theme
Submodule aylin-theme added at dfb0a1
1 change: 1 addition & 0 deletions extensions/c3
Submodule c3 added at c37793
2 changes: 1 addition & 1 deletion extensions/cyan-light-theme
2 changes: 1 addition & 1 deletion extensions/ember-theme
2 changes: 1 addition & 1 deletion extensions/exquisite
2 changes: 1 addition & 1 deletion extensions/meson
Submodule meson updated 5 files
+1 −1 Cargo.toml
+1 −1 extension.toml
+98 −0 flake.lock
+19 −0 flake.nix
+1 −0 src/meson.rs
2 changes: 1 addition & 1 deletion extensions/msun-dark
2 changes: 1 addition & 1 deletion extensions/panda-theme
1 change: 1 addition & 0 deletions extensions/perm
Submodule perm added at 0022b2
2 changes: 1 addition & 1 deletion extensions/polar-theme
2 changes: 1 addition & 1 deletion extensions/quiet-light-theme
2 changes: 1 addition & 1 deletion extensions/tokyo-night
2 changes: 1 addition & 1 deletion extensions/ultimate-dark-neo
2 changes: 1 addition & 1 deletion extensions/zed

0 comments on commit d2f5726

Please sign in to comment.