Commitccfcbcd

committed

feat(commit): integrate GitHub issue context into AI generation#408

Enhance AI commit message generation by incorporating selected GitHub issue information into the prompt context, allowing the AI to generate more relevant commit messages that reference the related issue and its details.

1 parent61b5395 commitccfcbcdCopy full SHA for ccfcbcd

File tree

3 files changed

+41

-13

lines changed

core/src/main/resources/genius
- en/practises
  - gen-commit-msg.vm
- zh/practises
  - gen-commit-msg.vm
exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs
- CommitMessageSuggestionAction.kt

3 files changed

+41

-13

lines changed

`‎core/src/main/resources/genius/en/practises/gen-commit-msg.vm‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ $context.historyExamples`
`24`	`24`	`User origin intention was: $context.originText`
`25`	`25`	`#end`
`26`	`26`
	`27`	`+#if($context.issueId.length() > 0)`
	`28`	`+Related GitHub Issue: #$context.issueId`
	`29`	`+$context.issueDetail`
	`30`	`+#end`
	`31`	`+`
`27`	`32`	`Diff:`
`28`	`33`
`29`	`34`	```diff

`‎core/src/main/resources/genius/zh/practises/gen-commit-msg.vm‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,11 @@ $context.historyExamples`
`23`	`23`	`用户先前的意图是: $context.originText`
`24`	`24`	`#end`
`25`	`25`
	`26`	`+#if( $context.issueId.length() > 0 )`
	`27`	`+相关 GitHub Issue: #$context.issueId`
	`28`	`+$context.issueDetail`
	`29`	`+#end`
	`30`	`+`
`26`	`31`	`代码变更（Diff）：`
`27`	`32`
`28`	`33`	```diff

`‎exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CommitMessageSuggestionAction.kt‎`

Lines changed: 31 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ class CommitMessageSuggestionAction : ChatBaseAction() {`
`67`	`67`	`overridefungetActionUpdateThread():ActionUpdateThread=ActionUpdateThread.BGT`
`68`	`68`
`69`	`69`	`privatevar currentJob:Job?=null`
	`70`	`+privatevar selectedIssue:IssueDisplayItem?=null`
	`71`	`+privatevar currentChanges:List<Change>?=null`
	`72`	`+privatevar currentEvent:AnActionEvent?=null`
`70`	`73`
`71`	`74`	`overridefungetActionType():ChatActionType=ChatActionType.GEN_COMMIT_MESSAGE`
`72`	`75`
`@@ -112,6 +115,11 @@ class CommitMessageSuggestionAction : ChatBaseAction() {`
`112`	`115`	`return`
`113`	`116`	`}`
`114`	`117`
	`118`	`+// Store current state for later use`
	`119`	`+ currentChanges= changes`
	`120`	`+ currentEvent= event`
	`121`	`+ selectedIssue=null`
	`122`	`+`
`115`	`123`	`// Check if it's a GitHub repository and show options`
`116`	`124`	`if (GitHubIssue.isGitHubRepository(project)) {`
`117`	`125`	`showGitHubOptions(project, commitMessage, changes, event)`
`@@ -299,19 +307,14 @@ class CommitMessageSuggestionAction : ChatBaseAction() {`
`299`	`307`	`}`
`300`	`308`
`301`	`309`	`privatefunhandleIssueSelection(issueItem:IssueDisplayItem,commitMessage:CommitMessage) {`
`302`		`-val issue= issueItem.issue`
`303`		`-val message= buildString {`
`304`		`- appendLine("Selected Issue: #${issue.number}")`
`305`		`- appendLine("Title:${issue.title}")`
`306`		`-`
`307`		`-if (!issue.body.isNullOrBlank()) {`
`308`		`- appendLine("\nDescription:")`
`309`		`- appendLine(issue.body)`
`310`		`- }`
`311`		`- }`
	`310`	`+ selectedIssue= issueItem`
	`311`	`+`
	`312`	`+// Now generate AI commit message with issue context`
	`313`	`+val project= commitMessage.editorField.project?:return`
	`314`	`+val changes= currentChanges?:return`
	`315`	`+val event= currentEvent?:return`
`312`	`316`
`313`		`- commitMessage.setCommitMessage(message)`
`314`		`- commitMessage.editorField.selectAll()`
	`317`	`+ generateAICommitMessage(project, commitMessage, changes, event)`
`315`	`318`	`}`
`316`	`319`
`317`	`320`	`privatefungenerateAICommitMessage(project:Project,commitMessage:CommitMessage,changes:List<Change>,event:AnActionEvent) {`
`@@ -385,10 +388,22 @@ class CommitMessageSuggestionAction : ChatBaseAction() {`
`385`	`388`	`""`
`386`	`389`	`}`
`387`	`390`
	`391`	`+val issue= selectedIssue?.issue`
	`392`	`+val issueDetail=if (issue!=null) {`
	`393`	`+ buildString {`
	`394`	`+ appendLine("Title:${issue.title}")`
	`395`	`+if (!issue.body.isNullOrBlank()) {`
	`396`	`+ appendLine("Description:${issue.body}")`
	`397`	`+ }`
	`398`	`+ }`
	`399`	`+ }else""`
	`400`	`+`
`388`	`401`	`templateRender.context=CommitMsgGenContext(`
`389`	`402`	`historyExamples= historyExamples,`
`390`	`403`	`diffContent= diff,`
`391`		`- originText= originText`
	`404`	`+ originText= originText,`
	`405`	`+ issueId= issue?.number?.toString()?:"",`
	`406`	`+ issueDetail= issueDetail`
`392`	`407`	`)`
`393`	`408`
`394`	`409`	`val prompter= templateRender.renderTemplate(template)`
`@@ -417,4 +432,7 @@ data class CommitMsgGenContext(`
`417`	`432`	`vardiffContent:String ="",`
`418`	`433`	`// the origin commit message which is to be optimized`
`419`	`434`	`valoriginText:String ="",`
	`435`	`+// GitHub issue information if selected`
	`436`	`+valissueId:String ="",`
	`437`	`+valissueDetail:String ="",`
`420`	`438`	`) : TemplateContext`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitccfcbcd

File tree

3 files changed

3 files changed

`‎core/src/main/resources/genius/en/practises/gen-commit-msg.vm‎`

`‎core/src/main/resources/genius/zh/practises/gen-commit-msg.vm‎`

`‎exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CommitMessageSuggestionAction.kt‎`

0 commit comments