From db5156e4cd68dd8de11534f16f4bb247cbf45c90 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Sun, 29 Apr 2018 13:19:09 -0700 Subject: [PATCH] Fix app name in Report Issue dialog (#1292) --- .../code/electron-browser/issue/issueReporterMain.ts | 11 ++++++----- .../code/electron-browser/issue/issueReporterModel.ts | 3 ++- .../issue/test/testReporterModel.test.ts | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 8ba861100f..d0d81f9895 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -462,11 +462,12 @@ export class IssueReporter extends Disposable { response.json().then(result => { this.clearSearchResults(); - if (result && result.candidates) { - this.displaySearchResults(result.candidates); - } else { - throw new Error('Unexpected response, no candidates property'); - } + // {{SQL CARBON EDIT}} + // if (result && result.candidates) { + // this.displaySearchResults(result.candidates); + // } else { + // throw new Error('Unexpected response, no candidates property'); + // } }).catch((error) => { this.logSearchError(error); }); diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index 4c9c59300f..0ad65606ed 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -59,13 +59,14 @@ export class IssueReporterModel { assign(this._data, newData); } + // {{SQL CARBON EDIT}} serialize(): string { return ` Issue Type: ${this.getIssueTypeTitle()} ${this._data.issueDescription} -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} +SQL Operations Studio version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} OS version: ${this._data.versionInfo && this._data.versionInfo.os} ${this.getInfos()} diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts index 742b10db4d..5fbd7007f6 100644 --- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts +++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts @@ -23,6 +23,7 @@ suite('IssueReporter', () => { }); }); + // {{SQL CARBON EDIT}} test('serializes model skeleton when no data is provided', () => { const issueReporterModel = new IssueReporterModel(); assert.equal(issueReporterModel.serialize(), @@ -31,7 +32,7 @@ Issue Type: Feature Request undefined -VS Code version: undefined +SQL Operations Studio version: undefined OS version: undefined