Fixed an issue with extensionContext not being exported and also added a config option dropdownlist for the api version number. You can choose v2 or v3.. My 2017 server does not like the v3 api calls at all.

Author: Kenneth Shepherd

Diff for: api/index.ts

@@ -7,11 +7,16 @@ export class AtelierAPI {
   private cookies: string[] = [];
   private _config: any;
   private _namespace: string;
+  private _apiVersion: string;
 
   private get ns(): string {
     return this._namespace || this._config.ns;
   }
 
+  private get apiVersion(): string {
+    return this._apiVersion || this._config.apiVersion;
+  }
+
   constructor() {
     this.setConnection(currentWorkspaceFolder());
   }
@@ -20,6 +25,10 @@ export class AtelierAPI {
     this._namespace = namespace;
   }
 
+  setApiVersion(apiVersion: string) {
+    this._apiVersion = apiVersion;
+  }
+
   updateCookies(cookies: string[]) {
     cookies.forEach(cookie => {
       let [cookieName] = cookie.split('=');
@@ -146,7 +155,7 @@ export class AtelierAPI {
     type?: string;
     filter?: string;
   }): Promise<any> {
-    return this.request('GET', `v3/${this.ns}/docnames/${category}/${type}`, null, {
+    return this.request('GET', `${this.apiVersion}/${this.ns}/docnames/${category}/${type}`, null, {
       filter,
       generated
     });
@@ -159,47 +168,47 @@ export class AtelierAPI {
         format
       };
     }
-    return this.request('GET', `v3/${this.ns}/doc/${name}`, params);
+    return this.request('GET', `${this.apiVersion}/${this.ns}/doc/${name}`, params);
   }
 
   putDoc(name: string, data: { enc: boolean; content: string[] }, ignoreConflict?: boolean): Promise<any> {
     let params = { ignoreConflict };
-    return this.request('PUT', `v3/${this.ns}/doc/${name}`, data, params);
+    return this.request('PUT', `${this.apiVersion}/${this.ns}/doc/${name}`, data, params);
   }
 
   actionIndex(docs: string[]): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/index`, docs);
+    return this.request('POST', `${this.apiVersion}/${this.ns}/action/index`, docs);
   }
 
   actionSearch(params: { query: string; files?: string; sys?: boolean; gen?: boolean; max?: number }): Promise<any> {
-    return this.request('GET', `v3/${this.ns}/action/search`, null, params);
+    return this.request('GET', `${this.apiVersion}/${this.ns}/action/search`, null, params);
   }
 
   actionQuery(query: string, parameters: string[]): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/query`, {
+    return this.request('POST', `${this.apiVersion}/${this.ns}/action/query`, {
       query,
       parameters
     });
   }
 
   actionCompile(docs: string[], flags?: string, source = false): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/action/compile`, docs, { flags, source });
+    return this.request('POST', `${this.apiVersion}/${this.ns}/action/compile`, docs, { flags, source });
   }
 
   cvtXmlUdl(source: string): Promise<any> {
-    return this.request('POST', `v3/${this.ns}/cvt/xml/doc`, source, {}, { 'Content-Type': 'application/xml' });
+    return this.request('POST', `${this.apiVersion}/${this.ns}/cvt/xml/doc`, source, {}, { 'Content-Type': 'application/xml' });
   }
 
   getmacrodefinition(docname: string, macroname: string, includes: string[]) {
-    return this.request('POST', `v3/${this.ns}/action/getmacrodefinition`, {
+    return this.request('POST', `${this.apiVersion}/${this.ns}/action/getmacrodefinition`, {
       docname,
       macroname,
       includes
     });
   }
 
   getmacrolocation(docname: string, macroname: string, includes: string[]) {
-    return this.request('POST', `v3/${this.ns}/action/getmacrolocation`, {
+    return this.request('POST', `${this.apiVersion}/${this.ns}/action/getmacrolocation`, {
       docname,
       macroname,
       includes

Diff for: extension.ts

@@ -29,6 +29,7 @@ import { WorkspaceSymbolProvider } from './providers/WorkspaceSymbolProvider';
 export var explorerProvider: ObjectScriptExplorerProvider;
 export var documentContentProvider: DocumentContentProvider;
 export var workspaceState: vscode.Memento;
+export var extensionContext: vscode.ExtensionContext;
 
 export const config = (config?: string, workspaceFolderName?: string): any => {
   workspaceFolderName = workspaceFolderName || currentWorkspaceFolder();
@@ -62,6 +63,7 @@ export function getXmlUri(uri: vscode.Uri): vscode.Uri {
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   const languages = require(context.asAbsolutePath('./package.json'))['contributes']['languages'].map(lang => lang.id);
   workspaceState = context.workspaceState;
+  extensionContext = context;
   workspaceState.update('workspaceFolder', '');
 
   explorerProvider = new ObjectScriptExplorerProvider();

Diff for: package-lock.json

@@ -369,6 +369,19 @@
           "type": "boolean",
           "default": false
         },
+        "objectscript.conn.apiVersion": {
+          "description": "Version of the API to use.",
+          "type": "string",
+          "enum": [
+						"v2",
+						"v3"
+					],
+					"enumDescriptions": [
+						"Use v2 api",
+						"Use v3 api"
+					],
+          "default": "v3"
+        },
         "objectscript.export": {
           "type": "object",
           "description": "Export only the necessary stuff "