Skip to content

Fix the URL for Swiftly #931

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.

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

Merged
merged 1 commit into from
Jun 25, 2024
Merged
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions src/ui/ToolchainSelection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import configuration from "../configuration";
* Open the installation page on Swift.org
*/
export async function downloadToolchain() {
if (await vscode.env.openExternal(vscode.Uri.parse("https://www.swift.org/install/"))) {
if (await vscode.env.openExternal(vscode.Uri.parse("https://www.swift.org/install"))) {
const selected = await showReloadExtensionNotification(
"The Swift extension must be reloaded once you have downloaded and installed the new toolchain.",
"Select Toolchain"
Expand All @@ -37,9 +37,7 @@ export async function downloadToolchain() {
* Open the installation page for Swiftly
*/
export async function installSwiftly() {
if (
await vscode.env.openExternal(vscode.Uri.parse("https://swift-server.github.io/swiftly/"))
) {
if (await vscode.env.openExternal(vscode.Uri.parse("https://swiftlang.github.io/swiftly"))) {
const selected = await showReloadExtensionNotification(
"The Swift extension must be reloaded once you have downloaded and installed the new toolchain.",
"Select Toolchain"
Expand Down Expand Up @@ -200,14 +198,14 @@ async function getQuickPickItems(
actionItems.push({
type: "action",
label: "$(cloud-download) Install Swiftly for toolchain management...",
detail: "Install https://swift-server.github.io/swiftly/ to manage your toolchains on Linux",
detail: "Install https://swiftlang.github.io/swiftly to manage your toolchains on Linux",
run: installSwiftly,
});
}
actionItems.push({
type: "action",
label: "$(cloud-download) Download from Swift.org...",
detail: "Open https://swift.org/install/ to download and install a toolchain",
detail: "Open https://swift.org/install to download and install a toolchain",
run: downloadToolchain,
});
actionItems.push({
Expand Down