Merge branch 'main' of https://github.com/zed-industries/extensions

.github/ISSUE_TEMPLATE/2_other_request.yml

@@ -0,0 +1,16 @@
+name: Other Request
+description: Request a non-theme, non-language extension
+labels: ["needs 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

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.

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"
@@ -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"
@@ -145,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"
@@ -173,7 +183,7 @@ version = "0.1.1"
 
 [java]
 submodule = "extensions/java"
-version = "0.0.3"
+version = "0.0.4"
 
 [kiselevka]
 submodule = "extensions/kiselevka"
@@ -199,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"
@@ -253,7 +268,7 @@ version = "0.0.2"
 
 [navi]
 submodule = "extensions/navi"
-version = "0.1.0"
+version = "0.2.0"
 
 [neosolarized]
 submodule = "extensions/neosolarized"
@@ -287,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"
@@ -318,7 +338,7 @@ version = "0.1.0"
 [php]
 submodule = "extensions/zed"
 path = "extensions/php"
-version = "0.0.1"
+version = "0.0.2"
 
 [pkl]
 submodule = "extensions/pkl"
@@ -342,10 +362,20 @@ 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"
 
+[scheme]
+submodule = "extensions/zed"
+path = "extensions/scheme"
+version = "0.0.1"
+
 [siri]
 submodule = "extensions/siri"
 version = "0.0.3"
@@ -399,9 +429,14 @@ 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.4"
+version = "0.2.5"
 
 [tmux]
 submodule = "extensions/tmux"
@@ -414,7 +449,7 @@ version = "0.0.2"
 [toml]
 submodule = "extensions/zed"
 path = "extensions/toml"
-version = "0.0.2"
+version = "0.1.0"
 
 [typst]
 submodule = "extensions/typst"
@@ -449,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"
@@ -472,4 +512,4 @@ version = "0.0.1"
 [zig]
 submodule = "extensions/zed"
 path = "extensions/zig"
-version = "0.0.1"
+version = "0.1.0"

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;
+  }
+}

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",
     [