From 98af7ffdbd7bc927284ed8e1ead42ee68835f75b Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Sun, 12 Mar 2023 10:03:08 +0100 Subject: [PATCH 1/2] Add config for app issue-branch-name --- .github/issue-branch.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/issue-branch.yml diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 0000000000..c50919ad70 --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,9 @@ +branchName: full +silent: false +autoCloseIssue: true + +branches: + - label: enhancement + prefix: feature/ + - label: bug + prefix: bugfix/ From 88052a297ee071b9bce894aa8939992992b15235 Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Sun, 12 Mar 2023 10:24:00 +0100 Subject: [PATCH 2/2] Some comments are attached to the file and have not reference/selection in the content. Need to be removed. --- src/view/treeNodes/fileChangeNode.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/view/treeNodes/fileChangeNode.ts b/src/view/treeNodes/fileChangeNode.ts index bbc2ed6c3b..0b37bebf6d 100644 --- a/src/view/treeNodes/fileChangeNode.ts +++ b/src/view/treeNodes/fileChangeNode.ts @@ -166,7 +166,7 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem { updateShowOptions() { const reviewThreads = this.pullRequest.reviewThreadsCache; - const reviewThreadsForNode = reviewThreads.filter(thread => !thread.isDeleted && thread.path === this.fileName); + let reviewThreadsForNode = reviewThreads.filter(thread => !thread.isDeleted && thread.path === this.fileName); DecorationProvider.updateFileComments( this.resourceUri, @@ -174,6 +174,8 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem { this.fileName, reviewThreadsForNode.length > 0, ); + /* Some comments are attached to the file and have not reference/selection in the content. Need to be removed here. */ + reviewThreadsForNode = reviewThreadsForNode.filter((thread) => thread.line !== undefined); if (reviewThreadsForNode.length) { reviewThreadsForNode.sort((a, b) => a.line - b.line);