Skip to content

Commit 2d52900

Browse files
test folder file
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 45d6e51 commit 2d52900

1 file changed

Lines changed: 5 additions & 55 deletions

File tree

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

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -347,51 +347,6 @@ export class BrowserMain extends Disposable {
347347
serviceCollection.set(IRemoteAgentService, remoteAgentService);
348348
this._register(RemoteFileSystemProviderClient.register(remoteAgentService, fileService, logService));
349349

350-
// Policies (file-based in web)
351-
const policyFile = joinPath(environmentService.userRoamingDataHome, 'policies.json');
352-
const policyService = new FilePolicyService(policyFile, fileService, logService);
353-
serviceCollection.set(IPolicyService, policyService);
354-
355-
// Action: Import policies.json from local file system into user data
356-
this._register(registerAction2(class ImportPoliciesFromFileAction extends Action2 {
357-
constructor() {
358-
super({
359-
id: 'workbench.action.importPoliciesFromFile',
360-
title: localize2('importPoliciesFromFile', "Import Policies from File"),
361-
category: Categories.Developer,
362-
menu: { id: MenuId.CommandPalette }
363-
});
364-
}
365-
async run(accessor: ServicesAccessor): Promise<void> {
366-
const fileDialogService = accessor.get(IFileDialogService);
367-
const fileService = accessor.get(IFileService);
368-
const envService = accessor.get(IBrowserWorkbenchEnvironmentService);
369-
const logService = accessor.get(ILogService);
370-
371-
const result = await fileDialogService.showOpenDialog({
372-
title: localize('selectPoliciesJson', "Select policies.json"),
373-
canSelectFiles: true,
374-
canSelectFolders: false,
375-
canSelectMany: false,
376-
filters: [{ name: localize('jsonFiles', "JSON"), extensions: ['json'] }],
377-
availableFileSystems: [Schemas.file]
378-
});
379-
const picked = result?.[0];
380-
if (!picked) {
381-
return;
382-
}
383-
384-
try {
385-
const content = await fileService.readFile(picked);
386-
const destination = joinPath(envService.userRoamingDataHome, 'policies.json');
387-
await fileService.writeFile(destination, content.value);
388-
logService.info('Policies imported to', String(destination));
389-
} catch (error) {
390-
logService.error('Failed to import policies.json', error);
391-
}
392-
}
393-
}));
394-
395350
// Long running services (workspace, config, storage)
396351
const [configurationService, storageService] = await Promise.all([
397352
this.createWorkspaceService(workspace, environmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, policyService, logService).then(service => {
@@ -414,22 +369,17 @@ export class BrowserMain extends Disposable {
414369
})
415370
]);
416371

417-
// If workspace has a .vscode/policies.json, copy it into user data so FilePolicyService can consume it
418372
try {
419373
const folders = configurationService.getWorkspace().folders;
374+
console.log('!!!!!!!!! before');
420375
if (folders.length) {
421376
const workspacePolicies = joinPath(folders[0].uri, '.vscode', 'policies.json');
422-
const destPolicies = joinPath(environmentService.userRoamingDataHome, 'policies.json');
423-
try {
424-
const content = await fileService.readFile(workspacePolicies);
425-
await fileService.writeFile(destPolicies, content.value);
426-
logService.info('Loaded policies from workspace:', String(workspacePolicies));
427-
} catch {
428-
// ignore if not present
429-
}
377+
console.log('!!! workspacePolicies', workspacePolicies);
378+
const policyService = new FilePolicyService(workspacePolicies, fileService, logService);
379+
serviceCollection.set(IPolicyService, policyService);
430380
}
431381
} catch {
432-
// ignore
382+
console.log('!!! workspacePolicies ERROR ');
433383
}
434384

435385
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

0 commit comments

Comments
 (0)