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 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

Browse Source 
* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features
This commit is contained in:
Anthony Dresser
2019-09-19 21:50:52 -07:00
committed by GitHub
parent 9d3d64eef3
commit db498db0a8
459 changed files with 10195 additions and 7528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
View File

@@ -24,7 +24,7 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
import { nullRange } from 'vs/workbench/services/preferences/common/preferencesModels';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IStringDictionary } from 'vs/base/common/collections';
import { IProductService } from 'vs/platform/product/common/product';
import { IProductService } from 'vs/platform/product/common/productService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
export interface IEndpointDetails {

7
src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
View File

@@ -195,6 +195,11 @@ export const tocData: ITOCEntry = {
id: 'application/telemetry',
label: localize('telemetry', "Telemetry"),
settings: ['telemetry.*']
},
{
id: 'application/sync',
label: localize('sync', "Sync"),
settings: ['userConfiguration.*']
}
]
}
@@ -218,3 +223,5 @@ export const knownAcronyms = new Set<string>();
export const knownTermMappings = new Map<string, string>();
knownTermMappings.set('power shell', 'PowerShell');
knownTermMappings.set('powershell', 'PowerShell');
knownTermMappings.set('javascript', 'JavaScript');
knownTermMappings.set('typescript', 'TypeScript');