Skip to content

Commit ae75864

Browse files
sandy081sandy081
committed
microsoft#95157 add debug logs for user data changes
1 parent 4c6b933 commit ae75864

9 files changed

Lines changed: 28 additions & 18 deletions

File tree

‎src/vs/workbench/browser/web.main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class BrowserMain extends Disposable {
272272
if (!this.configuration.userDataProvider) {
273273
const remoteUserDataUri = this.getRemoteUserDataUri();
274274
if (remoteUserDataUri) {
275-
this.configuration.userDataProvider = this._register(new FileUserDataProvider(remoteUserDataUri, joinPath(remoteUserDataUri, BACKUPS), remoteFileSystemProvider, environmentService));
275+
this.configuration.userDataProvider = this._register(new FileUserDataProvider(remoteUserDataUri, joinPath(remoteUserDataUri, BACKUPS), remoteFileSystemProvider, environmentService, logService));
276276
}
277277
}
278278
}

‎src/vs/workbench/electron-browser/desktop.main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class DesktopMain extends Disposable {
203203
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
204204

205205
// User Data Provider
206-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(this.environmentService.appSettingsHome, this.environmentService.backupHome, diskFileSystemProvider, this.environmentService));
206+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(this.environmentService.appSettingsHome, this.environmentService.backupHome, diskFileSystemProvider, this.environmentService, logService));
207207

208208
const connection = remoteAgentService.getConnection();
209209
if (connection) {

‎src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class NodeTestBackupFileService extends BackupFileService {
6767
const fileService = new FileService(logService);
6868
const diskFileSystemProvider = new DiskFileSystemProvider(logService);
6969
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
70-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
70+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, logService));
7171

7272
super(environmentService, fileService, logService);
7373

‎src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ suite('ConfigurationEditingService', () => {
110110
const fileService = new FileService(new NullLogService());
111111
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
112112
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
113-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
113+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
114114
instantiationService.stub(IFileService, fileService);
115115
instantiationService.stub(IRemoteAgentService, remoteAgentService);
116116
const workspaceService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService);

‎src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ suite('WorkspaceContextService - Folder', () => {
110110
const fileService = new FileService(new NullLogService());
111111
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
112112
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
113-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, new DiskFileSystemProvider(new NullLogService()), environmentService));
113+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, new DiskFileSystemProvider(new NullLogService()), environmentService, new NullLogService()));
114114
workspaceContextService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(environmentService, new RemoteAuthorityResolverService(), new SignService(undefined), new NullLogService()));
115115
return (<WorkspaceService>workspaceContextService).initialize(convertToWorkspacePayload(URI.file(folderDir)));
116116
});
@@ -176,7 +176,7 @@ suite('WorkspaceContextService - Workspace', () => {
176176
const fileService = new FileService(new NullLogService());
177177
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
178178
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
179-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
179+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
180180
const workspaceService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService);
181181

182182
instantiationService.stub(IWorkspaceContextService, workspaceService);
@@ -236,7 +236,7 @@ suite('WorkspaceContextService - Workspace Editing', () => {
236236
const fileService = new FileService(new NullLogService());
237237
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
238238
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
239-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
239+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
240240
const workspaceService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService);
241241

242242
instantiationService.stub(IWorkspaceContextService, workspaceService);
@@ -497,7 +497,7 @@ suite('WorkspaceService - Initialization', () => {
497497
const fileService = new FileService(new NullLogService());
498498
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
499499
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
500-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
500+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
501501
const workspaceService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService);
502502
instantiationService.stub(IWorkspaceContextService, workspaceService);
503503
instantiationService.stub(IConfigurationService, workspaceService);
@@ -774,7 +774,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
774774
fileService = new FileService(new NullLogService());
775775
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
776776
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
777-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
777+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
778778
workspaceService = disposableStore.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService));
779779
instantiationService.stub(IWorkspaceContextService, workspaceService);
780780
instantiationService.stub(IConfigurationService, workspaceService);
@@ -1199,7 +1199,7 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
11991199
const fileService = new FileService(new NullLogService());
12001200
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
12011201
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
1202-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
1202+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
12031203
const workspaceService = new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService);
12041204

