Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
git_hosting_providers: Add Tangled support (#63051)
Marshall Bowersfd82517a115d
diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.tomlindex 6e5739081ee..7ecb8fa18e8 100644--- a/crates/git/Cargo.toml+++ b/crates/git/Cargo.toml@@ -12,7 +12,7 @@ workspace = truepath = "src/git.rs"[features]-test-support = ["rand"]+test-support = ["rand", "gpui/test-support"][dependencies]anyhow.workspace = truediff --git a/crates/git_hosting_providers/src/git_hosting_providers.rs b/crates/git_hosting_providers/src/git_hosting_providers.rsindex d2e61f4e2d6..1c522be43cf 100644--- a/crates/git_hosting_providers/src/git_hosting_providers.rs+++ b/crates/git_hosting_providers/src/git_hosting_providers.rs@@ -28,6 +28,7 @@ pub fn init(cx: &mut App) {provider_registry.register_hosting_provider(Arc::new(Github::public_instance()));provider_registry.register_hosting_provider(Arc::new(Gitlab::public_instance()));provider_registry.register_hosting_provider(Arc::new(SourceHut::public_instance()));+ provider_registry.register_hosting_provider(Arc::new(Tangled::public_instance()));}/// Registers additional Git hosting providers.diff --git a/crates/git_hosting_providers/src/providers.rs b/crates/git_hosting_providers/src/providers.rsindex 071af3f5685..4c9929afdf2 100644--- a/crates/git_hosting_providers/src/providers.rs+++ b/crates/git_hosting_providers/src/providers.rs@@ -7,6 +7,7 @@ mod gitee;mod github;mod gitlab;mod sourcehut;+mod tangled;pub use azure::*;pub use bitbucket::*;@@ -17,3 +18,4 @@ pub use gitee::*;pub use github::*;pub use gitlab::*;pub use sourcehut::*;+pub use tangled::*;diff --git a/crates/git_hosting_providers/src/providers/tangled.rs b/crates/git_hosting_providers/src/providers/tangled.rsnew file mode 100644index 00000000000..30df80fca78--- /dev/null+++ b/crates/git_hosting_providers/src/providers/tangled.rs@@ -0,0 +1,278 @@+use std::str::FromStr;++use git::{+ BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,+ RemoteUrl,+};+use url::Url;++pub struct Tangled {+ name: String,+ base_url: Url,+}++impl Tangled {+ pub fn new(name: &str, base_url: Url) -> Self {+ Self {+ name: name.to_string(),+ base_url,+ }+ }++ pub fn public_instance() -> Self {+ Self::new("Tangled", Url::parse("https://tangled.org").unwrap())+ }++ /// Joins the given path to the base URL.+ ///+ /// The path is rooted with a leading `/`, as Tangled owners may be AT+ /// Protocol DIDs (e.g., `did:plc:abc123`). Passing a path starting with+ /// `did:` to `Url::join` would otherwise be interpreted as an absolute URL+ /// with a `did:` scheme.+ fn join_path(&self, path: &str) -> Url {+ self.base_url().join(&format!("/{path}")).unwrap()+ }+}++impl GitHostingProvider for Tangled {+ fn name(&self) -> String {+ self.name.clone()+ }++ fn base_url(&self) -> Url {+ self.base_url.clone()+ }++ fn supports_avatars(&self) -> bool {+ false+ }++ fn format_line_number(&self, line: u32) -> String {+ format!("L{line}")+ }++ fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {+ format!("L{start_line}-{end_line}")+ }++ fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {+ let url = RemoteUrl::from_str(url).ok()?;++ let host = url.host_str()?;+ if host != self.base_url.host_str()? {+ return None;+ }++ let mut path_segments = url.path_segments()?;+ // The owner is either a handle (e.g., `user.tngl.sh`, sometimes+ // prefixed with `@` in web URLs) or an AT Protocol DID (e.g.,+ // `did:plc:abc123`).+ let owner = path_segments.next()?.trim_start_matches('@');+ let repo = path_segments.next()?.trim_end_matches(".git");++ Some(ParsedGitRemote {+ owner: owner.into(),+ repo: repo.into(),+ })+ }++ fn build_commit_permalink(+ &self,+ remote: &ParsedGitRemote,+ params: BuildCommitPermalinkParams,+ ) -> Url {+ let BuildCommitPermalinkParams { sha } = params;+ let ParsedGitRemote { owner, repo } = remote;++ self.join_path(&format!("{owner}/{repo}/commit/{sha}"))+ }++ fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {+ let ParsedGitRemote { owner, repo } = remote;+ let BuildPermalinkParams {+ sha,+ path,+ selection,+ } = params;++ let mut permalink = self.join_path(&format!("{owner}/{repo}/blob/{sha}/{path}"));+ permalink.set_fragment(+ selection+ .map(|selection| self.line_fragment(&selection))+ .as_deref(),+ );+ permalink+ }+}++#[cfg(test)]+mod tests {+ use git::repository::repo_path;+ use pretty_assertions::assert_eq;++ use super::*;++ #[test]+ fn test_parse_remote_url_given_ssh_url() {+ let parsed_remote = Tangled::public_instance()+ .parse_remote_url("[email protected]:user.tngl.sh/zed")+ .unwrap();++ assert_eq!(+ parsed_remote,+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ }+ );+ }++ #[test]+ fn test_parse_remote_url_given_ssh_url_with_did_owner() {+ let parsed_remote = Tangled::public_instance()+ .parse_remote_url("[email protected]:did:plc:j5hmlfdrwkvtxm7cjmu7j2is/core")+ .unwrap();++ assert_eq!(+ parsed_remote,+ ParsedGitRemote {+ owner: "did:plc:j5hmlfdrwkvtxm7cjmu7j2is".into(),+ repo: "core".into(),+ }+ );+ }++ #[test]+ fn test_parse_remote_url_given_https_url() {+ let parsed_remote = Tangled::public_instance()+ .parse_remote_url("https://tangled.org/user.tngl.sh/zed")+ .unwrap();++ assert_eq!(+ parsed_remote,+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ }+ );+ }++ #[test]+ fn test_parse_remote_url_given_https_url_with_at_prefixed_owner() {+ let parsed_remote = Tangled::public_instance()+ .parse_remote_url("https://tangled.org/@user.tngl.sh/zed")+ .unwrap();++ assert_eq!(+ parsed_remote,+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ }+ );+ }++ #[test]+ fn test_parse_remote_url_given_https_url_with_did_owner() {+ let parsed_remote = Tangled::public_instance()+ .parse_remote_url("https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is/core")+ .unwrap();++ assert_eq!(+ parsed_remote,+ ParsedGitRemote {+ owner: "did:plc:j5hmlfdrwkvtxm7cjmu7j2is".into(),+ repo: "core".into(),+ }+ );+ }++ #[test]+ fn test_build_tangled_commit_permalink() {+ let permalink = Tangled::public_instance().build_commit_permalink(+ &ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ },+ BuildCommitPermalinkParams {+ sha: "faa6f979be417239b2e070dbbf6392b909224e0b",+ },+ );++ let expected_url =+ "https://tangled.org/user.tngl.sh/zed/commit/faa6f979be417239b2e070dbbf6392b909224e0b";+ assert_eq!(permalink.to_string(), expected_url.to_string())+ }++ #[test]+ fn test_build_tangled_permalink() {+ let permalink = Tangled::public_instance().build_permalink(+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ },+ BuildPermalinkParams::new(+ "faa6f979be417239b2e070dbbf6392b909224e0b",+ &repo_path("crates/editor/src/git/permalink.rs"),+ None,+ ),+ );++ let expected_url = "https://tangled.org/user.tngl.sh/zed/blob/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs";+ assert_eq!(permalink.to_string(), expected_url.to_string())+ }++ #[test]+ fn test_build_tangled_permalink_with_did_owner() {+ let permalink = Tangled::public_instance().build_permalink(+ ParsedGitRemote {+ owner: "did:plc:j5hmlfdrwkvtxm7cjmu7j2is".into(),+ repo: "core".into(),+ },+ BuildPermalinkParams::new(+ "faa6f979be417239b2e070dbbf6392b909224e0b",+ &repo_path("crates/editor/src/git/permalink.rs"),+ None,+ ),+ );++ let expected_url = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is/core/blob/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs";+ assert_eq!(permalink.to_string(), expected_url.to_string())+ }++ #[test]+ fn test_build_tangled_permalink_with_single_line_selection() {+ let permalink = Tangled::public_instance().build_permalink(+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ },+ BuildPermalinkParams::new(+ "faa6f979be417239b2e070dbbf6392b909224e0b",+ &repo_path("crates/editor/src/git/permalink.rs"),+ Some(6..6),+ ),+ );++ let expected_url = "https://tangled.org/user.tngl.sh/zed/blob/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L7";+ assert_eq!(permalink.to_string(), expected_url.to_string())+ }++ #[test]+ fn test_build_tangled_permalink_with_multi_line_selection() {+ let permalink = Tangled::public_instance().build_permalink(+ ParsedGitRemote {+ owner: "user.tngl.sh".into(),+ repo: "zed".into(),+ },+ BuildPermalinkParams::new(+ "faa6f979be417239b2e070dbbf6392b909224e0b",+ &repo_path("crates/editor/src/git/permalink.rs"),+ Some(23..47),+ ),+ );++ let expected_url = "https://tangled.org/user.tngl.sh/zed/blob/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L24-48";+ assert_eq!(permalink.to_string(), expected_url.to_string())+ }+}diff --git a/crates/git_hosting_providers/src/settings.rs b/crates/git_hosting_providers/src/settings.rsindex 95243cbe4e4..3431f7ebbdd 100644--- a/crates/git_hosting_providers/src/settings.rs+++ b/crates/git_hosting_providers/src/settings.rs@@ -8,7 +8,7 @@ use settings::{use url::Url;use util::ResultExt as _;-use crate::{Bitbucket, Forgejo, Gitea, Github, Gitlab, SourceHut};+use crate::{Bitbucket, Forgejo, Gitea, Github, Gitlab, SourceHut, Tangled};pub(crate) fn init(cx: &mut App) {init_git_hosting_provider_settings(cx);@@ -51,6 +51,7 @@ fn update_git_hosting_providers_from_settings(cx: &mut App) {GitHostingProviderKind::SourceHut => {Arc::new(SourceHut::new(&provider.name, url)) as _}+ GitHostingProviderKind::Tangled => Arc::new(Tangled::new(&provider.name, url)) as _,})});diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rsindex c70d640324f..21aee523d36 100644--- a/crates/settings_content/src/project.rs+++ b/crates/settings_content/src/project.rs@@ -916,7 +916,7 @@ pub enum DiagnosticSeverityContent {pub struct GitHostingProviderConfig {/// The type of the provider.///- /// Must be one of `github`, `gitlab`, `bitbucket`, `gitea`, `forgejo`, or `source_hut`.+ /// Must be one of `github`, `gitlab`, `bitbucket`, `gitea`, `forgejo`, `sourcehut`, or `tangled`.pub provider: GitHostingProviderKind,/// The base URL for the provider (e.g., "https://code.corp.big.com").@@ -935,6 +935,7 @@ pub enum GitHostingProviderKind {Gitea,Forgejo,SourceHut,+ Tangled,}#[cfg(test)]diff --git a/docs/src/git.md b/docs/src/git.mdindex d1e2ad3cbfd..45fa54c78e2 100644--- a/docs/src/git.md+++ b/docs/src/git.md@@ -339,7 +339,8 @@ Zed currently supports links to the hosted versions of[GitHub](https://github.com),[GitLab](https://gitlab.com),[Bitbucket](https://bitbucket.org),-[SourceHut](https://sr.ht) and+[SourceHut](https://sr.ht),+[Tangled](https://tangled.org) and[Codeberg](https://codeberg.org).### Self-Hosted Instances@@ -360,7 +361,7 @@ However, if your self-hosted Git instance URL doesn't contain identifying keywor}```-The `provider` field specifies which type of hosting service you're using. Supported `provider` values are `github`, `gitlab`, `bitbucket`, `gitea`, `forgejo`, and `sourcehut`. The `name` is optional and used as a display name for your instance, and `base_url` is the root URL of your self-hosted server.+The `provider` field specifies which type of hosting service you're using. Supported `provider` values are `github`, `gitlab`, `bitbucket`, `gitea`, `forgejo`, `sourcehut`, and `tangled`. The `name` is optional and used as a display name for your instance, and `base_url` is the root URL of your self-hosted server.You can configure multiple custom providers if you work with several self-hosted instances.