sussudio
Version:
An unofficial VS Code Internal API
14 lines (13 loc) • 944 B
text/typescript
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { FormattingOptions } from "../../../base/common/jsonFormatter.mjs";
import { IUserFriendlyKeybinding } from "../../keybinding/common/keybinding.mjs";
import { IUserDataSyncUtilService } from "./userDataSync.mjs";
export declare function parseKeybindings(content: string): IUserFriendlyKeybinding[];
export declare function merge(localContent: string, remoteContent: string, baseContent: string | null, formattingOptions: FormattingOptions, userDataSyncUtilService: IUserDataSyncUtilService): Promise<{
mergeContent: string;
hasChanges: boolean;
hasConflicts: boolean;
}>;