From 3ec323ce0d3fcf2a5638cbd593204fe3fca5d5ba Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 12 Mar 2025 15:55:37 -0400 Subject: [PATCH] uiua: Extract to zed-extensions/uiua repository (#26587) This PR extracts the Uiua extension to the [zed-extensions/uiua](https://github.com/zed-extensions/uiua) repository. Release Notes: - N/A --- Cargo.lock | 7 --- Cargo.toml | 1 - docs/src/languages/uiua.md | 2 +- extensions/uiua/Cargo.toml | 16 ------ extensions/uiua/LICENSE-APACHE | 1 - extensions/uiua/extension.toml | 15 ------ extensions/uiua/languages/uiua/config.toml | 11 ---- extensions/uiua/languages/uiua/highlights.scm | 50 ------------------- extensions/uiua/languages/uiua/indents.scm | 3 -- extensions/uiua/src/uiua.rs | 27 ---------- 10 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 extensions/uiua/Cargo.toml delete mode 120000 extensions/uiua/LICENSE-APACHE delete mode 100644 extensions/uiua/extension.toml delete mode 100644 extensions/uiua/languages/uiua/config.toml delete mode 100644 extensions/uiua/languages/uiua/highlights.scm delete mode 100644 extensions/uiua/languages/uiua/indents.scm delete mode 100644 extensions/uiua/src/uiua.rs diff --git a/Cargo.lock b/Cargo.lock index af93eab2fa..c086597312 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17233,13 +17233,6 @@ dependencies = [ "zed_extension_api 0.1.0", ] -[[package]] -name = "zed_uiua" -version = "0.0.1" -dependencies = [ - "zed_extension_api 0.1.0", -] - [[package]] name = "zeno" version = "0.2.3" diff --git a/Cargo.toml b/Cargo.toml index f283f665a4..face468c70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -179,7 +179,6 @@ members = [ "extensions/snippets", "extensions/test-extension", "extensions/toml", - "extensions/uiua", # # Tooling diff --git a/docs/src/languages/uiua.md b/docs/src/languages/uiua.md index d651b16fa7..622e04fc3d 100644 --- a/docs/src/languages/uiua.md +++ b/docs/src/languages/uiua.md @@ -2,7 +2,7 @@ [Uiua](https://www.uiua.org/) is a general purpose, stack-based, array-oriented programming language with a focus on simplicity, beauty, and tacit code. -Uiua support is available through the [Uiua extension](https://github.com/zed-industries/zed/tree/main/extensions/uiua). +Uiua support is available through the [Uiua extension](https://github.com/zed-extensions/uiua). - Tree-sitter: [shnarazk/tree-sitter-uiua](https://github.com/shnarazk/tree-sitter-uiua) - Language Server: [uiua-lang/uiua](https://github.com/uiua-lang/uiua/) diff --git a/extensions/uiua/Cargo.toml b/extensions/uiua/Cargo.toml deleted file mode 100644 index 89a86da3b9..0000000000 --- a/extensions/uiua/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "zed_uiua" -version = "0.0.1" -edition.workspace = true -publish.workspace = true -license = "Apache-2.0" - -[lints] -workspace = true - -[lib] -path = "src/uiua.rs" -crate-type = ["cdylib"] - -[dependencies] -zed_extension_api = "0.1.0" diff --git a/extensions/uiua/LICENSE-APACHE b/extensions/uiua/LICENSE-APACHE deleted file mode 120000 index 1cd601d0a3..0000000000 --- a/extensions/uiua/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-APACHE \ No newline at end of file diff --git a/extensions/uiua/extension.toml b/extensions/uiua/extension.toml deleted file mode 100644 index 35d9b64357..0000000000 --- a/extensions/uiua/extension.toml +++ /dev/null @@ -1,15 +0,0 @@ -id = "uiua" -name = "Uiua" -description = "Uiua support." -version = "0.0.1" -schema_version = 1 -authors = ["Max Brunsfeld "] -repository = "https://github.com/zed-industries/zed" - -[language_servers.uiua] -name = "Uiua LSP" -language = "Uiua" - -[grammars.uiua] -repository = "https://github.com/shnarazk/tree-sitter-uiua" -commit = "21dc2db39494585bf29a3f86d5add6e9d11a22ba" diff --git a/extensions/uiua/languages/uiua/config.toml b/extensions/uiua/languages/uiua/config.toml deleted file mode 100644 index 31f9303659..0000000000 --- a/extensions/uiua/languages/uiua/config.toml +++ /dev/null @@ -1,11 +0,0 @@ -name = "Uiua" -grammar = "uiua" -path_suffixes = ["ua"] -line_comments = ["# "] -autoclose_before = ")]}\"" -brackets = [ - { start = "{", end = "}", close = true, newline = false}, - { start = "[", end = "]", close = true, newline = false }, - { start = "(", end = ")", close = true, newline = false }, - { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] }, -] diff --git a/extensions/uiua/languages/uiua/highlights.scm b/extensions/uiua/languages/uiua/highlights.scm deleted file mode 100644 index 2c37f404e6..0000000000 --- a/extensions/uiua/languages/uiua/highlights.scm +++ /dev/null @@ -1,50 +0,0 @@ -[ - (openParen) - (closeParen) - (openCurly) - (closeCurly) - (openBracket) - (closeBracket) -] @punctuation.bracket - -[ - (branchSeparator) - (underscore) -] @constructor -; ] @punctuation.delimiter - -[ (character) ] @constant.character -[ (comment) ] @comment -[ (constant) ] @constant.numeric -[ (identifier) ] @variable -[ (leftArrow) ] @keyword -[ (function) ] @function -[ (modifier1) ] @operator -[ (modifier2) ] @operator -[ (number) ] @constant.numeric -[ (placeHolder) ] @special -[ (otherConstant) ] @string.special -[ (signature) ] @type -[ (system) ] @function.builtin -[ (tripleMinus) ] @module - -; planet -[ - "id" - "identity" - "∘" - "dip" - "⊙" - "gap" - "⋅" -] @tag - -[ - (string) - (multiLineString) -] @string - -; [ -; (deprecated) -; (identifierDeprecated) -; ] @warning diff --git a/extensions/uiua/languages/uiua/indents.scm b/extensions/uiua/languages/uiua/indents.scm deleted file mode 100644 index add68c723c..0000000000 --- a/extensions/uiua/languages/uiua/indents.scm +++ /dev/null @@ -1,3 +0,0 @@ -[ - (array) -] @indent diff --git a/extensions/uiua/src/uiua.rs b/extensions/uiua/src/uiua.rs deleted file mode 100644 index a4d24ab063..0000000000 --- a/extensions/uiua/src/uiua.rs +++ /dev/null @@ -1,27 +0,0 @@ -use zed_extension_api::{self as zed, Result}; - -struct UiuaExtension; - -impl zed::Extension for UiuaExtension { - fn new() -> Self { - Self - } - - fn language_server_command( - &mut self, - _language_server_id: &zed::LanguageServerId, - worktree: &zed::Worktree, - ) -> Result { - let path = worktree - .which("uiua") - .ok_or_else(|| "uiua is not installed".to_string())?; - - Ok(zed::Command { - command: path, - args: vec!["lsp".to_string()], - env: Default::default(), - }) - } -} - -zed::register_extension!(UiuaExtension);