diff --git a/README.md b/README.md index 7ea3882d..49d250f5 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,37 @@

- Consistem + Consistem

-> **Fork Consistem:** esta extensão é um fork do projeto oficial [`intersystems-community/vscode-objectscript`](https://github.com/intersystems-community/vscode-objectscript). -> -> Ele preserva todas as funcionalidades do projeto original e adiciona integrações, ajustes e padrões internos adotados pela Consistem, com foco em atender necessidades específicas do nosso ecossistema de desenvolvimento. - ---- +# 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) [![Known Vulnerabilities](https://snyk.io/test/github/intersystems-community/vscode-objectscript/badge.svg)](https://snyk.io/test/github/intersystems-community/vscode-objectscript) -![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/intersystems-community.vscode-objectscript.svg) -[![](https://img.shields.io/visual-studio-marketplace/i/intersystems-community.vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=intersystems-community.vscode-objectscript) +[![Consistem](https://img.shields.io/badge/Consistem-Website-brightgreen)](https://consistem.com.br/) [![](https://img.shields.io/badge/InterSystems-IRIS-blue.svg)](https://www.intersystems.com/products/intersystems-iris/) -[![](https://img.shields.io/badge/InterSystems-Caché-blue.svg)](https://www.intersystems.com/products/cache/) +[![](https://img.shields.io/badge/InterSystems-Cach%C3%A9-blue.svg)](https://www.intersystems.com/products/cache/) [![](https://img.shields.io/badge/InterSystems-Ensemble-blue.svg)](https://www.intersystems.com/products/ensemble/) -# InterSystems ObjectScript extension for VS Code +> **Note:** The best way to install and use this extension is by installing the [InterSystems ObjectScript Extension Pack](https://marketplace.visualstudio.com/items?itemName=intersystems-community.objectscript-pack) +> and following the [documentation here](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO). -> **Note:** The best way to install and use this extension is by installing the [InterSystems ObjectScript Extension Pack](https://marketplace.visualstudio.com/items?itemName=intersystems-community.objectscript-pack) and following the [documentation here](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO). +## About -[InterSystems®](http://www.intersystems.com) ObjectScript language support for Visual Studio Code, from the [InterSystems Developer Community](https://community.intersystems.com/). +[InterSystems®](http://www.intersystems.com) ObjectScript language support for Visual Studio Code, based on the [InterSystems Developer Community](https://community.intersystems.com/) extension. -- Documentation on the [InterSystems Documentation site](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO). +### Consistem fork + +This extension is a fork of the official [`intersystems-community/vscode-objectscript`](https://github.com/intersystems-community/vscode-objectscript) project. + +Originally maintained by [InterSystems®](http://www.intersystems.com), this fork is maintained by [Consistem®](https://consistem.com.br/). +It preserves all the features of the original project and adds integrations, adjustments, and internal standards adopted by Consistem, +with a focus on meeting the specific needs of our development ecosystem. + +## References + +- Documentation on the [InterSystems Documentation site](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO). - Guidance on [reporting issues](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO_reporting). ## Features @@ -74,14 +82,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": ["intersystems-community.vscode-objectscript"] +"enable-proposed-api": ["consistem-sistemas.vscode-objectscript"] ``` 4. Exit VS Code and relaunch it. 5. Verify that the ObjectScript channel of the Output panel reports this: ``` -intersystems-community.vscode-objectscript version X.Y.Z-beta.1 activating with proposed APIs available. +consistem-sistemas.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/images/logo.png b/images/logo.png index 606352b6..82d5be74 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/package-lock.json b/package-lock.json index 96c84f39..37dcc90b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-objectscript", - "version": "3.4.0-SNAPSHOT", + "version": "3.4.1-SNAPSHOT", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-objectscript", - "version": "3.4.0-SNAPSHOT", + "version": "3.4.1-SNAPSHOT", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index eab2b1b4..3d3ad57c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vscode-objectscript", - "displayName": "InterSystems ObjectScript", - "description": "InterSystems ObjectScript language support for Visual Studio Code", + "displayName": "Consistem ObjectScript", + "description": "InterSystems ObjectScript language support for Visual Studio Code, with integrations and internal standards adopted by Consistem.", "version": "3.4.1-SNAPSHOT", "icon": "images/logo.png", "aiKey": "InstrumentationKey=9cd75d51-697c-406c-a929-2bcf46e97c64;IngestionEndpoint=https://eastus2-4.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus2.livediagnostics.monitor.azure.com/;ApplicationId=a431c56f-8ccc-4b99-b5e9-fce3763215b1", @@ -19,11 +19,11 @@ ], "repository": { "type": "git", - "url": "https://github.com/intersystems-community/vscode-objectscript" + "url": "https://github.com/consistem/vscode-objectscript" }, "homepage": "https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO", "license": "MIT", - "publisher": "intersystems-community", + "publisher": "consistem-sistemas", "capabilities": { "untrustedWorkspaces": { "supported": true @@ -1341,7 +1341,7 @@ "title": "Consistem", "type": "object", "properties": { - "consistem.globalDocumentation.openInFile": { + "consistem.globalDocumentation.openInFile": { "description": "Open global documentation in a file instead of the Output view.", "type": "boolean", "default": true diff --git a/src/commands/unitTest.ts b/src/commands/unitTest.ts index b4c6748a..36fbebee 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:intersystems-community.vscode-objectscript unitTest" + "@ext:consistem-sistemas.vscode-objectscript unitTest" ); } diff --git a/src/extension.ts b/src/extension.ts index 227daee8..0c6d1954 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,5 +1,5 @@ -export const extensionId = "intersystems-community.vscode-objectscript"; -export const lsExtensionId = "intersystems.language-server"; +export const extensionId = "consistem-sistemas.vscode-objectscript"; +export const lsExtensionId = "consistem-sistemas.language-server"; export const smExtensionId = "intersystems-community.servermanager"; import vscode = require("vscode"); diff --git a/src/test/runTest.ts b/src/test/runTest.ts index 8bd38c6a..0cf992c3 100644 --- a/src/test/runTest.ts +++ b/src/test/runTest.ts @@ -27,9 +27,9 @@ async function main() { // Install dependent extensions installExtension("intersystems-community.servermanager"); - installExtension("intersystems.language-server"); + installExtension("consistem-sistemas.language-server"); - const launchArgs = ["-n", workspace, "--enable-proposed-api", "intersystems-community.vscode-objectscript"]; + const launchArgs = ["-n", workspace, "--enable-proposed-api", "consistem-sistemas.vscode-objectscript"]; // Download VS Code, unzip it and run the integration test await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs });