Merge branch 'release/v44.5.0' into develop

forcedotcom · Nov 1, 2018 · f2514a7 · f2514a7
2 parents cef71cb + 2116e20
commit f2514a7
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 66 deletions.
diff --git a/SHA256.md b/SHA256.md
@@ -8,22 +8,22 @@ make sure that their SHA values match the values in the list below.
    following the instructions at
    https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
    For example, download,
-   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/44.4.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
+   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/44.5.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
 
 2. From a terminal, run:
 
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
 
-3aec7672fd6ce816b44ea71b524694063ab1d83c788a31ad6f01350a5b71cbe3  salesforcedx-vscode-apex-debugger-44.4.0.vsix
-f2568c541d79deffa40a1235180414232f522d7a9201317bb82a9d0d639d5705  salesforcedx-vscode-apex-replay-debugger-44.4.0.vsix
-6a3b18d98220ae27901390a2ef2e1f1a5a99977f113704e25c97370a953b0581  salesforcedx-vscode-apex-44.4.0.vsix
-5bc29e1c79963ff7ebb17549ce5fb275e7ad61d654d6c83bf9af8f9368108162  salesforcedx-vscode-core-44.4.0.vsix
-3166d99891b110a06ff107818a9a05e758ee359cdc9d770d5ba8a9fb8cfb0f64  salesforcedx-vscode-lightning-44.4.0.vsix
-49838f67fb89b8bf8b8906bc5205a6a966df2264cecebc2c9b82a5da8f93ef47  salesforcedx-vscode-lwc-44.4.0.vsix
-6522991d7687c211d5fb2488ffb33c72ced2dd0a8828c794f5cfe0f386e4610a  salesforcedx-vscode-visualforce-44.4.0.vsix
-6dfa5611b270598fbf1e46e3232d16a038de7c0dbf7e6e7bccc1ce4e947e5c32  salesforcedx-vscode-44.4.0.vsix
+99ca3017c5d3187060d009edc0e62ae8f649263249bdf11092853dff6d99bda5  salesforcedx-vscode-apex-debugger-44.5.0.vsix
+ceb8d8c49a218d75266664b19fb4437705f32e6ee863d8c237d09796d9bfca85  salesforcedx-vscode-apex-replay-debugger-44.5.0.vsix
+bd47b5a49e467e830029160e3eff8b1800c7b61043b958c73c582fafbf80a476  salesforcedx-vscode-apex-44.5.0.vsix
+6d1bd9dd3b30a8d60f9a7d346d547e455cb6488f6b101dbcfb94573281f40b6b  salesforcedx-vscode-core-44.5.0.vsix
+5caf9a9640405ef6df8236edd32b164bac1c7d175d036e45870052f398b6827b  salesforcedx-vscode-lightning-44.5.0.vsix
+e583d2b0fafab8c1cd1bbd6d8f81002ac79351af1c8c3b58d5d7cb4c0182005c  salesforcedx-vscode-lwc-44.5.0.vsix
+8ddd719c60af1d78fbb6b0f918c52c10766d8db3587d3acbb2f39ba3eb5c9dd0  salesforcedx-vscode-visualforce-44.5.0.vsix
+7b782db6f39d52d298bedd46fbecc39f58ab2d3d087cfef8a47b3bcd359ac739  salesforcedx-vscode-44.5.0.vsix
 
 
 4. Change the filename extension for the file that you downloaded from .zip to

diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "44.4.0"
+  "version": "44.5.0"
 }
diff --git a/packages/salesforcedx-apex-debugger/package.json b/packages/salesforcedx-apex-debugger/package.json
@@ -2,15 +2,15 @@
   "name": "@salesforce/salesforcedx-apex-debugger",
   "displayName": "Apex Debugger Adapter",
   "description": "Implements the VS Code Debug Protocol for the Apex Debugger",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "categories": ["Debuggers"],
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "async-lock": "1.0.0",
     "faye": "1.1.2",
     "request-light": "0.2.1",

diff --git a/packages/salesforcedx-apex-replay-debugger/package.json b/packages/salesforcedx-apex-replay-debugger/package.json
@@ -3,7 +3,7 @@
   "displayName": "Apex Replay Debug Adapter",
   "description":
     "Implements the VS Code Debug Protocol for the Apex Replay Debugger",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "preview": true,
   "license": "BSD-3-Clause",
@@ -12,7 +12,7 @@
   },
   "categories": ["Debuggers"],
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "vscode-debugadapter": "1.28.0",
     "vscode-debugprotocol": "1.28.0",
     "vscode-uri": "1.0.1"

diff --git a/packages/salesforcedx-slds-linter/package.json b/packages/salesforcedx-slds-linter/package.json
@@ -2,7 +2,7 @@
   "name": "@salesforce/salesforcedx-slds-linter",
   "displayName": "SFDX SLDS Linting for VS Code",
   "description": "Provides linting for deprecated SLDS class names",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "categories": ["Other"],
