Skip to content

suggester: fixes #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ngalaiko merged 1 commit into from
Aug 15, 2022
Merged

suggester: fixes #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions src/suggester/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {suggest} from '../lib/github'
import {get} from '../lib/jobs'
import {Octokit, required} from '../lib'
import {ForbiddenError} from '../lib/api'
import {exists} from 'fs'

const jobID = required('codeball-job-id')
const githubToken = required('GITHUB_TOKEN')
Expand All @@ -24,8 +23,6 @@ const run = async (): Promise<void> => {
const repoName = github.context.payload.repository?.name
if (!repoName) throw new Error('No repo name found')

github.context.payload.comment?.id

const pr = await octokit.pulls
.get({
owner: repoOwner,
Expand Down Expand Up @@ -63,8 +60,6 @@ const run = async (): Promise<void> => {
})
}

const count = (str: string, substr: string) => str.split(substr).length - 1

const suggestViaGitHub = async ({
owner,
repo,
Expand Down Expand Up @@ -108,7 +103,7 @@ const suggestViaGitHub = async ({
start_side?: 'LEFT' | 'RIGHT'
}

const isSuggestionMultiline = suggestion.from_line > suggestion.to_line
const isSuggestionMultiline = suggestion.from_line !== suggestion.to_line
if (isSuggestionMultiline) {
request.start_line = suggestion.from_line
request.start_side = 'RIGHT'
Expand All @@ -133,7 +128,6 @@ const suggestViaGitHub = async ({
const inReplyTo = existingComments.find(comment => {
if (!comment.line) return false

const isSuggestionMultiline = suggestion.from_line > suggestion.to_line
const isGithubCommentMultiline = !!comment.start_line

if (!isSuggestionMultiline && !isGithubCommentMultiline)
Expand All @@ -149,14 +143,19 @@ const suggestViaGitHub = async ({
})

if (inReplyTo) {
octokit.pulls.createReplyForReviewComment({
const replyRequest = {
owner,
repo,
pull_number,
body: request.body,
comment_id: inReplyTo.id
})
}
octokit.pulls.createReplyForReviewComment(replyRequest)
core.debug(
`creating reply review comment ${JSON.stringify(replyRequest)}`
)
} else {
core.debug(`creating review comment ${JSON.stringify(request)}`)
octokit.pulls.createReviewComment(request)
}
})
Expand Down