Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add revealSetting and focusSearch params #187079

Merged
merged 1 commit into from
Jul 11, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
import { Schemas } from 'vs/base/common/network';
import { isObject } from 'vs/base/common/types';
import { isBoolean, isObject, isString } from 'vs/base/common/types';
import { URI } from 'vs/base/common/uri';
import 'vs/css!./media/preferences';
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
Expand Down Expand Up @@ -126,17 +126,43 @@ const category = { value: nls.localize('preferences', "Preferences"), original:
interface IOpenSettingsActionOptions {
openToSide?: boolean;
query?: string;
revealSetting?: {
key: string;
edit?: boolean;
};
focusSearch?: boolean;
}

function sanitizeBoolean(arg: any): boolean | undefined {
return isBoolean(arg) ? arg : undefined;
}

function sanitizeString(arg: any): string | undefined {
return isString(arg) ? arg : undefined;
}

function sanitizeOpenSettingsArgs(args: any): IOpenSettingsActionOptions {
if (!isObject(args)) {
args = {};
}

return {
openToSide: args.openToSide,
query: args.query
let sanitizedObject: IOpenSettingsActionOptions = {
focusSearch: sanitizeBoolean(args?.focusSearch),
openToSide: sanitizeBoolean(args?.openToSide),
query: sanitizeString(args?.query)
};

if (isString(args?.revealSetting?.key)) {
sanitizedObject = {
...sanitizedObject,
revealSetting: {
key: args.revealSetting.key,
edit: sanitizeBoolean(args.revealSetting?.edit)
}
};
}

return sanitizedObject;
}

class PreferencesActionsContribution extends Disposable implements IWorkbenchContribution {
Expand Down