12051205
instantiationService.stub(IWorkspaceContextService, workspaceService);
@@ -1709,7 +1709,7 @@ suite('WorkspaceConfigurationService - Remote Folder', () => {
17091709
const remoteAgentService = instantiationService.stub(IRemoteAgentService, <Partial<IRemoteAgentService>>{ getEnvironment: () => remoteEnvironmentPromise });
17101710
const fileService = new FileService(new NullLogService());
17111711
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
1712-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
1712+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
17131713
const configurationCache: IConfigurationCache = { read: () => Promise.resolve(''), write: () => Promise.resolve(), remove: () => Promise.resolve() };
17141714
testObject = new WorkspaceService({ configurationCache, remoteAuthority }, environmentService, fileService, remoteAgentService);
17151715
instantiationService.stub(IWorkspaceContextService, testObject);

‎src/vs/workbench/services/keybinding/browser/keybindingService.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { INavigatorWithKeyboard, IKeyboard } from 'vs/workbench/services/keybind
4747
import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE } from 'vs/base/common/scanCode';
4848
import { flatten } from 'vs/base/common/arrays';
4949
import { BrowserFeatures, KeyboardSupport } from 'vs/base/browser/canIUse';
50+
import { ILogService } from 'vs/platform/log/common/log';
5051

5152
interface ContributedKeyBinding {
5253
command: string;
@@ -190,6 +191,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
190191
@IHostService private readonly hostService: IHostService,
191192
@IExtensionService extensionService: IExtensionService,
192193
@IFileService fileService: IFileService,
194+
@ILogService logService: ILogService,
193195
@IKeymapService private readonly keymapService: IKeymapService
194196
) {
195197
super(contextKeyService, commandService, telemetryService, notificationService);
@@ -216,13 +218,14 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
216218

217219
this._cachedResolver = null;
218220

219-
this.userKeybindings = this._register(new UserKeybindings(environmentService.keybindingsResource, fileService));
221+
this.userKeybindings = this._register(new UserKeybindings(environmentService.keybindingsResource, fileService, logService));
220222
this.userKeybindings.initialize().then(() => {
221223
if (this.userKeybindings.keybindings.length) {
222224
this.updateResolver({ source: KeybindingSource.User });
223225
}
224226
});
225227
this._register(this.userKeybindings.onDidChange(() => {
228+
logService.debug('User keybindings changed');
226229
this.updateResolver({
227230
source: KeybindingSource.User,
228231
keybindings: this.userKeybindings.keybindings
@@ -642,7 +645,8 @@ class UserKeybindings extends Disposable {
642645

643646
constructor(
644647
private readonly keybindingsResource: URI,
645-
private readonly fileService: IFileService
648+
private readonly fileService: IFileService,
649+
logService: ILogService,
646650
) {
647651
super();
648652

@@ -651,7 +655,10 @@ class UserKeybindings extends Disposable {
651655
this._onDidChange.fire();
652656
}
653657
}), 50));
654-
this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.keybindingsResource))(() => this.reloadConfigurationScheduler.schedule()));
658+
this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.keybindingsResource))(() => {
659+
logService.debug('Keybindings file changed');
660+
this.reloadConfigurationScheduler.schedule();
661+
}));
655662
}
656663

657664
async initialize(): Promise<void> {

‎src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ suite('KeybindingsEditing', () => {
115115
const fileService = new FileService(new NullLogService());
116116
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
117117
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
118-
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService));
118+
fileService.registerProvider(Schemas.userData, new FileUserDataProvider(environmentService.appSettingsHome, environmentService.backupHome, diskFileSystemProvider, environmentService, new NullLogService()));
119119
instantiationService.stub(IFileService, fileService);
120120
instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
121121
instantiationService.stub(IWorkingCopyFileService, instantiationService.createInstance(WorkingCopyFileService));

‎src/vs/workbench/services/userData/common/fileUserDataProvider.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { BACKUPS } from 'vs/platform/environment/common/environment';
1313
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
1414
import { CancellationToken } from 'vs/base/common/cancellation';
1515
import { ReadableStreamEvents } from 'vs/base/common/stream';
16+
import { ILogService } from 'vs/platform/log/common/log';
1617

1718
export class FileUserDataProvider extends Disposable implements
1819
IFileSystemProviderWithFileReadWriteCapability,
@@ -31,7 +32,8 @@ export class FileUserDataProvider extends Disposable implements
3132
private readonly fileSystemUserDataHome: URI,
3233
private readonly fileSystemBackupsHome: URI,
3334
private readonly fileSystemProvider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability,
34-
environmentService: IWorkbenchEnvironmentService
35+
environmentService: IWorkbenchEnvironmentService,
36+
private readonly logService: ILogService,
3537
) {
3638
super();
3739

@@ -127,6 +129,7 @@ export class FileUserDataProvider extends Disposable implements
127129
}
128130
}
129131
if (userDataChanges.length) {
132+
this.logService.debug('User data changed');
130133
this._onDidChangeFile.fire(userDataChanges);
131134
}
132135
}

‎src/vs/workbench/services/userData/test/electron-browser/fileUserDataProvider.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ suite('FileUserDataProvider', () => {
5959
const environmentService = new TestBrowserWorkbenchEnvironmentService({ remoteAuthority: 'remote', workspaceId: 'workspaceId', logsPath: URI.file('logFile') });
6060
environmentService.testUserRoamingDataHome = userDataResource;
6161

62-
const userDataFileSystemProvider = new FileUserDataProvider(URI.file(userDataPath), URI.file(backupsPath), diskFileSystemProvider, environmentService);
62+
const userDataFileSystemProvider = new FileUserDataProvider(URI.file(userDataPath), URI.file(backupsPath), diskFileSystemProvider, environmentService, logService);
6363
disposables.add(userDataFileSystemProvider);
6464
disposables.add(testObject.registerProvider(Schemas.userData, userDataFileSystemProvider));
6565
});
@@ -333,7 +333,7 @@ suite('FileUserDataProvider - Watching', () => {
333333
const environmentService = new TestBrowserWorkbenchEnvironmentService({ remoteAuthority: 'remote', workspaceId: 'workspaceId', logsPath: URI.file('logFile') });
334334
environmentService.testUserRoamingDataHome = userDataResource;
335335

336-
const userDataFileSystemProvider = new FileUserDataProvider(localUserDataResource, localBackupsResource, new TestFileSystemProvider(fileEventEmitter.event), environmentService);
336+
const userDataFileSystemProvider = new FileUserDataProvider(localUserDataResource, localBackupsResource, new TestFileSystemProvider(fileEventEmitter.event), environmentService, new NullLogService());
337337
disposables.add(userDataFileSystemProvider);
338338

339339
testObject = new FileService(new NullLogService());

0 commit comments

Comments
 (0)