The Unified and Autonomous Development Platform
Fix issue #782 - Code suggestion usability improvements
Robin Shenc6a8ef2c4aa3
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.javaindex fe21f8501f..50126ea350 100644--- a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java@@ -70,7 +70,8 @@ public class CodeProcessor implements MarkdownProcessor {SuggestFor suggestFor = suggestionSupport.getSuggestFor();List<String> content = suggestFor.getContent();List<DiffBlock<String>> diffBlocks = DiffUtils.diff(content, suggestion);- codeElement.html(new DiffRenderer(diffBlocks).renderDiffs());+ codeElement.html("<div class='pb-2 mb-2 head font-size-xs mx-n2 px-2'>Suggested change</div>"+ + new DiffRenderer(diffBlocks).renderDiffs());codeElement.attr("data-suggestion", suggestionContent);codeElement.attr("data-suggestionfile", suggestFor.getFileName());codeElement.parent().addClass("suggestion");diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-to-git.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-to-git.svgindex bd26b7e097..b3078c4d4d 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-to-git.svg+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-to-git.svg@@ -47,7 +47,8 @@objecttolerance="10"borderopacity="1"bordercolor="#666666"- pagecolor="#ffffff" />+ pagecolor="#ffffff"+ inkscape:document-rotation="0" /><defsid="defs835"><style@@ -56,8 +57,8 @@</style></defs><path- style="stroke-width:1.08766"+ style="stroke-width:1.0422"id="path837"p-id="20806"- d="m 797.12575,673.64326 v -91.12694 h 47.26547 V 126.88157 h -614.4511 v 457.22946 a 166.8471,160.83906 0 0 1 23.63273,-1.59471 h 70.89821 v 91.12694 h -70.89821 a 70.898203,68.345212 0 0 0 0,136.69042 H 419.002 v 91.12695 H 253.57285 A 165.42914,159.47216 0 0 1 88.143713,741.98848 V 172.44504 A 141.7964,136.69042 0 0 1 229.94012,35.754617 h 661.71656 a 47.265469,45.563475 0 0 1 47.26548,45.563474 V 855.89717 a 47.265469,45.563475 0 0 1 -47.26548,45.56346 H 702.59481 V 810.33368 H 844.39122 V 673.64326 Z M 277.20559,172.44504 h 94.53094 V 263.572 h -94.53094 z m 0,136.69043 h 94.53094 V 400.2624 H 277.20559 Z M 608.06388,719.20674 V 992.58758 H 513.53294 V 719.20674 H 371.73653 L 560.7984,491.38937 749.86028,719.20674 Z" />+ d="m 785.37325,704.64113 v -86.79559 h 45.56221 V 183.86757 H 238.62674 v 435.49688 a 160.8346,153.19422 0 0 1 22.7811,-1.51891 h 68.34332 v 86.79559 h -68.34332 a 68.343315,65.096698 0 0 0 0,130.19339 h 159.46774 v 86.79559 H 261.40784 A 159.46773,151.89229 0 0 1 101.94012,769.73783 V 227.26538 A 136.68662,130.1934 0 0 1 238.62674,97.071982 h 637.87092 a 45.562209,43.397796 0 0 1 45.56222,43.397798 v 737.76254 a 45.562209,43.397796 0 0 1 -45.56222,43.39779 H 694.24883 V 834.83452 H 830.93546 V 704.64113 Z M 284.18895,227.26538 h 91.12443 v 86.7956 h -91.12443 z m 0,130.19338 h 91.12443 v 86.79557 H 284.18895 Z M 603.12442,748.03894 V 1008.4257 H 512.00001 V 748.03894 H 375.31338 L 557.5622,531.04995 739.81104,748.03894 Z" /></svg>diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/batch.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/batch.svgdeleted file mode 100644index 32bc794a37..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/batch.svg+++ /dev/null@@ -1,2 +0,0 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1656047248807" class="icon" viewBox="0 0 1030 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3671" xmlns:xlink="http://www.w3.org/1999/xlink" width="201.171875" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }-</style></defs><path d="M206.13355771 326.43852471v502.88623417a125.57079141 125.57079141 0 0 0 125.4972463 125.32073731h503.6069751a125.57079141 125.57079141 0 0 0 125.49724628-125.32073731V326.43852471a125.57079141 125.57079141 0 0 0-125.49724628-125.32073818H331.61609463a125.57079141 125.57079141 0 0 0-125.49724629 125.32073818z m629.10422139-69.13233194a68.63222549 68.63222549 0 0 1 69.13233194 68.05857393v503.95999218a68.63222549 68.63222549 0 0 1-68.16153692 69.13233194H331.61609463a68.63222549 68.63222549 0 0 1-69.13233194-68.0585748V326.43852471a68.63222549 68.63222549 0 0 1 68.1615378-69.13233194h504.59247862z" p-id="3672"></path><path d="M69.35450381 193.02783242v546.33664073c0 38.55230683 19.2982166 75.50133223 49.8782417 99.60939404 12.87038057 9.6343998 30.5800251 6.42783604 40.2291334-6.42783604s6.44254541-30.52118935-6.44254453-40.15558916c-17.65080791-12.87038057-27.34404346-32.1244708-27.34404346-54.62925117V191.48338672a67.92619307 67.92619307 0 0 1 67.57317686-67.47021386h547.05738163c17.65080791 0 35.38987031 8.03111748 48.27496026 20.88678954a29.78573906 29.78573906 0 0 0 40.2144249 1.58857296c4.83926309-3.20656377 8.04582685-11.25239063 8.04582686-19.28350812a29.60923096 29.60923096 0 0 0-8.04582686-19.2835081C806.27574482 83.81345732 772.54799258 69.35450381 738.71727646 69.35450381H193.24846778A123.8498376 123.8498376 0 0 0 69.35450381 193.02783242z" p-id="3673"></path><path d="M555.28125224 366.59411299v183.17126162h-185.03930566a28.91790703 28.91790703 0 1 0 0 57.83581494h183.42131485v183.1712625a28.96203428 28.96203428 0 0 0 57.92406943 0V607.61589893h183.42131484a28.91790703 28.91790703 0 0 0 0-57.83581495H611.57262148V366.59411299a28.81494404 28.81494404 0 0 0-28.77081679-28.91790703h-0.23534473c-16.09165372 0-27.35875283 12.87038057-27.35875283 28.91790703z" p-id="3674"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.htmlindex ae5b5163c1..1743841a8c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html@@ -11,7 +11,7 @@<span wicket:id="userName" class="user-name"></span><span wicket:id="action" class="action"></span><span wicket:id="date" class="date"></span>- <a wicket:id="context" class="text-warning"><wicket:svg href="warning-o" class="icon icon-sm"/></a>+ <a wicket:id="context" class="text-muted"><wicket:svg href="warning" class="icon icon-sm"/></a><a wicket:id="anchor" class="reply-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a></div><div class="body">@@ -43,7 +43,7 @@<span wicket:id="userName" class="user-name"></span><span wicket:id="action" class="action"></span><span wicket:id="date" class="date"></span>- <a wicket:id="context" class="text-warning"><wicket:svg href="warning-o" class="icon icon-sm"/></a>+ <a wicket:id="context" class="text-muted"><wicket:svg href="warning" class="icon icon-sm"/></a></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.javaindex bdf3f3bba1..4c4bea3298 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java@@ -13,7 +13,7 @@ public class SuggestionBatchApplyBean implements Serializable {private static final long serialVersionUID = 1L;- private String commitMessage;+ private String commitMessage = "Apply suggested changes from code comments";@Editable@OmitNamediff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 6ba3e24cbf..df7bb2841c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -268,6 +268,12 @@.markdown-rendered pre.code.suggestion {white-space: normal;}+.markdown-rendered pre.code.suggestion>code>.head {+ border-bottom: 1px dashed var(--secondary);+}+.dark-mode .markdown-rendered pre.code.suggestion>code>.head {+ border-color: var(--dark-mode-lighter-dark);+}.markdown-rendered pre.code {padding: 0.6rem;border: 1px dashed var(--secondary);@@ -281,9 +287,12 @@.markdown-rendered pre.code>.actions {position: absolute;right: 10px;- top: 10px;+ top: 8px;display: none;}+.markdown-rendered pre.code.suggestion>.actions {+ display: block;+}.markdown-rendered pre.code>.actions>a {background: white;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 637cfcba74..d01997d430 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -60,8 +60,8 @@ onedev.server.markdown = {var langHint = "suggestion";$input.focus();var selected = $input.range();- document.execCommand("insertText", false, "\n```" + langHint + "\n" + content + "\n```\n");- $input.range(selected.start+5+langHint.length+from, selected.start+5+langHint.length+to);+ document.execCommand("insertText", false, "```" + langHint + "\n" + content + "\n```\n");+ $input.range(selected.start+4+langHint.length+from, selected.start+4+langHint.length+to);onedev.server.markdown.fireInputEvent($input);});}@@ -727,11 +727,11 @@ onedev.server.markdown = {var langHint = "programming language";var selected = $input.range();if (selected.length != 0) {- document.execCommand("insertText", false, "\n```" + langHint + "\n" + selected.text + "\n```\n");- $input.range(selected.start+4, selected.start+4+langHint.length);+ document.execCommand("insertText", false, "```" + langHint + "\n" + selected.text + "\n```\n");+ $input.range(selected.start+3, selected.start+3+langHint.length);} else {- document.execCommand("insertText", false, "\n```" + langHint + "\n```\n");- $input.range(selected.start+4, selected.start+4+langHint.length);+ document.execCommand("insertText", false, "```" + langHint + "\n```\n");+ $input.range(selected.start+3, selected.start+3+langHint.length);}closeMenu();onedev.server.markdown.fireInputEvent($input);@@ -949,42 +949,42 @@ onedev.server.markdown = {}var $actions = $("<div class='actions'></div>");$this.parent().append($actions);- var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg>";- var $copy = $("<a class='pressable' title='Copy to clipboard'>" + icon + "</a>");- $actions.append($copy);- new Clipboard($copy[0], {- text: function() {- if ($this.parent().hasClass("suggestion"))- return $this.data("suggestion");- else++ if (!$this.parent().hasClass("suggestion")) {+ var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg>";+ var $copy = $("<a class='pressable' title='Copy to clipboard'>" + icon + "</a>");+ $actions.append($copy);+ new Clipboard($copy[0], {+ text: function() {return $this.text();- }- });+ }+ });+ }var suggestionCallback = $container.data("suggestionCallback");if (suggestionCallback) {if ($this.data("suggestionoutdated")) {- var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#warning'/></svg>";- var $warning = $("<a class='ml-2' disabled='disabled' title='This suggestion is outdated'>" + icon + "</a>");+ var icon = "<svg class='icon icon-sm'><use xlink:href='" + onedev.server.icons + "#warning'/></svg>";+ var $warning = $("<a class='ml-2' disabled='disabled' title='Suggestion is outdated either due to code change or pull request close'>" + icon + "</a>");$actions.append($warning);} else if ($this.data("suggestionapplyinbatch")) {- var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#clock'/></svg>";- var $removeFromBatch = $("<a class='pressable ml-2' title='Added to batch to be committed with other suggestions later, click to remove'>" + icon + "</a>");+ var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#minus-square'/></svg>";+ var $removeFromBatch = $("<a class='pressable ml-2' title='Remove from batch'>" + icon + "</a>");$removeFromBatch.click(function() {suggestionCallback("removeFromBatch");});$actions.append($removeFromBatch);} else if ($this.data("suggestionappliable")) {var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#add-to-git'/></svg>";- var $apply = $("<a class='pressable ml-2' title='Apply suggestion by committing the change'>" + icon + "</a>");+ var $apply = $("<a class='pressable ml-2' title='Commit suggestion'>" + icon + "</a>");$actions.append($apply);$apply.click(function() {suggestionCallback("apply", $this.data("suggestion"));});if ($this.data("suggestionbatchappliable")) {- var icon = "<svg class='icon flip-x'><use xlink:href='" + onedev.server.icons + "#batch'/></svg>";- var $addToBatch = $("<a class='pressable ml-2' title='Add to batch to be committed with other suggestions later'>" + icon + "</a>");+ var icon = "<svg class='icon flip-x'><use xlink:href='" + onedev.server.icons + "#plus-square'/></svg>";+ var $addToBatch = $("<a class='pressable ml-2' title='Add to batch to commit with other suggestions later'>" + icon + "</a>");$addToBatch.click(function() {suggestionCallback("addToBatch", $this.data("suggestion"));});diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.javaindex 3abb896406..e34a617c71 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java@@ -15,7 +15,7 @@ public class SuggestionApplyBean implements Serializable {private String branch;- private String commitMessage;+ private String commitMessage = "Apply suggested change from code comment";@Editable(order=100, description="Specify branch to commit suggested change")@BranchChoice