From 19b8c6961a5153f54e35886e35c958cf56ab1c1b Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Fri, 12 Apr 2024 19:39:25 +0800
Subject: [PATCH 01/19] Update navi to 0.2.0 (#481)

Release notes:

https://github.com/navi-language/zed-navi/releases/tag/v0.2.0
---
 extensions.toml | 2 +-
 extensions/navi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index e6994ebbaf..2e0579804a 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -253,7 +253,7 @@ version = "0.0.2"
 
 [navi]
 submodule = "extensions/navi"
-version = "0.1.0"
+version = "0.2.0"
 
 [neosolarized]
 submodule = "extensions/neosolarized"
diff --git a/extensions/navi b/extensions/navi
index 8d60aa19fd..2824b308b9 160000
--- a/extensions/navi
+++ b/extensions/navi
@@ -1 +1 @@
-Subproject commit 8d60aa19fdecb2071466c134873e8706f6d43255
+Subproject commit 2824b308b99ffc7e4e48760fea84835d8aa24cc2

From 6d47b011ced5d6e40d135b5501eb199cd5d9d367 Mon Sep 17 00:00:00 2001
From: Sai Gokula Krishnan <saigklkrishnan@gmail.com>
Date: Fri, 12 Apr 2024 17:16:50 +0530
Subject: [PATCH 02/19] Bump Dark Side to 0.2.5 (#477)

Fixed the modified colour to be more prominent.

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 extensions.toml          | 2 +-
 extensions/the-dark-side | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index 2e0579804a..fe2f2fbc3c 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -401,7 +401,7 @@ version = "0.0.2"
 
 [the-dark-side]
 submodule = "extensions/the-dark-side"
-version = "0.2.4"
+version = "0.2.5"
 
 [tmux]
 submodule = "extensions/tmux"
diff --git a/extensions/the-dark-side b/extensions/the-dark-side
index c868921cb6..206e489237 160000
--- a/extensions/the-dark-side
+++ b/extensions/the-dark-side
@@ -1 +1 @@
-Subproject commit c868921cb600487c0d6997f52bd94c1a5839ff2f
+Subproject commit 206e489237a4f00bd1f53c966fe75b4b86596785

From 1dc809ece0575df952833461686f62bba0170c3e Mon Sep 17 00:00:00 2001
From: "L.Longheval"
 <50520928+louisnicolas-longheval-vinci@users.noreply.github.com>
Date: Fri, 12 Apr 2024 14:11:01 +0200
Subject: [PATCH 03/19] Update Java to 0.0.4 (#483)

---
 extensions.toml | 2 +-
 extensions/java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index fe2f2fbc3c..2eb9dcdc66 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -173,7 +173,7 @@ version = "0.1.1"
 
 [java]
 submodule = "extensions/java"
-version = "0.0.3"
+version = "0.0.4"
 
 [kiselevka]
 submodule = "extensions/kiselevka"
diff --git a/extensions/java b/extensions/java
index cafa9e64c1..1f3b10deed 160000
--- a/extensions/java
+++ b/extensions/java
@@ -1 +1 @@
-Subproject commit cafa9e64c1cec860ba17eb13e8554fe6d537b7b7
+Subproject commit 1f3b10deed46e780bcaf9456b40b4ba655dae290

From f408eafa0984c43320456725e3b8426351cc23d2 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 12 Apr 2024 11:22:22 -0400
Subject: [PATCH 04/19] Add issue template for requesting non-theme,
 non-language extensions

---
 .github/ISSUE_TEMPLATE/2_other_request.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/2_other_request.yml

diff --git a/.github/ISSUE_TEMPLATE/2_other_request.yml b/.github/ISSUE_TEMPLATE/2_other_request.yml
new file mode 100644
index 0000000000..00f6702531
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_other_request.yml
@@ -0,0 +1,16 @@
+name: Other Request
+description: Request a non-theme, non-language extension
+labels: ["awaiting infrastructure"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Check for existing issues
+      description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
+      options:
+        - label: Completed
+          required: true
+  - type: textarea
+    attributes:
+      label: Misc notes
+    validations:
+      required: false

From 6a44d7059f207a144496b13d87454a7dfe01313b Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 12 Apr 2024 11:47:18 -0400
Subject: [PATCH 05/19] Update template to use new label name

---
 .github/ISSUE_TEMPLATE/2_other_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/2_other_request.yml b/.github/ISSUE_TEMPLATE/2_other_request.yml
index 00f6702531..2fa3556b30 100644
--- a/.github/ISSUE_TEMPLATE/2_other_request.yml
+++ b/.github/ISSUE_TEMPLATE/2_other_request.yml
@@ -1,6 +1,6 @@
 name: Other Request
 description: Request a non-theme, non-language extension
-labels: ["awaiting infrastructure"]
+labels: ["needs infrastructure"]
 body:
   - type: checkboxes
     attributes:

From fb1d6050d6a7bc02c55cf16a141b484140d09e93 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Sat, 13 Apr 2024 00:40:47 +0800
Subject: [PATCH 06/19] Update csv to 0.0.2 (#485)

Release notes:

https://github.com/huacnlee/zed-csv/releases/tag/v0.0.2
---
 extensions.toml | 2 +-
 extensions/csv  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index 2eb9dcdc66..efa9471e9c 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -59,7 +59,7 @@ version = "0.0.1"
 
 [csv]
 submodule = "extensions/csv"
-version = "0.0.1"
+version = "0.0.2"
 
 [cue]
 submodule = "extensions/cue"
diff --git a/extensions/csv b/extensions/csv
index 481a844bcd..987a00e9eb 160000
--- a/extensions/csv
+++ b/extensions/csv
@@ -1 +1 @@
-Subproject commit 481a844bcdb8120b8e4082b42eac1e706a80b02a
+Subproject commit 987a00e9eb23477af9f2d66ff383bd950826fdeb

From 943d7e87bf88901f994c47f8fc8d5e460500674b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 12:44:48 -0400
Subject: [PATCH 07/19] Update PHP to v0.0.2 (#501)

This PR updates the PHP extension to v0.0.2.

See https://github.com/zed-industries/zed/pull/10480 for the changes in
this version.
---
 extensions.toml | 2 +-
 extensions/zed  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index efa9471e9c..1f79c6deec 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -318,7 +318,7 @@ version = "0.1.0"
 [php]
 submodule = "extensions/zed"
 path = "extensions/php"
-version = "0.0.1"
+version = "0.0.2"
 
 [pkl]
 submodule = "extensions/pkl"
diff --git a/extensions/zed b/extensions/zed
index 2d21f6debf..65c9e7d3d1 160000
--- a/extensions/zed
+++ b/extensions/zed
@@ -1 +1 @@
-Subproject commit 2d21f6debf669a72587732ed8725f5bc43c4a634
+Subproject commit 65c9e7d3d1d10d1619c9ca47f55fc338820d3500

From e4931c927271b54664883bbc9b09b79ebc46f0f7 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 13:00:49 -0400
Subject: [PATCH 08/19] Update Zig to v0.1.0 (#502)

This PR updates the Zig extension to v0.1.0.

See https://github.com/zed-industries/zed/pull/10481 for the changes in
this version.
---
 extensions.toml | 2 +-
 extensions/zed  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index 1f79c6deec..0f9793a409 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -472,4 +472,4 @@ version = "0.0.1"
 [zig]
 submodule = "extensions/zed"
 path = "extensions/zig"
-version = "0.0.1"
+version = "0.1.0"
diff --git a/extensions/zed b/extensions/zed
index 65c9e7d3d1..e0e1103228 160000
--- a/extensions/zed
+++ b/extensions/zed
@@ -1 +1 @@
-Subproject commit 65c9e7d3d1d10d1619c9ca47f55fc338820d3500
+Subproject commit e0e1103228af1ed688ca868f66a695d251569cf7

From 30284a76bbd1788cb886c4e86e77c69639ebd8f0 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 13:06:32 -0400
Subject: [PATCH 09/19] Update TOML to v0.1.0 (#505)

This PR updates the TOML extension to v0.1.0.

See https://github.com/zed-industries/zed/pull/10482 for the changes in
this version.
---
 extensions.toml | 2 +-
 extensions/zed  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions.toml b/extensions.toml
index 0f9793a409..95f55debf2 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -414,7 +414,7 @@ version = "0.0.2"
 [toml]
 submodule = "extensions/zed"
 path = "extensions/toml"
-version = "0.0.2"
+version = "0.1.0"
 
 [typst]
 submodule = "extensions/typst"
diff --git a/extensions/zed b/extensions/zed
index e0e1103228..4b40e83b8b 160000
--- a/extensions/zed
+++ b/extensions/zed
@@ -1 +1 @@
-Subproject commit e0e1103228af1ed688ca868f66a695d251569cf7
+Subproject commit 4b40e83b8b3cf8e18b422d2ad22a2631c16a7083

From 212a08811dfda1b1ca82e674a6fb00992a6b0b6f Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 12 Apr 2024 13:21:15 -0400
Subject: [PATCH 10/19] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2e4e243b3b..e0179f0297 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,5 @@ Looking for extension ideas? Check out:
 
 - [Top theme requests](https://github.com/zed-industries/extensions/issues?q=is%3Aissue+is%3Aopen+label%3Atheme+sort%3Areactions-%2B1-desc)
 - [Top language requests](https://github.com/zed-industries/extensions/issues?q=is%3Aissue+is%3Aopen+label%3Alanguage+sort%3Areactions-%2B1-desc)
+
+If an issue requesting an extension is tagged with the `needs infrastructure` label, it indicates that the extension cannot currently be developed due to the absence of necessary system infrastructure.

From 9b0b8223388e9325d8ea5dffc7987e94c98c2e37 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:25:00 -0400
Subject: [PATCH 11/19] Add Elm extension (#527)

This PR adds the Elm extension.

Elm support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10432.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index 95f55debf2..f5e2e92017 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -86,6 +86,11 @@ version = "0.7.3"
 submodule = "extensions/elisp"
 version = "0.0.4"
 
+[elm]
+submodule = "extensions/zed"
+path = "extensions/elm"
+version = "0.0.1"
+
 [ember]
 submodule = "extensions/ember"
 version = "0.0.1"

From f55868a867b0a77fcc5d38ddf7a35a772ff33788 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:28:03 -0400
Subject: [PATCH 12/19] Add GLSL extension (#528)

This PR adds the GLSL extension.

GLSL support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10433.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index f5e2e92017..a3301d3afe 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -150,6 +150,11 @@ submodule = "extensions/zed"
 path = "extensions/gleam"
 version = "0.1.0"
 
+[glsl]
+submodule = "extensions/zed"
+path = "extensions/glsl"
+version = "0.0.1"
+
 [graphene]
 submodule = "extensions/graphene"
 version = "0.1.0"

From 84f0e95bf9a5a21a332e325fbebb342d6cede9b1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:35:13 -0400
Subject: [PATCH 13/19] Add Scheme extension (#529)

This PR adds the Scheme extension.

Scheme support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10442.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index a3301d3afe..aeb21a2ea7 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -356,6 +356,11 @@ version = "0.0.1"
 submodule = "extensions/scala"
 version = "0.0.1"
 
+[scheme]
+submodule = "extensions/zed"
+path = "extensions/scheme"
+version = "0.0.1"
+
 [siri]
 submodule = "extensions/siri"
 version = "0.0.3"

From eb92d23995b31cc73990fb234919183b41c7aa25 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:37:48 -0400
Subject: [PATCH 14/19] Add Racket extension (#530)

This PR adds the Racket extension.

Racket support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10442.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index aeb21a2ea7..0788e23146 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -352,6 +352,11 @@ version = "0.0.1"
 submodule = "extensions/r"
 version = "0.0.1"
 
+[racket]
+submodule = "extensions/zed"
+path = "extensions/racket"
+version = "0.0.1"
+
 [scala]
 submodule = "extensions/scala"
 version = "0.0.1"

From 6d49ba465f2442800e00f0a6bfdea2ebd007607f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:46:51 -0400
Subject: [PATCH 15/19] Add Lua extension (#531)

This PR adds the Lua extension.

Lua support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10437.
---
 extensions.toml | 5 +++++
 extensions/zed  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/extensions.toml b/extensions.toml
index 0788e23146..be2803a360 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -209,6 +209,11 @@ version = "0.0.3"
 submodule = "extensions/lox"
 version = "0.0.1"
 
+[lua]
+submodule = "extensions/zed"
+path = "extensions/lua"
+version = "0.0.1"
+
 [macos-classic]
 submodule = "extensions/macos-classic"
 version = "0.0.7"
diff --git a/extensions/zed b/extensions/zed
index 4b40e83b8b..ad8dd1771a 160000
--- a/extensions/zed
+++ b/extensions/zed
@@ -1 +1 @@
-Subproject commit 4b40e83b8b3cf8e18b422d2ad22a2631c16a7083
+Subproject commit ad8dd1771a2cde02f8c85a38ea5c7d6373b0c697

From 3136b3c2505c11228a27e962c685250dd930bfdc Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 15:55:57 -0400
Subject: [PATCH 16/19] Add OCaml extension (#532)

This PR adds the OCaml extension.

OCaml support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10450.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index be2803a360..6138040ce6 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -302,6 +302,11 @@ version = "1.0.0"
 submodule = "extensions/nu"
 version = "0.0.1"
 
+[ocaml]
+submodule = "extensions/zed"
+path = "extensions/ocaml"
+version = "0.0.1"
+
 [oceanic-next]
 submodule = "extensions/oceanic-next"
 version = "0.1.0"

From aeb91aaf48cb29bbf36e0e28b50d47ae7b75ef77 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 16:02:08 -0400
Subject: [PATCH 17/19] Add Terraform extension (#533)

This PR adds the Terraform extension.

Terraform support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10479.

Note that the Terraform extension requires Zed v0.132.x (which will be
released this coming Wednesday) in order for some problematic code
action kinds to be filtered out from the language server.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index 6138040ce6..969db4a873 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -429,6 +429,11 @@ version = "0.0.1"
 submodule = "extensions/templ"
 version = "0.0.2"
 
+[terraform]
+submodule = "extensions/zed"
+path = "extensions/terraform"
+version = "0.0.1"
+
 [the-dark-side]
 submodule = "extensions/the-dark-side"
 version = "0.2.5"

From 8d53ac1faa92b3bdbf4adebc0e9d26f52f028ad6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 16:10:21 -0400
Subject: [PATCH 18/19] Add Vue extension (#534)

This PR adds the Vue extension.

Vue support was extracted from Zed in
https://github.com/zed-industries/zed/pull/10486.

Note that the Terraform extension requires Zed v0.132.x (which will be
released this coming Wednesday) in order for some problematic code
action kinds to be filtered out from the language server.
---
 extensions.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extensions.toml b/extensions.toml
index 969db4a873..40b6f6d8c3 100644
--- a/extensions.toml
+++ b/extensions.toml
@@ -484,6 +484,11 @@ version = "0.0.1"
 submodule = "extensions/vscode-monokai-charcoal"
 version = "0.0.2"
 
+[vue]
+submodule = "extensions/zed"
+path = "extensions/vue"
+version = "0.0.1"
+
 [wgsl]
 submodule = "extensions/wgsl"
 version = "0.0.1"

From 7457f8742e62d4283739e9590cd5945f76c52651 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 12 Apr 2024 17:10:56 -0400
Subject: [PATCH 19/19] Warn when using `extension.json` (#535)

This PR adds a warning when an `extension.json` manifest is detected.

`extension.toml` should be preferred instead.
---
 src/lib/fs.js             | 22 ++++++++++++++++++++++
 src/package-extensions.js |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lib/fs.js b/src/lib/fs.js
index 7af1de903e..9c0020f845 100644
--- a/src/lib/fs.js
+++ b/src/lib/fs.js
@@ -14,3 +14,25 @@ export async function readTomlFile(path) {
     throw new Error(`Failed to parse TOML file '${path}': ${err}`);
   }
 }
+
+/**
+ * @param {string} path
+ * @returns {Promise<boolean>}
+ */
+export async function fileExists(path) {
+  try {
+    const stat = await fs.stat(path);
+    return stat.isFile();
+  } catch (err) {
+    if (
+      err &&
+      typeof err === "object" &&
+      "code" in err &&
+      err.code === "ENOENT"
+    ) {
+      return false;
+    }
+
+    throw err;
+  }
+}
diff --git a/src/package-extensions.js b/src/package-extensions.js
index 9d60c6f5e2..a6edd047e3 100644
--- a/src/package-extensions.js
+++ b/src/package-extensions.js
@@ -3,7 +3,7 @@ import toml from "@iarna/toml";
 import assert from "node:assert";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { readTomlFile } from "./lib/fs.js";
+import { fileExists, readTomlFile } from "./lib/fs.js";
 import {
   checkoutGitSubmodule,
   readGitmodules,
@@ -143,6 +143,12 @@ async function packageExtension(
   const SCRATCH_DIR = "./scratch";
   await fs.mkdir(SCRATCH_DIR, { recursive: true });
 
+  if (await fileExists(path.join(extensionPath, "extension.json"))) {
+    console.warn(
+      "The `extension.json` manifest format has been superseded by `extension.toml`",
+    );
+  }
+
   const zedExtensionOutput = await exec(
     "./zed-extension",
     [