diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e13fc203..6228697e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## 2.0.0 - 2025-01-28 -The Swift extension for VS Code has moved to the [official swiftlang organization in the VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift)! -The new extension id is `swiftlang.swift`. +The Swift extension for VS Code has moved to the [official swiftlang organization in the VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift-vscode)! +The new extension id is `swiftlang.swift-vscode`. ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d55f6f20c..a7f02d894 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,10 +44,10 @@ If you haven't already, follow the instructions in [Development](#development) t npm run dev-package ``` -This builds a file that looks like `swift-[version]-dev.vsix`. Now install the extension with: +This builds a file that looks like `swift-vscode-[version]-dev.vsix`. Now install the extension with: ```sh -code --install-extension swift-[version]-dev.vsix +code --install-extension swift-vscode-[version]-dev.vsix ``` Alternatively you can install the extension from the Extensions panel by clicking the `...` button at the top of the panel and choosing `Install from VSIX...`. diff --git a/README.md b/README.md index 1414f30ef..e02b6af30 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To give clarity of what is expected of our members, Swift has adopted the code o ## Installation -For the extension to work, you must have Swift installed on your system. Please see the [Getting Started Guide on Swift.org](https://www.swift.org/getting-started/) for details on how to install Swift on your system. Install the extension from [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift) and open a Swift package! You'll be prompted to install and configure the CodeLLDB extension, which you should do so. +For the extension to work, you must have Swift installed on your system. Please see the [Getting Started Guide on Swift.org](https://www.swift.org/getting-started/) for details on how to install Swift on your system. Install the extension from [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift-vscode) and open a Swift package! You'll be prompted to install and configure the CodeLLDB extension, which you should do so. ## Features diff --git a/docs/remote-dev.md b/docs/remote-dev.md index 0c4817251..195926a3e 100644 --- a/docs/remote-dev.md +++ b/docs/remote-dev.md @@ -21,7 +21,7 @@ First create the directory. Next, create `devcontainer.json` and insert the foll "name": "Swift 5.5", "image": "swift:5.5", "extensions": [ - "swiftlang.swift" + "swiftlang.swift-vscode" ], "settings": { "lldb.library": "/usr/lib/liblldb.so" @@ -73,7 +73,7 @@ Your `devcontainer.json` should look something like this "service": "app", "workspaceFolder": "/workspace", "extensions": [ - "swiftlang.swift", + "swiftlang.swift-vscode", ], "settings": { "lldb.library": "/usr/lib/liblldb.so" diff --git a/package-lock.json b/package-lock.json index 940a89dce..14511dca5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "version": "1.11.4", - "name": "swift", + "name": "swift-vscode", "lockfileVersion": 2, "requires": true, "packages": { "": { "version": "1.11.4", "hasInstallScript": true, - "name": "swift", + "name": "swift-vscode", "dependencies": { "@vscode/codicons": "^0.0.36", "lcov-parse": "^1.0.0", diff --git a/package.json b/package.json index 31c33d24d..8492fa25a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "swift", - "displayName": "Swift", + "name": "swift-vscode", + "displayName": "Swift Programming Language", "description": "Swift Language Support for Visual Studio Code.", "version": "2.0.0", "publisher": "swiftlang", diff --git a/test/integration-tests/ExtensionActivation.test.ts b/test/integration-tests/ExtensionActivation.test.ts index f1fd3668b..d9ae25f92 100644 --- a/test/integration-tests/ExtensionActivation.test.ts +++ b/test/integration-tests/ExtensionActivation.test.ts @@ -33,7 +33,7 @@ suite("Extension Activation/Deactivation Tests", () => { async function activate(currentTest?: Mocha.Test) { assert.ok(await activateExtension(currentTest), "Extension did not return its API"); - const ext = vscode.extensions.getExtension("swiftlang.swift"); + const ext = vscode.extensions.getExtension("swiftlang.swift-vscode"); assert.ok(ext, "Extension is not found"); assert.strictEqual(ext.isActive, true); } @@ -57,7 +57,7 @@ suite("Extension Activation/Deactivation Tests", () => { test("Deactivation", async function () { const workspaceContext = await activateExtension(this.test as Mocha.Test); await deactivateExtension(); - const ext = vscode.extensions.getExtension("swiftlang.swift"); + const ext = vscode.extensions.getExtension("swiftlang.swift-vscode"); assert(ext); assert.equal(workspaceContext.subscriptions.length, 0); }); diff --git a/test/integration-tests/utilities/testutilities.ts b/test/integration-tests/utilities/testutilities.ts index e77a156c5..806d30bb6 100644 --- a/test/integration-tests/utilities/testutilities.ts +++ b/test/integration-tests/utilities/testutilities.ts @@ -129,7 +129,7 @@ const extensionBootstrapper = (() => { `Extension is already activated. Last test that activated the extension: ${lastTestName}` ); } - const extensionId = "swiftlang.swift"; + const extensionId = "swiftlang.swift-vscode"; const ext = vscode.extensions.getExtension(extensionId); if (!ext) { throw new Error(`Unable to find extension "${extensionId}"`); @@ -138,7 +138,7 @@ const extensionBootstrapper = (() => { let workspaceContext: WorkspaceContext | undefined; // We can only _really_ call activate through - // `vscode.extensions.getExtension("swiftlang.swift")` once. + // `vscode.extensions.getExtension("swiftlang.swift-vscode")` once. // Subsequent activations must be done through the returned API object. if (!activator) { activatedAPI = await ext.activate();