diff --git a/README.md b/README.md index dc25a424..ca1d5c49 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ # Consistem ObjectScript extension for VS Code -[![](https://img.shields.io/visual-studio-marketplace/v/consistem-sistemas.vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.vscode-objectscript) -[![](https://img.shields.io/visual-studio-marketplace/i/consistem-sistemas.vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.vscode-objectscript) +[![](https://img.shields.io/visual-studio-marketplace/v/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript) +[![](https://img.shields.io/visual-studio-marketplace/i/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript) [![Known Vulnerabilities](https://snyk.io/test/github/intersystems-community/vscode-objectscript/badge.svg)](https://snyk.io/test/github/intersystems-community/vscode-objectscript) [![Consistem](https://img.shields.io/badge/Consistem-Website-brightgreen)](https://consistem.com.br/) @@ -85,14 +85,14 @@ To unlock these features (optional): 3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code): ```json -"enable-proposed-api": ["consistem-sistemas.vscode-objectscript"] +"enable-proposed-api": ["consistem-sistemas.consistem-vscode-objectscript"] ``` 4. Exit VS Code and relaunch it. 5. Verify that the ObjectScript channel of the Output panel reports this: ``` -consistem-sistemas.vscode-objectscript version X.Y.Z-beta.1 activating with proposed APIs available. +consistem-sistemas.consistem-vscode-objectscript version X.Y.Z-beta.1 activating with proposed APIs available. ``` After a subsequent update of the extension from Marketplace you will only have to download and install the new `vscode-objectscript-X.Y.Z-beta.1` VSIX. None of the other steps above are needed again. diff --git a/package-lock.json b/package-lock.json index 92c5b735..3dc28eec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "vscode-objectscript", + "name": "consistem-vscode-objectscript", "version": "3.8.3-SNAPSHOT", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "vscode-objectscript", + "name": "consistem-vscode-objectscript", "version": "3.8.3-SNAPSHOT", "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 3f9a0998..7a1f1485 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "vscode-objectscript", + "name": "consistem-vscode-objectscript", "displayName": "Consistem ObjectScript", "description": "InterSystems ObjectScript language support for Visual Studio Code, with integrations and internal standards adopted by Consistem.", "version": "3.8.3-SNAPSHOT", @@ -2100,6 +2100,6 @@ "ws": "^8.21.0" }, "extensionDependencies": [ - "consistem-sistemas.servermanager" + "consistem-sistemas.consistem-servermanager" ] } diff --git a/src/commands/addServerNamespaceToWorkspace.ts b/src/commands/addServerNamespaceToWorkspace.ts index 6ecac487..907d7ab8 100644 --- a/src/commands/addServerNamespaceToWorkspace.ts +++ b/src/commands/addServerNamespaceToWorkspace.ts @@ -22,7 +22,7 @@ async function pickServerAndNamespace(message?: string): Promise<{ serverName: s vscode.window.showErrorMessage( `${ message ? message : "Picking a server and namespace" - } requires the [InterSystems Server Manager extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.servermanager) to be installed and enabled.`, + } requires the [InterSystems Server Manager extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-servermanager) to be installed and enabled.`, "Dismiss" ); return; diff --git a/src/commands/connectFolderToServerNamespace.ts b/src/commands/connectFolderToServerNamespace.ts index 600047fa..bb16f14d 100644 --- a/src/commands/connectFolderToServerNamespace.ts +++ b/src/commands/connectFolderToServerNamespace.ts @@ -22,7 +22,7 @@ export async function connectFolderToServerNamespace(): Promise { } if (!serverManagerApi) { vscode.window.showErrorMessage( - "Connecting a folder to a server namespace requires the [InterSystems Server Manager extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.servermanager) to be installed and enabled.", + "Connecting a folder to a server namespace requires the [InterSystems Server Manager extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-servermanager) to be installed and enabled.", "Dismiss" ); return; diff --git a/src/commands/studioMigration.ts b/src/commands/studioMigration.ts index 3527e15f..1de246ea 100644 --- a/src/commands/studioMigration.ts +++ b/src/commands/studioMigration.ts @@ -175,7 +175,7 @@ export async function loadStudioColors(languageServerExt: vscode.Extension // Check that the Language Server is installed if (!languageServerExt) { vscode.window.showErrorMessage( - `Loading Studio syntax colors requires the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=${lsExtensionId}).`, + `Loading Studio syntax colors requires the [Consistem Language Server extension](https://marketplace.visualstudio.com/items?itemName=${lsExtensionId}).`, "Dismiss" ); return; diff --git a/src/commands/unitTest.ts b/src/commands/unitTest.ts index d4c6040c..138bd0ad 100644 --- a/src/commands/unitTest.ts +++ b/src/commands/unitTest.ts @@ -1897,7 +1897,7 @@ function configureHandler(): void { // Open the settings UI and focus on the "objectscript.unitTest" settings vscode.commands.executeCommand( "workbench.action.openSettings", - "@ext:consistem-sistemas.vscode-objectscript unitTest" + "@ext:consistem-sistemas.consistem-vscode-objectscript unitTest" ); } diff --git a/src/extension.ts b/src/extension.ts index f8efb10a..65c94b78 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,6 +1,6 @@ -export const extensionId = "consistem-sistemas.vscode-objectscript"; -export const lsExtensionId = "consistem-sistemas.language-server"; -export const smExtensionId = "consistem-sistemas.servermanager"; +export const extensionId = "consistem-sistemas.consistem-vscode-objectscript"; +export const lsExtensionId = "consistem-sistemas.consistem-language-server"; +export const smExtensionId = "consistem-sistemas.consistem-servermanager"; import vscode = require("vscode"); import * as semver from "semver"; @@ -639,7 +639,7 @@ function languageServer(install = true): vscode.Extension { } await vscode.window .showInformationMessage( - `Install the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=${lsExtensionId}) for improved intellisense and syntax coloring for ObjectScript code.`, + `Install the [Consistem Language Server extension](https://marketplace.visualstudio.com/items?itemName=${lsExtensionId}) for improved intellisense and syntax coloring for ObjectScript code.`, "Install", "Later" ) @@ -1011,7 +1011,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { const noLSsubscriptions: { dispose(): any }[] = []; if (!languageServerExt) { if (!config("ignoreInstallLanguageServer")) { - outputChannel.appendLine("The intersystems.language-server extension is not installed or has been disabled."); + outputChannel.appendLine("The Consistem Language Server extension is not installed or has been disabled."); outputChannel.show(true); } diff --git a/src/test/runTest.ts b/src/test/runTest.ts index 720f9a6f..f18c548e 100644 --- a/src/test/runTest.ts +++ b/src/test/runTest.ts @@ -26,10 +26,10 @@ async function main() { }); // Install dependent extensions - installExtension("consistem-sistemas.servermanager"); - installExtension("consistem-sistemas.language-server"); + installExtension("consistem-sistemas.consistem-servermanager"); + installExtension("consistem-sistemas.consistem-language-server"); - const launchArgs = ["-n", workspace, "--enable-proposed-api", "consistem-sistemas.vscode-objectscript"]; + const launchArgs = ["-n", workspace, "--enable-proposed-api", "consistem-sistemas.consistem-vscode-objectscript"]; // Download VS Code, unzip it and run the integration test await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs });