Skip to content

Commit d8847c8

Browse files
committed
microsoft#146161 - consider settings editor config
1 parent aefb335 commit d8847c8

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/vs/workbench/contrib/preferences/browser/preferencesActions.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { ILanguageService } from 'vs/editor/common/languages/language';
1111
import * as nls from 'vs/nls';
1212
import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
1313
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
14+
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1415

1516
export class ConfigureLanguageBasedSettingsAction extends Action {
1617

@@ -23,7 +24,8 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
2324
@IModelService private readonly modelService: IModelService,
2425
@ILanguageService private readonly languageService: ILanguageService,
2526
@IQuickInputService private readonly quickInputService: IQuickInputService,
26-
@IPreferencesService private readonly preferencesService: IPreferencesService
27+
@IPreferencesService private readonly preferencesService: IPreferencesService,
28+
@IConfigurationService private readonly configurationService: IConfigurationService,
2729
) {
2830
super(id, label);
2931
}
@@ -55,7 +57,11 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
5557
if (pick) {
5658
const languageId = this.languageService.getLanguageIdByLanguageName(pick.label);
5759
if (typeof languageId === 'string') {
58-
return this.preferencesService.openUserSettings({ query: `@lang:${languageId}` });
60+
if (this.configurationService.getValue('workbench.settings.editor') === 'json') {
61+
return this.preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: `[${languageId}]`, edit: true } });
62+
} else {
63+
return this.preferencesService.openUserSettings({ query: `@lang:${languageId}` });
64+
}
5965
}
6066
}
6167
return undefined;

0 commit comments

Comments
 (0)