@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
7
7
import { ConfigurationScope , IConfigurationNode , IConfigurationRegistry , Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry' ;
8
8
import { Registry } from 'vs/platform/registry/common/platform' ;
9
9
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' ;
11
11
import { ConfigurationTarget , IConfigurationOverrides , IConfigurationService , IConfigurationValue } from 'vs/platform/configuration/common/configuration' ;
12
12
import { Disposable } from 'vs/base/common/lifecycle' ;
13
13
import { Emitter } from 'vs/base/common/event' ;
@@ -97,12 +97,17 @@ export class ConfigurationMigrationWorkbenchContribution extends Disposable impl
97
97
private async migrateConfigurationsForFolderAndOverride ( migration : ConfigurationMigration , resource ?: URI ) : Promise < void > {
98
98
const inspectData = this . configurationService . inspect ( migration . key , { resource } ) ;
99
99
100
- const targetPairs : [ keyof IConfigurationValue < any > , ConfigurationTarget ] [ ] = [
100
+ const targetPairs : [ keyof IConfigurationValue < any > , ConfigurationTarget ] [ ] = this . workspaceService . getWorkbenchState ( ) === WorkbenchState . WORKSPACE ? [
101
101
[ 'user' , ConfigurationTarget . USER ] ,
102
102
[ 'userLocal' , ConfigurationTarget . USER_LOCAL ] ,
103
103
[ 'userRemote' , ConfigurationTarget . USER_REMOTE ] ,
104
104
[ 'workspace' , ConfigurationTarget . WORKSPACE ] ,
105
105
[ 'workspaceFolder' , ConfigurationTarget . WORKSPACE_FOLDER ] ,
106
+ ] : [
107
+ [ 'user' , ConfigurationTarget . USER ] ,
108
+ [ 'userLocal' , ConfigurationTarget . USER_LOCAL ] ,
109
+ [ 'userRemote' , ConfigurationTarget . USER_REMOTE ] ,
110
+ [ 'workspace' , ConfigurationTarget . WORKSPACE ] ,
106
111
] ;
107
112
for ( const [ dataKey , target ] of targetPairs ) {
108
113
const migrationValues : [ [ string , ConfigurationValue ] , string [ ] ] [ ] = [ ] ;
0 commit comments