Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions extension/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions extension/src/batch/accepted-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,27 @@ export interface AcceptedItem {
uri: vscode.Uri;
}


export class AcceptedListProvider implements vscode.TreeDataProvider<AcceptedItem> {
export class AcceptedListProvider
implements vscode.TreeDataProvider<AcceptedItem>
{
private onChange = new vscode.EventEmitter<void>();
readonly onDidChangeTreeData = this.onChange.event;

constructor(private readonly worker: Worker) {
worker.onDidChange(() => this.onChange.fire());
}

getChildren(element?: AcceptedItem): AcceptedItem[] {
if (element) {
return [];
}

return this.worker.accepted.map(({ uri }) => ({
label: path.basename(uri.fsPath),
uri
uri,
}));
}

getTreeItem(acceptedItem: AcceptedItem): vscode.TreeItem {
const item = new vscode.TreeItem(acceptedItem.label);

Expand All @@ -38,7 +39,7 @@ export class AcceptedListProvider implements vscode.TreeDataProvider<AcceptedIte
title: "Open File",
arguments: [acceptedItem.uri],
};

return item;
}
}
}
10 changes: 6 additions & 4 deletions extension/src/batch/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,17 @@ export class Worker {
this.maybeStart();
}
}

acceptCompleted(javaUri: vscode.Uri, kotlinUri: vscode.Uri) {
const completedIdx = this.completed.findIndex(completedJob => completedJob.job.javaUri.fsPath === javaUri.fsPath);
const completedIdx = this.completed.findIndex(
(completedJob) => completedJob.job.javaUri.fsPath === javaUri.fsPath,
);
if (completedIdx >= 0) {
// remove from completed
this.completed.splice(completedIdx, 1);
}

this.accepted.push({uri: kotlinUri});
this.accepted.push({ uri: kotlinUri });
this.onChange.fire();
}

Expand All @@ -166,7 +168,7 @@ export class Worker {
);
}
}

restoreAccepted(uris: vscode.Uri[]) {
this.accepted = uris.map((uri) => ({ uri }));
this.onChange.fire();
Expand Down
Loading