Skip to content

Commit

Permalink
Diff API: pass FolderDiffSession parent to startFileEdit
Browse files Browse the repository at this point in the history
  • Loading branch information
kirillp committed Feb 13, 2025
1 parent 6d9248c commit 0b1a740
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
5 changes: 4 additions & 1 deletion filediff-node-module/module/diff.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ export interface DiffEngine extends IDisposable {
folderDiff?: FolderDiffSession
): FileDiffSession;

startFileEdit(file: FileInput, channel: Channel): FileDiffSession;
startFileEdit(
file: FileInput, channel: Channel,
folderDiff?: FolderDiffSession
): FileDiffSession;

testApi(): DiffTestApi;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ public JsFileDiffSession startFileDiff(
}

@Override
public JsFileDiffSession startFileEdit(JsFileInput input, Channel channel) {
public JsFileDiffSession startFileEdit(
JsFileInput input, Channel channel,
JsFolderDiffSession parent
) {
JsHelper.consoleInfo("Starting file edit ...");

boolean isFile = JsFileInput.isPath(input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@ JsFileDiffSession startFileDiff(

// startFileEdit(
// path: string,
// channel: Channel
// channel: Channel,
// folderDiff?: FolderDiffSession
// ): FileDiffSession;

JsFileDiffSession startFileEdit(JsFileInput path, Channel channel);
JsFileDiffSession startFileEdit(
JsFileInput path, Channel channel,
JsFolderDiffSession parent
);

JsDiffTestApi testApi();
}

0 comments on commit 0b1a740

Please sign in to comment.