Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -2100,6 +2100,6 @@
"ws": "^8.21.0"
},
"extensionDependencies": [
"consistem-sistemas.servermanager"
"consistem-sistemas.consistem-servermanager"
]
}
2 changes: 1 addition & 1 deletion src/commands/addServerNamespaceToWorkspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/connectFolderToServerNamespace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export async function connectFolderToServerNamespace(): Promise<void> {
}
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;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/studioMigration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export async function loadStudioColors(languageServerExt: vscode.Extension<any>
// 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;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/unitTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
}

Expand Down
10 changes: 5 additions & 5 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -639,7 +639,7 @@ function languageServer(install = true): vscode.Extension<any> {
}
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"
)
Expand Down Expand Up @@ -1011,7 +1011,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
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);
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/runTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down