Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace vscodium with codearts on windows #219

Merged
merged 1 commit into from
Feb 21, 2025
Merged

replace vscodium with codearts on windows #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 16 additions & 25 deletions resources/toolkit-manifest/offline/community.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rust-docs = "本地 Rust 文档副本，允许用户使用 rustup doc 命令在
rustc-dev = "将编译器作为库来内部 API。大多数用户不需要这个; 仅当开发链接到编译器的工具时才需要它, 例如对 Clippy 进行修改"
typos = "源代码拼写检查器，用于查找并纠正源代码中的拼写错误"
vscode = "Visual Studio Code (简称 VS Code) 将代码编辑器的简洁性与开发者核心的 编辑-构建-调试 流程相结合。它提供全面的代码编辑、导航和理解支持，同时具备轻量级调试功能、丰富的扩展模型，并可与现有工具无缝集成，提升开发效率。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 编辑器 (包括其衍生编辑器, 例如 VSCodium 等) 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 等编辑器或 IDE 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"
vscodium = "一个由社区维护的、采用自由许可的 VS Code 二进制发行版 —— 基于微软开源的 VS Code 源代码（MIT 许可），但去除了微软的品牌标识和遥测功能，提供了一个完全开源、无数据追踪的开发环境，适用于希望避免微软官方构建限制的用户。"

[tools.group]
Expand All @@ -51,13 +51,13 @@ optional = true
ver = "1.29.7"

