Skip to content

Commit 640bb97

Browse files
authored
1 parent 11e16d4 commit 640bb97

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/vs/workbench/common/configuration.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
77
import { ConfigurationScope, IConfigurationNode, IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
88
import { Registry } from 'vs/platform/registry/common/platform';
99
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
10-
import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
10+
import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
1111
import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService, IConfigurationValue } from 'vs/platform/configuration/common/configuration';
1212
import { Disposable } from 'vs/base/common/lifecycle';
1313
import { Emitter } from 'vs/base/common/event';
@@ -97,12 +97,17 @@ export class ConfigurationMigrationWorkbenchContribution extends Disposable impl
9797
private async migrateConfigurationsForFolderAndOverride(migration: ConfigurationMigration, resource?: URI): Promise<void> {
9898
const inspectData = this.configurationService.inspect(migration.key, { resource });
9999

100-
const targetPairs: [keyof IConfigurationValue<any>, ConfigurationTarget][] = [
100+
const targetPairs: [keyof IConfigurationValue<any>, ConfigurationTarget][] = this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE ? [
101101
['user', ConfigurationTarget.USER],
102102
['userLocal', ConfigurationTarget.USER_LOCAL],
103103
['userRemote', ConfigurationTarget.USER_REMOTE],
104104
['workspace', ConfigurationTarget.WORKSPACE],
105105
['workspaceFolder', ConfigurationTarget.WORKSPACE_FOLDER],
106+
] : [
107+
['user', ConfigurationTarget.USER],
108+
['userLocal', ConfigurationTarget.USER_LOCAL],
109+
['userRemote', ConfigurationTarget.USER_REMOTE],
110+
['workspace', ConfigurationTarget.WORKSPACE],
106111
];
107112
for (const [dataKey, target] of targetPairs) {
108113
const migrationValues: [[string, ConfigurationValue], string[]][] = [];

0 commit comments

Comments
 (0)