Remove duplicated code for unchanged parts of different extension API versions (#10218)

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>

crates/extension_api/src/extension_api.rs

@@ -13,11 +13,17 @@ pub use serde_json;
 // We explicitly enumerate the symbols we want to re-export, as there are some
 // that we may want to shadow to provide a cleaner Rust API.
 pub use wit::{
-    current_platform, download_file, latest_github_release, make_file_executable, node_binary_path,
-    npm_install_package, npm_package_installed_version, npm_package_latest_version, Architecture,
+    download_file, make_file_executable,
+    zed::extension::github::{
+        latest_github_release, GithubRelease, GithubReleaseAsset, GithubReleaseOptions,
+    },
+    zed::extension::nodejs::{
+        node_binary_path, npm_install_package, npm_package_installed_version,
+        npm_package_latest_version,
+    },
+    zed::extension::platform::{current_platform, Architecture, Os},
     CodeLabel, CodeLabelSpan, CodeLabelSpanLiteral, Command, DownloadedFileType, EnvVars,
-    GithubRelease, GithubReleaseAsset, GithubReleaseOptions, LanguageServerInstallationStatus, Os,
-    Range, Worktree,
+    LanguageServerInstallationStatus, Range, Worktree,
 };
 
 // Undocumented WIT re-exports.

crates/extension_api/src/settings.rs

@@ -1,5 +1,5 @@
 #[path = "../wit/since_v0.0.6/settings.rs"]
-pub mod types;
+mod types;
 
 use crate::{wit, Result, SettingsLocation, Worktree};
 use serde_json;

crates/extension_api/wit/since_v0.0.1/extension.wit

@@ -1,35 +1,11 @@
 package zed:extension;
 
 world extension {
+    use github.{github-release, github-release-options};
+    use platform.{os, architecture};
+
     export init-extension: func();
 
-    record github-release {
-        version: string,
-        assets: list<github-release-asset>,
-    }
-
-    record github-release-asset {
-        name: string,
-        download-url: string,
-    }
-
-    record github-release-options {
-        require-assets: bool,
-        pre-release: bool,
-    }
-
-    enum os {
-        mac,
-        linux,
-        windows,
-    }
-
-    enum architecture {
-        aarch64,
-        x86,
-        x8664,
-    }
-
     enum downloaded-file-type {
         gzip,
         gzip-tar,

crates/extension_api/wit/since_v0.0.1/github.wit

@@ -0,0 +1,28 @@
+interface github {
+    /// A GitHub release.
+    record github-release {
+        /// The version of the release.
+        version: string,
+        /// The list of assets attached to the release.
+        assets: list<github-release-asset>,
+    }
+
+    /// An asset from a GitHub release.
+    record github-release-asset {
+        /// The name of the asset.
+        name: string,
+        /// The download URL for the asset.
+        download-url: string,
+    }
+
+    /// The options used to filter down GitHub releases.
+    record github-release-options {
+        /// Whether releases without assets should be included.
+        require-assets: bool,
+        /// Whether pre-releases should be included.
+        pre-release: bool,
+    }
+
+    /// Returns the latest release for the given GitHub repository.
+    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
+}

crates/extension_api/wit/since_v0.0.1/platform.wit

@@ -0,0 +1,24 @@
+interface platform {
+    /// An operating system.
+    enum os {
+        /// macOS.
+        mac,
+        /// Linux.
+        linux,
+        /// Windows.
+        windows,
+    }
+
+    /// A platform architecture.
+    enum architecture {
+        /// AArch64 (e.g., Apple Silicon).
+        aarch64,
+        /// x86.
+        x86,
+        /// x86-64.
+        x8664,
+    }
+
+    /// Gets the current operating system and architecture.
+    current-platform: func() -> tuple<os, architecture>;
+}

crates/extension_api/wit/since_v0.0.4/extension.wit

@@ -1,35 +1,11 @@
 package zed:extension;
 
 world extension {
+    use github.{github-release, github-release-options};
+    use platform.{os, architecture};
+
     export init-extension: func();
 
-    record github-release {
-        version: string,
-        assets: list<github-release-asset>,
-    }
-
-    record github-release-asset {
-        name: string,
-        download-url: string,
-    }
-
-    record github-release-options {
-        require-assets: bool,
-        pre-release: bool,
-    }
-
-    enum os {
-        mac,
-        linux,
-        windows,
-    }
-
-    enum architecture {
-        aarch64,
-        x86,
-        x8664,
-    }
-
     enum downloaded-file-type {
         gzip,
         gzip-tar,

crates/extension_api/wit/since_v0.0.4/github.wit

@@ -0,0 +1,28 @@
+interface github {
+    /// A GitHub release.
+    record github-release {
+        /// The version of the release.
+        version: string,
+        /// The list of assets attached to the release.
+        assets: list<github-release-asset>,
+    }
+
+    /// An asset from a GitHub release.
+    record github-release-asset {
+        /// The name of the asset.
+        name: string,
+        /// The download URL for the asset.
+        download-url: string,
+    }
+
+    /// The options used to filter down GitHub releases.
+    record github-release-options {
+        /// Whether releases without assets should be included.
+        require-assets: bool,
+        /// Whether pre-releases should be included.
+        pre-release: bool,
+    }
+
+    /// Returns the latest release for the given GitHub repository.
+    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
+}

crates/extension_api/wit/since_v0.0.4/platform.wit

@@ -0,0 +1,24 @@
+interface platform {
+    /// An operating system.
+    enum os {
+        /// macOS.
+        mac,
+        /// Linux.
+        linux,
+        /// Windows.
+        windows,
+    }
+
+    /// A platform architecture.
+    enum architecture {
+        /// AArch64 (e.g., Apple Silicon).
+        aarch64,
+        /// x86.
+        x86,
+        /// x86-64.
+        x8664,
+    }
+
+    /// Gets the current operating system and architecture.
+    current-platform: func() -> tuple<os, architecture>;
+}

crates/extension_api/wit/since_v0.0.6/extension.wit

@@ -1,57 +1,15 @@
 package zed:extension;
 
 world extension {
-    import lsp;
+    import github;
+    import platform;
+    import nodejs;
 
     use lsp.{completion, symbol};
 
     /// Initializes the extension.
     export init-extension: func();
 
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
     /// The type of a downloaded file.
     enum downloaded-file-type {
         /// A gzipped file (`.gz`).
@@ -76,9 +34,6 @@ world extension {
         failed(string),
     }
 
-    /// Returns operating system and architecture for the current platform.
-    import current-platform: func() -> tuple<os, architecture>;
-
     record settings-location {
         worktree-id: u64,
         path: string,
@@ -86,21 +41,6 @@ world extension {
 
     import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
 
-    /// Returns the path to the Node binary used by Zed.
-    import node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    import npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    import npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    import npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-
-    /// Returns the latest release for the given GitHub repository.
-    import latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
     /// Downloads a file from the given URL and saves it to the given path within the extension's
     /// working directory.
     ///

crates/extension_api/wit/since_v0.0.6/github.wit

@@ -0,0 +1,28 @@
+interface github {
+    /// A GitHub release.
+    record github-release {
+        /// The version of the release.
+        version: string,
+        /// The list of assets attached to the release.
+        assets: list<github-release-asset>,
+    }
+
+    /// An asset from a GitHub release.
+    record github-release-asset {
+        /// The name of the asset.
+        name: string,
+        /// The download URL for the asset.
+        download-url: string,
+    }
+
+    /// The options used to filter down GitHub releases.
+    record github-release-options {
+        /// Whether releases without assets should be included.
+        require-assets: bool,
+        /// Whether pre-releases should be included.
+        pre-release: bool,
+    }
+
+    /// Returns the latest release for the given GitHub repository.
+    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
+}

crates/extension_api/wit/since_v0.0.6/nodejs.wit

@@ -0,0 +1,13 @@
+interface nodejs {
+    /// Returns the path to the Node binary used by Zed.
+    node-binary-path: func() -> result<string, string>;
+
+    /// Returns the latest version of the given NPM package.
+    npm-package-latest-version: func(package-name: string) -> result<string, string>;
+
+    /// Returns the installed version of the given NPM package, if it exists.
+    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
+
+    /// Installs the specified NPM package.
+    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
+}

crates/extension_api/wit/since_v0.0.6/platform.wit

@@ -0,0 +1,24 @@
+interface platform {
+    /// An operating system.
+    enum os {
+        /// macOS.
+        mac,
+        /// Linux.
+        linux,
+        /// Windows.
+        windows,
+    }
+
+    /// A platform architecture.
+    enum architecture {
+        /// AArch64 (e.g., Apple Silicon).
+        aarch64,
+        /// x86.
+        x86,
+        /// x86-64.
+        x8664,
+    }
+
+    /// Gets the current operating system and architecture.
+    current-platform: func() -> tuple<os, architecture>;
+}