[tools.target.aarch64-unknown-linux-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
display-name = "rust-analyzer (插件)"
optional = true
path = "tools/rust-analyzer-linux-arm64.vsix"
version = "0.3.2299"

[tools.target.aarch64-unknown-linux-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
display-name = "VSCodium"
optional = true
path = "tools/VSCodium-linux-arm64-1.97.2.25045.tar.gz"
version = "1.97.2.25045"
Expand All @@ -67,6 +67,11 @@ optional = true
path = "tools/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip"
version = "0.9.91"

[tools.target.x86_64-pc-windows-gnu.codearts-rust]
display-name = "CodeArts IDE"
path = "tools/codearts-rust.zip"
version = "3.2.0"

[tools.target.x86_64-pc-windows-gnu.mingw64]
display-name = "MinGW-w64"
path = "tools/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev0.7z"
Expand All @@ -78,36 +83,22 @@ optional = true
path = "tools/typos-v1.29.7-x86_64-pc-windows-msvc.zip"
version = "1.29.7"

[tools.target.x86_64-pc-windows-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
path = "tools/rust-analyzer-win32-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-pc-windows-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
path = "tools/VSCodium-win32-x64-1.97.2.25045.zip"
version = "1.97.2.25045"

[tools.target.x86_64-pc-windows-msvc.cargo-nextest]
optional = true
path = "tools/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip"
version = "0.9.91"

[tools.target.x86_64-pc-windows-msvc.codearts-rust]
display-name = "CodeArts IDE"
optional = true
path = "tools/codearts-rust.zip"
version = "3.2.0"

[tools.target.x86_64-pc-windows-msvc.typos]
optional = true
path = "tools/typos-v1.29.7-x86_64-pc-windows-msvc.zip"
version = "1.29.7"

[tools.target.x86_64-pc-windows-msvc.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
path = "tools/rust-analyzer-win32-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-pc-windows-msvc.vscodium]
display-name = "VSCodium 代码编辑器"
path = "tools/VSCodium-win32-x64-1.97.2.25045.zip"
version = "1.97.2.25045"

[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
optional = true
path = "tools/cargo-nextest-0.9.91-x86_64-unknown-linux-gnu.tar.gz"
Expand All @@ -119,13 +110,13 @@ path = "tools/typos-v1.29.7-x86_64-unknown-linux-musl.tar.gz"
version = "1.29.7"

[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
display-name = "rust-analyzer (插件)"
optional = true
path = "tools/rust-analyzer-linux-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-unknown-linux-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
display-name = "VSCodium"
optional = true
path = "tools/VSCodium-linux-x64-1.97.2.25045.tar.gz"
version = "1.97.2.25045"
41 changes: 16 additions & 25 deletions resources/toolkit-manifest/online/community.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ rust-docs = "本地 Rust 文档副本，允许用户使用 rustup doc 命令在
rustc-dev = "将编译器作为库来内部 API。大多数用户不需要这个; 仅当开发链接到编译器的工具时才需要它, 例如对 Clippy 进行修改"
typos = "源代码拼写检查器，用于查找并纠正源代码中的拼写错误"
vscode = "Visual Studio Code (简称 VS Code) 将代码编辑器的简洁性与开发者核心的 编辑-构建-调试 流程相结合。它提供全面的代码编辑、导航和理解支持，同时具备轻量级调试功能、丰富的扩展模型，并可与现有工具无缝集成，提升开发效率。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 编辑器 (包括其衍生编辑器, 例如 VSCodium 等) 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 等编辑器或 IDE 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"
vscodium = "一个由社区维护的、采用自由许可的 VS Code 二进制发行版 —— 基于微软开源的 VS Code 源代码（MIT 许可），但去除了微软的品牌标识和遥测功能，提供了一个完全开源、无数据追踪的开发环境，适用于希望避免微软官方构建限制的用户。"

[tools.group]
Expand All @@ -44,13 +44,13 @@ optional = true
ver = "1.29.7"

[tools.target.aarch64-unknown-linux-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
display-name = "rust-analyzer (插件)"
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-arm64.vsix"
version = "0.3.2299"

[tools.target.aarch64-unknown-linux-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
display-name = "VSCodium"
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-arm64-1.97.2.25045.tar.gz"
version = "1.97.2.25045"
Expand All @@ -60,6 +60,11 @@ optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip"
version = "0.9.91"

[tools.target.x86_64-pc-windows-gnu.codearts-rust]
display-name = "CodeArts IDE"
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip"
version = "3.2.0"

[tools.target.x86_64-pc-windows-gnu.mingw64]
display-name = "MinGW-w64"
required = true
Expand All @@ -71,36 +76,22 @@ optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/typos-v1.29.7-x86_64-pc-windows-msvc.zip"
version = "1.29.7"

[tools.target.x86_64-pc-windows-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-win32-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-pc-windows-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-win32-x64-1.97.2.25045.zip"
version = "1.97.2.25045"

[tools.target.x86_64-pc-windows-msvc.cargo-nextest]
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip"
version = "0.9.91"

[tools.target.x86_64-pc-windows-msvc.codearts-rust]
display-name = "CodeArts IDE"
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip"
version = "3.2.0"

[tools.target.x86_64-pc-windows-msvc.typos]
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/typos-v1.29.7-x86_64-pc-windows-msvc.zip"
version = "1.29.7"

[tools.target.x86_64-pc-windows-msvc.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-win32-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-pc-windows-msvc.vscodium]
display-name = "VSCodium 代码编辑器"
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-win32-x64-1.97.2.25045.zip"
version = "1.97.2.25045"

[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-unknown-linux-gnu.tar.gz"
Expand All @@ -112,13 +103,13 @@ url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/t
version = "1.29.7"

[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
display-name = "rust-analyzer (VS Code 插件)"
display-name = "rust-analyzer (插件)"
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-x64.vsix"
version = "0.3.2299"

[tools.target.x86_64-unknown-linux-gnu.vscodium]
display-name = "VSCodium 代码编辑器"
display-name = "VSCodium"
optional = true
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-x64-1.97.2.25045.tar.gz"
version = "1.97.2.25045"
17 changes: 7 additions & 10 deletions resources/toolkits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ cargo-nextest = "新一代 Rust 项目测试运行程序，相比传统 cargo te
vscode = "Visual Studio Code (简称 VS Code) 将代码编辑器的简洁性与开发者核心的 编辑-构建-调试 流程相结合。它提供全面的代码编辑、导航和理解支持，同时具备轻量级调试功能、丰富的扩展模型，并可与现有工具无缝集成，提升开发效率。"
vscodium = "一个由社区维护的、采用自由许可的 VS Code 二进制发行版 —— 基于微软开源的 VS Code 源代码（MIT 许可），但去除了微软的品牌标识和遥测功能，提供了一个完全开源、无数据追踪的开发环境，适用于希望避免微软官方构建限制的用户。"
codearts-rust = "CodeArts IDE 定位华为云开发者桌面，是利用自主可控技术内核，面向华为云开发者提供的智能化可扩展桌面集成开发环境（IDE），结合华为云行业和产业开发套件，实现极致的一站式用云和开发体验。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 编辑器 (包括其衍生编辑器, 例如 VSCodium 等) 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"
vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现。为 VS Code 等编辑器或 IDE 提供代码补全、跳转到定义等功能，提升 Rust 开发体验。"

[toolkit.community.value.tools.group]
"Rust 基础工具集" = ["mingw64"]
Expand All @@ -108,27 +108,24 @@ vscode-rust-analyzer = "Rust 编程语言的 语言服务器协议 (LSP) 实现

[toolkit.community.value.tools.target.x86_64-pc-windows-gnu]
mingw64 = { display-name = "MinGW-w64", required = true, version = "14.2.0-rt_v12-rev0", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev0.7z" }
vscodium = { display-name = "VSCodium 代码编辑器", version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-win32-x64-1.97.2.25045.zip" }
vscode-rust-analyzer = { display-name = "rust-analyzer (VS Code 插件)", version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-win32-x64.vsix" }
codearts-rust = { display-name = "CodeArts IDE", version = "3.2.0", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip" }
cargo-nextest = { optional = true, version = "0.9.91", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip" }
typos = { optional = true, version = "1.29.7", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/typos-v1.29.7-x86_64-pc-windows-msvc.zip" }

[toolkit.community.value.tools.target.x86_64-pc-windows-msvc]
vscodium = { display-name = "VSCodium 代码编辑器", version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-win32-x64-1.97.2.25045.zip" }
vscode-rust-analyzer = { display-name = "rust-analyzer (VS Code 插件)", version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-win32-x64.vsix" }
codearts-rust = { optional = true, display-name = "CodeArts IDE", version = "3.2.0", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip" }
cargo-nextest = { optional = true, version = "0.9.91", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-pc-windows-msvc.zip" }
typos = { optional = true, version = "1.29.7", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/typos-v1.29.7-x86_64-pc-windows-msvc.zip" }

[toolkit.community.value.tools.target.x86_64-unknown-linux-gnu]
# Make vscode optional on Linux, because not everyone has desktop environment, we might add such check later but entil then, this is the safetest option
vscodium = { display-name = "VSCodium 代码编辑器", optional = true, version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-x64-1.97.2.25045.tar.gz" }
vscode-rust-analyzer = { display-name = "rust-analyzer (VS Code 插件)", optional = true, version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-x64.vsix" }
vscodium = { display-name = "VSCodium", optional = true, version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-x64-1.97.2.25045.tar.gz" }
vscode-rust-analyzer = { display-name = "rust-analyzer (插件)", optional = true, version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-x64.vsix" }
cargo-nextest = { optional = true, version = "0.9.91", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-x86_64-unknown-linux-gnu.tar.gz" }
typos = { optional = true, version = "1.29.7", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/typos/typos-v1.29.7-x86_64-unknown-linux-musl.tar.gz" }

[toolkit.community.value.tools.target.aarch64-unknown-linux-gnu]
vscodium = { display-name = "VSCodium 代码编辑器", optional = true, version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-arm64-1.97.2.25045.tar.gz" }
vscode-rust-analyzer = { display-name = "rust-analyzer (VS Code 插件)", optional = true, version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-arm64.vsix" }
vscodium = { display-name = "VSCodium", optional = true, version = "1.97.2.25045", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/VSCodium-linux-arm64-1.97.2.25045.tar.gz" }
vscode-rust-analyzer = { display-name = "rust-analyzer (插件)", optional = true, version = "0.3.2299", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2299/rust-analyzer-linux-arm64.vsix" }
cargo-nextest = { optional = true, version = "0.9.91", url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/cargo-nextest-0.9.91-aarch64-unknown-linux-gnu.tar.gz" }
typos = { optional = true, ver = "1.29.7", identifier = "typos-cli" }
# ========================= Manifest For Community Toolkit END =========================
1 change: 0 additions & 1 deletion rim_gui/src-tauri/src/installer_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ fn check_install_path(path: String) -> Option<String> {
#[tauri::command]
fn get_component_list() -> Result<Vec<Component>> {
let components = cached_manifest().current_target_components(true)?;
println!("components: {components:#?}");
Ok(components)
}

Expand Down
4 changes: 0 additions & 4 deletions src/core/parser/toolset_manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,6 @@ impl ToolsetManifest {
} else {
tool_info.version()
};
println!(
"tool: {tool_name}, display name: {:?}",
tool_info.display_name()
);
components.push(
Component::new(
tool_name,
Expand Down
Loading