ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 09:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)

Browse Source 
* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-11 22:42:23 -08:00
committed by GitHub
parent 82974a2135
commit 4ba6a979ba
280 changed files with 10898 additions and 14231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
View File

@@ -603,14 +603,13 @@ class PreferencesRenderersController extends Disposable {
} else {
/* __GDPR__
"defaultSettings.searchError" : {
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" },
"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
}
*/
const message = getErrorMessage(err).trim();
if (message && message !== 'Error') {
// "Error" = any generic network error
this.telemetryService.publicLog('defaultSettings.searchError', { message, filter });
this.telemetryService.publicLog('defaultSettings.searchError', { message });
this.logService.info('Setting search error: ' + message);
}
return undefined;

16
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
View File

@@ -540,17 +540,6 @@ export class SettingsEditor2 extends BaseEditor {
DOM.append(this.noResultsMessage, this.clearFilterLinkContainer);
const clearSearchContainer = $('span.clear-search');
clearSearchContainer.textContent = ' - ';
const clearSearch = DOM.append(clearSearchContainer, $('a.pointer.prominent', { tabindex: 0 }, localize('clearSearch', 'Clear Search')));
this._register(DOM.addDisposableListener(clearSearch, DOM.EventType.CLICK, (e: MouseEvent) => {
DOM.EventHelper.stop(e, false);
this.clearSearchResults();
}));
DOM.append(this.noResultsMessage, clearSearchContainer);
this._register(attachStylerCallback(this.themeService, { editorForeground }, colors => {
this.noResultsMessage.style.color = colors.editorForeground ? colors.editorForeground.toString() : null;
}));
@@ -1343,14 +1332,13 @@ export class SettingsEditor2 extends BaseEditor {
} else {
/* __GDPR__
"settingsEditor.searchError" : {
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" },
"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
}
*/
const message = getErrorMessage(err).trim();
if (message && message !== 'Error') {
// "Error" = any generic network error
this.telemetryService.publicLog('settingsEditor.searchError', { message, filter });
this.telemetryService.publicLog('settingsEditor.searchError', { message });
this.logService.info('Setting search error: ' + message);
}
return null;