Fix/publish

.vscodeignore

@@ -8,6 +8,7 @@ shared.webpack.config.js
 **/tslint.json
 client/node_modules/**
 client/src/**
+client/vendor/**
 client/webpack.config.js
 server/node_modules/**
 server/src/**

README.md

@@ -104,7 +104,7 @@ This extension can be installed on the following platforms:
 
 ## Dependencies
 
-This extension depends on the [vscode-objectscript](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.vscode-objectscript) extension be downloaded and enabled.
+This extension depends on the [vscode-objectscript](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript) extension be downloaded and enabled.
 
 ## InterSystems Product Compatibility
 

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "language-server-client",
   "author": "InterSystems Corporation",
-  "version": "2.8.4-SNAPSHOT",
+  "version": "2.8.3",
   "private": true,
   "engines": {
     "vscode": "^1.93.0"
@@ -11,7 +11,7 @@
     "vscode-languageclient": "^9.0.1"
   },
   "devDependencies": {
-    "@intersystems-community/intersystems-servermanager": "^3.10.2",
+    "@consistem-sistemas/consistem-servermanager": "file:./vendor/consistem-servermanager",
     "@types/semver": "^7.7.0",
     "@types/vscode": "1.93.0"
   }

client/src/extension.ts

@@ -25,7 +25,7 @@ import {
 } from "vscode-languageclient/node";
 
 import { gt, lte, lt } from "semver";
-import * as serverManager from "@intersystems-community/intersystems-servermanager";
+import * as serverManager from "@consistem-sistemas/consistem-servermanager";
 
 import { ObjectScriptEvaluatableExpressionProvider } from "./evaluatableExpressionProvider";
 import {
@@ -91,7 +91,7 @@ type MakeRESTRequestParams = {
 
 export async function activate(context: ExtensionContext) {
 	// Get the main extension exported API
-	const objectScriptExt = extensions.getExtension("consistem-sistemas.vscode-objectscript")!;
+	const objectScriptExt = extensions.getExtension("consistem-sistemas.consistem-vscode-objectscript")!;
 	objectScriptApi = objectScriptExt.isActive ? objectScriptExt.exports : await objectScriptExt.activate();
 
 	// The server is implemented in node
@@ -164,7 +164,7 @@ export async function activate(context: ExtensionContext) {
 		wsFolderServerSpecs.clear();
 		client.sendNotification("intersystems/server/connectionChange");
 	});
-	const serverManagerExt = extensions.getExtension("consistem-sistemas.servermanager");
+	const serverManagerExt = extensions.getExtension("consistem-sistemas.consistem-servermanager");
 	if (serverManagerExt !== undefined) {
 		// The server manager extension is installed
 		serverManagerApi = serverManagerExt.isActive ? serverManagerExt.exports : await serverManagerExt.activate();
@@ -402,7 +402,7 @@ export async function activate(context: ExtensionContext) {
 			if (workspace.name === undefined) {
 				window
 					.showInformationMessage(
-						`For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`,
+						`For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`,
 						"Yes",
 						"Don't Ask Again",
 					)
@@ -417,7 +417,7 @@ export async function activate(context: ExtensionContext) {
 				// Only give the "Only This Workspace" option if a workspace is open
 				window
 					.showInformationMessage(
-						`For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`,
+						`For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`,
 						"Globally",
 						"Only This Workspace",
 						"Don't Ask Again",
@@ -436,7 +436,7 @@ export async function activate(context: ExtensionContext) {
 			if (workspace.name === undefined) {
 				window
 					.showInformationMessage(
-						`For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`,
+						`For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`,
 						"Yes",
 						"Don't Ask Again",
 					)
@@ -451,7 +451,7 @@ export async function activate(context: ExtensionContext) {
 				// Only give the "Only This Workspace" option if a workspace is open
 				window
 					.showInformationMessage(
-						`For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`,
+						`For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`,
 						"Globally",
 						"Only This Workspace",
 						"Don't Ask Again",

client/vendor/consistem-servermanager/index.d.ts

@@ -0,0 +1,66 @@
+import * as vscode from 'vscode';
+
+export const EXTENSION_ID: string;
+export const AUTHENTICATION_PROVIDER: string;
+
+export interface IServerName {
+	name: string;
+	description: string;
+	detail: string;
+	scope?: vscode.ConfigurationScope;
+}
+
+export interface IWebServerSpec {
+	scheme?: string;
+	host: string;
+	port: number;
+	pathPrefix?: string;
+}
+
+export interface ISuperServerSpec {
+	host?: string;
+	port: number;
+}
+
+export interface IJSONServerSpec {
+	webServer: IWebServerSpec;
+	superServer?: ISuperServerSpec;
+	username?: string;
+	password?: string;
+	description?: string;
+}
+
+export interface IServerSpec extends IJSONServerSpec {
+	name: string;
+}
+
+export interface ServerManagerAPI {
+	pickServer(
+		scope?: vscode.ConfigurationScope,
+		options?: vscode.QuickPickOptions,
+	): Promise<string | undefined>;
+
+	getServerNames(
+		scope?: vscode.ConfigurationScope,
+		sorted?: boolean,
+	): IServerName[];
+
+	getServerSummary(
+		name: string,
+		scope?: vscode.ConfigurationScope,
+	): IServerName | undefined;
+
+	getServerSpec(
+		name: string,
+		scope?: vscode.ConfigurationScope,
+		flushCredentialCache?: boolean,
+		options?: { hideFromRecents?: boolean, /* Obsolete */ noCredentials?: boolean },
+	): Promise<IServerSpec | undefined>;
+
+	getAccount(
+		serverSpec: IServerSpec
+	): vscode.AuthenticationSessionAccountInformation | undefined;
+
+	onDidChangePassword(
+	): vscode.Event<string>;
+}

client/vendor/consistem-servermanager/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+	EXTENSION_ID: 'consistem-sistemas.consistem-servermanager',
+	AUTHENTICATION_PROVIDER: 'intersystems-server-credentials'
+};

client/vendor/consistem-servermanager/package.json

@@ -0,0 +1,9 @@
+{
+	"name": "@consistem-sistemas/consistem-servermanager",
+	"version": "3.10.2",
+	"description": "InterSystems Server Manager VS Code extension API interfaces and constants (vendored for offline/CI builds)",
+	"types": "index.d.ts",
+	"main": "index.js",
+	"license": "MIT",
+	"private": true
+}

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "language-server",
+  "name": "consistem-language-server",
   "displayName": "Consistem Language Server",
   "description": "A language server for InterSystems ObjectScript, based on the official project and maintained by Consistem.",
   "author": "InterSystems Corporation",
@@ -1818,7 +1818,7 @@
     "webpack-cli": "^7.0.2"
   },
   "extensionDependencies": [
-    "consistem-sistemas.vscode-objectscript"
+    "consistem-sistemas.consistem-vscode-objectscript"
   ],
   "prettier": {
     "useTabs": true,

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "language-server-server",
-  "version": "2.8.4-SNAPSHOT",
+  "version": "2.8.3",
   "author": "InterSystems Corporation",
   "private": true,
   "engines": {