163
164
protected async getMergeResult(resourcePreview: ISettingsResourcePreview, token: CancellationToken): Promise<IMergeResult> {
165
>
const formatUtils = await this.getFormattingOptions();
settingsSync.ts
166
>
const ignoredSettings = await this.getIgnoredSettings();
167
>
return {
168
>
...resourcePreview.previewResult,
169
>
170
>
// remove ignored settings from the preview content
171
>
content: resourcePreview.previewResult.content ? updateIgnoredSettings(resourcePreview.previewResult.content, '{}', ignoredSettings, formatUtils) : null
172
>
};
173
>
}
174
175
protected async getAcceptResult(resourcePreview: ISettingsResourcePreview, resource: URI, content: string | null | undefined, token: CancellationToken): Promise<IAcceptResult> {
177
>
const formattingOptions = await this.getFormattingOptions();
178
>
const ignoredSettings = await this.getIgnoredSettings();
179
>
180
>
/* Accept local resource */
181
>
if (this.extUri.isEqual(resource, this.localResource)) {
182
return {
183
/* Remove ignored settings */