ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 02:32:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 10492ba146318412cbee8b76a8c630f226914734

Browse Source
This commit is contained in:
ADS Merger
2020-04-08 06:33:38 +00:00
parent fca2344c2e
commit 1868a7d370
339 changed files with 3795 additions and 3146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/platform/userDataSync/common/snippetsSync.ts
View File

@@ -416,7 +416,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
}
for (const entry of stat.children || []) {
const resource = entry.resource;
if (extname(resource) === '.json') {
const extension = extname(resource);
if (extension === '.json' || extension === '.code-snippet') {
const key = relativePath(this.snippetsFolder, resource)!;
const content = await this.fileService.readFile(resource);
snippets[key] = content;

2
src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
View File

@@ -33,7 +33,7 @@ export class UserDataSyncEnablementService extends Disposable implements IUserDa
@IEnvironmentService environmentService: IEnvironmentService,
) {
super();
switch (environmentService.args['sync']) {
switch (environmentService.sync) {
case 'on':
this.setEnablement(true);
break;

4
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
View File

@@ -43,9 +43,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
const headers: IHeaders = {
'X-Sync-Client-Id': productService.version,
};
if (uuid) {
headers['X-Sync-Machine-Id'] = uuid;
}
headers['X-Sync-Machine-Id'] = uuid;
return headers;
});
}