@@ -42,7 +42,7 @@
     "reporter": ["text-summary", "lcov"]
   },
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "vscode-languageclient": "3.5.1",
     "vscode-languageserver": "3.5.1"
   }

diff --git a/packages/salesforcedx-sobjects-faux-generator/package.json b/packages/salesforcedx-sobjects-faux-generator/package.json
@@ -3,14 +3,14 @@
   "displayName": "Salesforce SObject Faux Generator",
   "description":
     "Fetches sobjects and generates their faux apex class to be used for Apex Language Server",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "cross-spawn": "6.0.5",
     "request-light": "0.2.1",
     "rxjs": "^5.4.1",

diff --git a/packages/salesforcedx-utils-vscode/package.json b/packages/salesforcedx-utils-vscode/package.json
@@ -3,7 +3,7 @@
   "displayName": "SFDX Utilities for VS Code",
   "description":
     "Provides utilies to interface the SFDX libraries with VS Code",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "categories": ["Other"],

diff --git a/packages/salesforcedx-visualforce-language-server/package.json b/packages/salesforcedx-visualforce-language-server/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@salesforce/salesforcedx-visualforce-language-server",
   "description": "Visualforce language server",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "dependencies": {
-    "@salesforce/salesforcedx-visualforce-markup-language-server": "44.4.0",
+    "@salesforce/salesforcedx-visualforce-markup-language-server": "44.5.0",
     "vscode-css-languageservice": "2.1.9",
     "vscode-languageserver": "3.4.2",
     "vscode-languageserver-protocol": "3.4.2",

diff --git a/packages/salesforcedx-visualforce-markup-language-server/package.json b/packages/salesforcedx-visualforce-markup-language-server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/salesforcedx-visualforce-markup-language-server",
   "description": "Language service for Visualforce Markup",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {

diff --git a/packages/salesforcedx-vscode-apex-debugger/package.json b/packages/salesforcedx-vscode-apex-debugger/package.json
@@ -14,15 +14,15 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "categories": ["Debuggers"],
   "dependencies": {
-    "@salesforce/salesforcedx-apex-debugger": "44.4.0",
+    "@salesforce/salesforcedx-apex-debugger": "44.5.0",
     "vscode-debugprotocol": "1.28.0",
     "vscode-extension-telemetry": "0.0.17"
   },

diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/package.json b/packages/salesforcedx-vscode-apex-replay-debugger/package.json
@@ -14,15 +14,15 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "categories": ["Debuggers"],
   "dependencies": {
-    "@salesforce/salesforcedx-apex-replay-debugger": "44.4.0",
+    "@salesforce/salesforcedx-apex-replay-debugger": "44.5.0",
     "async-lock": "1.0.0",
     "path-exists": "3.0.0",
     "request-light": "0.2.1",

diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts b/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts
@@ -14,6 +14,9 @@ import { nls } from '../messages';
 
 export class DebugConfigurationProvider
   implements vscode.DebugConfigurationProvider {
+  private sfdxApex = vscode.extensions.getExtension(
+    'salesforce.salesforcedx-vscode-apex'
+  );
   public static getConfig(logFile?: string) {
     return {
       name: nls.localize('config_name_text'),
@@ -38,7 +41,9 @@ export class DebugConfigurationProvider
     token?: vscode.CancellationToken
   ): vscode.ProviderResult<vscode.DebugConfiguration> {
     return this.asyncDebugConfig(config).catch(async err => {
-      return vscode.window.showErrorMessage(err.message).then(x => undefined);
+      return vscode.window
+        .showErrorMessage(err.message, { modal: true })
+        .then(x => undefined);
     });
   }
 
@@ -64,13 +69,30 @@ export class DebugConfigurationProvider
       config.projectPath = vscode.workspace.workspaceFolders[0].uri.fsPath;
     }
 
-    const sfdxApex = vscode.extensions.getExtension(
-      'salesforce.salesforcedx-vscode-apex'
-    );
-    if (sfdxApex && sfdxApex.exports) {
-      config.lineBreakpointInfo = await sfdxApex.exports.getLineBreakpointInfo();
+    if (this.sfdxApex && this.sfdxApex.exports) {
+      await this.isLanguageClientReady();
+      config.lineBreakpointInfo = await this.sfdxApex.exports.getLineBreakpointInfo();
     }
-
     return config;
   }
+
+  private async isLanguageClientReady() {
+    let expired = false;
+    let i = 0;
+    while (
+      this.sfdxApex &&
+      this.sfdxApex.exports &&
+      !this.sfdxApex.exports.isLanguageClientReady() &&
+      !expired
+    ) {
+      await new Promise(r => setTimeout(r, 100));
+      if (i >= 30) {
+        expired = true;
+      }
+      i++;
+    }
+    if (expired) {
+      throw Error(nls.localize('language_client_not_ready'));
+    }
+  }
 }
diff --git a/...sforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts b/...sforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts
@@ -96,13 +96,7 @@ describe('Configuration provider', () => {
       expect(config.stopOnEntry).to.equals(true);
       expect(config.trace).to.equals(true);
       expect(config.projectPath).to.not.equals(undefined);
-      expect(config.lineBreakpointInfo).to.deep.equals([
-        {
-          uri: '/force-app/main/default/classes/A.cls',
-          typeref: 'A',
-          lines: [2, 5, 6, 7]
-        }
-      ]);
+      expect(config.lineBreakpointInfo).to.not.equals(undefined);
     } else {
       expect.fail(
         'Did not get configuration information from resolveDebugConfiguration'
@@ -128,13 +122,7 @@ describe('Configuration provider', () => {
       expect(config.stopOnEntry).to.equals(false);
       expect(config.trace).to.equals(false);
       expect(config.projectPath).to.not.equals(undefined);
-      expect(config.lineBreakpointInfo).to.deep.equals([
-        {
-          uri: '/force-app/main/default/classes/A.cls',
-          typeref: 'A',
-          lines: [2, 5, 6, 7]
-        }
-      ]);
+      expect(config.lineBreakpointInfo).to.not.equals(undefined);
     } else {
       expect.fail(
         'Did not get configuration information from resolveDebugConfiguration'

diff --git a/packages/salesforcedx-vscode-apex/package.json b/packages/salesforcedx-vscode-apex/package.json
@@ -15,7 +15,7 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
@@ -169,7 +169,7 @@
   },
   "dependencies": {
     "@salesforce/apex-tmlanguage": "1.1.0",
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "expand-home-dir": "0.0.3",
     "find-java-home": "0.2.0",
     "path-exists": "3.0.0",

diff --git a/packages/salesforcedx-vscode-core/package.json b/packages/salesforcedx-vscode-core/package.json
@@ -15,7 +15,7 @@
     "theme": "light"
   },
   "aiKey": "ec3632a4-df47-47a4-98dc-8134cacbaf7e",
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
@@ -24,8 +24,8 @@
   "categories": ["Other"],
   "dependencies": {
     "@salesforce/core": "0.18.2",
-    "@salesforce/salesforcedx-sobjects-faux-generator": "44.4.0",
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-sobjects-faux-generator": "44.5.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "adm-zip": "0.4.7",
     "applicationinsights": "1.0.6",
     "glob": "^7.1.2",

diff --git a/packages/salesforcedx-vscode-lightning/package.json b/packages/salesforcedx-vscode-lightning/package.json
@@ -14,19 +14,19 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.26.0"
   },
   "categories": ["Programming Languages"],
   "dependencies": {
-    "@salesforce/salesforcedx-slds-linter": "44.4.0",
+    "@salesforce/salesforcedx-slds-linter": "44.5.0",
     "vscode-extension-telemetry": "0.0.17"
   },
   "devDependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "@types/chai": "^4.0.0",
     "@types/mocha": "2.2.38",
     "@types/node": "8.9.3",

diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json
@@ -14,7 +14,7 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "preview": true,
   "license": "BSD-3-Clause",
@@ -23,7 +23,7 @@
   },
   "categories": ["Programming Languages"],
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "ajv": "^6.1.1",
     "lwc-language-server": "1.6.7",
     "rxjs": "^5.4.1",

diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json
@@ -14,7 +14,7 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "preview": true,
   "license": "BSD-3-Clause",
@@ -23,7 +23,7 @@
   },
   "categories": ["Programming Languages"],
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "ajv": "^6.1.1",
     "eslint": "4.16.0",
     "lwc-language-server": "1.6.7",

diff --git a/packages/salesforcedx-vscode-visualforce/package.json b/packages/salesforcedx-vscode-visualforce/package.json
@@ -14,24 +14,24 @@
     "color": "#ECECEC",
     "theme": "light"
   },
-  "version": "44.4.0",
+  "version": "44.5.0",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
     "vscode": "^1.17.0"
   },
   "categories": ["Languages"],
   "dependencies": {
-    "@salesforce/salesforcedx-visualforce-language-server": "44.4.0",
-    "@salesforce/salesforcedx-visualforce-markup-language-server": "44.4.0",
+    "@salesforce/salesforcedx-visualforce-language-server": "44.5.0",
+    "@salesforce/salesforcedx-visualforce-markup-language-server": "44.5.0",
     "typescript": "2.6.2",
     "vscode-extension-telemetry": "0.0.17",
     "vscode-languageclient": "3.4.2",
     "vscode-languageserver-protocol": "3.4.2",
     "vscode-languageserver-types": "3.4.0"
   },
   "devDependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "44.4.0",
+    "@salesforce/salesforcedx-utils-vscode": "44.5.0",
     "@types/chai": "^4.0.0",
     "@types/mocha": "2.2.38",
     "@types/node": "8.9.3",