The Unified and Autonomous Development Platform
feat: Able to show changes made when edit a file (OD-2640)
Robin Shen2ba8ad9939ba
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex db56c75f1e..13b6a0dc1a 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -409,7 +409,7 @@ import io.onedev.server.web.SessionListener;import io.onedev.server.web.WebApplication;import io.onedev.server.web.avatar.AvatarService;import io.onedev.server.web.avatar.DefaultAvatarService;-import io.onedev.server.web.component.diff.DiffRenderer;+import io.onedev.server.web.component.diff.blob.DiffRenderer;import io.onedev.server.web.component.markdown.SourcePositionTrackExtension;import io.onedev.server.web.component.markdown.emoji.EmojiExtension;import io.onedev.server.web.component.taskbutton.TaskFutureManager;diff --git a/server-core/src/main/java/io/onedev/server/ai/ChatTool.java b/server-core/src/main/java/io/onedev/server/ai/ChatTool.javanew file mode 100644index 0000000000..e5b17ec717--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/ChatTool.java@@ -0,0 +1,18 @@+package io.onedev.server.ai;++import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.web.websocket.ChatToolExecution;++public interface ChatTool {++ ToolSpecification getSpecification();++ CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments);++}diff --git a/server-core/src/main/java/io/onedev/server/ai/ChatToolAware.java b/server-core/src/main/java/io/onedev/server/ai/ChatToolAware.javanew file mode 100644index 0000000000..615121fc8c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/ChatToolAware.java@@ -0,0 +1,9 @@+package io.onedev.server.ai;++import java.util.Collection;++public interface ChatToolAware {++ Collection<ChatTool> getChatTools();++}diff --git a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java b/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.javaindex c65fb2395f..2acc63e632 100644--- a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java+++ b/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java@@ -16,10 +16,9 @@ import com.google.common.base.Joiner;import dev.langchain4j.agent.tool.ToolSpecification;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.websocket.ChatToolExecution;-public class HighlightedTextTool extends ChatTool {+public class HighlightedTextTool implements ChatTool {private static final String HIGHLIGHT_BEGIN = "[HIGHLIGHT_BEGIN]";diff --git a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css b/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.cssdeleted file mode 100644index e6184a1289..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css+++ /dev/null@@ -1,87 +0,0 @@-.text-diff {- table-layout: fixed;- width: 100%;- border-collapse: separate;-}-.text-diff>tbody {- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;- font-size: 0.9rem;-}--.text-diff>tbody>tr>td.old.content {- background: #ffecec;- border-color: #ffecec;-}-.dark-mode .text-diff>tbody>tr>td.old.content {- background: rgb(49, 16, 20);- border-color: rgb(49, 16, 20);-}-.text-diff>tbody>tr>td.old.operation {- background: #ffecec;-}-.dark-mode .text-diff>tbody>tr>td.old.operation {- background: rgb(49, 16, 20);-}-.text-diff>tbody>tr>td.old .delete {- background-color: rgb(255, 146, 176);-}-.dark-mode .text-diff>tbody>tr>td.old .delete {- background-color: rgb(108, 35, 44);-}-.text-diff>tbody>tr>td.new.content {- background: #eaffea;- border-color: #eaffea;-}-.dark-mode .text-diff>tbody>tr>td.new.content {- background: rgb(4, 38, 36);- border-color: rgb(4, 38, 36);-}-.text-diff>tbody>tr>td.new.operation {- background: #eaffea;-}-.dark-mode .text-diff>tbody>tr>td.new.operation {- background: rgb(4, 38, 36);-}-.text-diff>tbody>tr>td.new .insert {- background-color: rgb(154, 255, 150);-}-.dark-mode .text-diff>tbody>tr>td.new .insert {- background-color: rgb(5, 96, 78);-}-.text-diff>tbody>tr>td.old.new.content {- background: #FCF8E4;- border-color: #FCF8E4;-}-.dark-mode .text-diff>tbody>tr>td.old.new.content {- background: rgb(52, 34, 0);- border-color: rgb(52, 34, 0);-}-.text-diff>tbody>tr>td.old.new.operation {- background: #FCF8E4;-}-.dark-mode .text-diff>tbody>tr>td.old.new.operation {- background: rgb(52, 34, 0);-}-.text-diff>tbody>tr>td.content {- white-space: pre-wrap;- word-wrap: break-word;- border: 1px solid transparent;-}-.text-diff>tbody>tr>td.operation {- font-weight: bold;- padding: 0 0.3rem 0 0.3rem;-}-.text-diff>tbody>tr.code {- background: inherit;- border: inherit;- border-radius: inherit;- padding: inherit;- margin: inherit;- font-family: inherit;- font-size: inherit;-}--.dark-mode ::selection {- background-color: #1e496c;-}-diff --git a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.js b/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.jsdeleted file mode 100644index 4e086eaf11..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.js+++ /dev/null@@ -1,187 +0,0 @@-onedev.server.diff = {- highlightSyntax: function($textDiff, fileName) {- if ($textDiff.hasClass("syntax-highlighted"))- return;-- $textDiff.addClass("cm-s-eclipse");-- var $trs = $textDiff.find("tr");-- var oldLines = [], newLines = [];-- $trs.each(function() {- var $tr = $(this);- var $content = $tr.children(".content");- if ($content.hasClass("old") && $content.hasClass("new")) {- var oldPartials = [];- var newPartials = [];-- $content.contents().each(function() {- var $this = $(this);- var text = $this.text();- if ($this.hasClass("delete")) {- oldPartials.push(text);- } else if ($this.hasClass("insert")) {- newPartials.push(text);- } else {- oldPartials.push(text);- newPartials.push(text);- }- });- oldLines.push(oldPartials.join(""));- newLines.push(newPartials.join(""));- } else if ($content.hasClass("old")) {- oldLines.push($content.text());- } else if ($content.hasClass("new")) {- newLines.push($content.text());- } else {- oldLines.push($content.text());- newLines.push($content.text());- }- });-- function saveSyntaxes(syntaxes, text, style, lineIndex, beginPos) {- if (lineIndex != undefined && beginPos != undefined && style != null) {- var classNames = "cm-" + style.replace(/ +/g, " cm-");- var lineSyntaxes = syntaxes[lineIndex];- if (lineSyntaxes == undefined) {- lineSyntaxes = [];- syntaxes[lineIndex] = lineSyntaxes;- }- for (var i=0; i<text.length; i++)- lineSyntaxes[i+beginPos] = classNames;- }- }-- var oldSyntaxes = [];- var oldProcessed = false;- var newSyntaxes = [];- var newProcessed = false;-- function doneHighlight() {- if (oldProcessed && newProcessed) {- var oldLineIndex = 0;- var newLineIndex = 0;- $trs.each(function() {- var $tr = $(this);- var $td = $tr.children(".content");-- var oldLineSyntaxes = oldSyntaxes[oldLineIndex];- var newLineSyntaxes = newSyntaxes[newLineIndex];-- var $highlighted = $("<div></div>");-- var partial = [];- var classNames = "";- function appendPartial() {- if (partial.length != 0) {- var $span = $("<span></span>");- $span.text(partial.join(""));- $span.attr("class", classNames);- $highlighted.append($span);- }- }-- var oldPos = newPos = 0;- $td.contents().each(function() {- var $content = $(this);- var text = $content.text();- var lineSyntaxes;- var pos;- if ($td.hasClass("old") && $td.hasClass("new")) {- if ($content.hasClass("insert")) {- lineSyntaxes = newLineSyntaxes;- pos = newPos;- newPos += text.length;- } else if ($content.hasClass("delete")) {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- } else {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- newPos += text.length;- }- } else if ($td.hasClass("new")) {- lineSyntaxes = newLineSyntaxes;- pos = newPos;- newPos += text.length;- } else if ($td.hasClass("old")) {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- } else {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- newPos += text.length;- }-- for (var i=0; i<text.length; i++) {- var currentClassNames = $content[0].className;- if (currentClassNames == undefined)- currentClassNames = "";-- if (lineSyntaxes) {- var syntaxClassNames = lineSyntaxes[pos+i];- if (syntaxClassNames != undefined && syntaxClassNames.length != 0) {- if (currentClassNames.length != 0)- currentClassNames += " ";- currentClassNames += syntaxClassNames;- }- }- if (currentClassNames != classNames) {- appendPartial();- partial = [];- classNames = currentClassNames;- }- partial.push(text.charAt(i));- }- })- appendPartial();-- $td.html($highlighted.html());-- if ($td.hasClass("old") || $td.hasClass("equal"))- oldLineIndex++;- if ($td.hasClass("new") || $td.hasClass("equal"))- newLineIndex++;- });-- $textDiff.addClass("syntax-highlighted");- }- }-- var modeInfo = onedev.server.codemirror.findModeByFileName(fileName);- if (modeInfo) {- onedev.server.codemirror.highlightSyntax(- oldLines.join("\n"),- modeInfo,- function(text, style, lineIndex, beginPos) {- saveSyntaxes(oldSyntaxes, text, style, lineIndex, beginPos);- },- undefined,- function() {- oldProcessed = true;- doneHighlight();- }- );- onedev.server.codemirror.highlightSyntax(- newLines.join("\n"),- modeInfo,- function(text, style, lineIndex, beginPos) {- saveSyntaxes(newSyntaxes, text, style, lineIndex, beginPos);- },- undefined,- function() {- newProcessed = true;- doneHighlight();- }- );- } else {- oldProcessed = newProcessed = true;- doneHighlight();- }- }-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svgnew file mode 100644index 0000000000..c430823c60--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg@@ -0,0 +1 @@+<?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="1766197189296" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9526" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M217.984 148.032a14.016 14.016 0 0 0-14.016 13.952V862.08c0 7.68 6.272 14.016 14.08 14.016h587.968c7.68 0 14.016-6.272 14.016-14.08V325.248a13.952 13.952 0 0 0-4.16-9.856l-163.2-163.2a14.016 14.016 0 0 0-9.856-4.096H217.984z m-97.984 13.952C120 107.904 163.904 64 217.984 64h424.832c25.984 0 50.88 10.304 69.312 28.672l163.2 163.2c18.368 18.432 28.672 43.328 28.672 69.312v536.832c0 54.08-43.904 97.984-97.984 97.984H217.984a97.984 97.984 0 0 1-97.984-97.984V161.92zM512 246.016c23.168 0 41.984 18.816 41.984 41.984v84.032H638.08a41.984 41.984 0 1 1 0 83.968H553.984v84.032a41.984 41.984 0 0 1-83.968 0V456H385.92a41.984 41.984 0 0 1 0-84.032h84.032V288c0-23.168 18.816-41.984 41.984-41.984z m-168 448c0-23.232 18.816-41.984 41.984-41.984H638.08a41.984 41.984 0 1 1 0 83.968H385.92a41.984 41.984 0 0 1-41.984-41.984z" p-id="9527"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/diff/DiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/TextDiffResourceReference.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/web/asset/diff/DiffResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/asset/textdiff/TextDiffResourceReference.javaindex fca0b71f02..bec5f7c1f9 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/diff/DiffResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/TextDiffResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.asset.diff;+package io.onedev.server.web.asset.textdiff;import java.util.List;@@ -10,12 +10,12 @@ import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class DiffResourceReference extends BaseDependentResourceReference {+public class TextDiffResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public DiffResourceReference() {- super(DiffResourceReference.class, "diff.js");+ public TextDiffResourceReference() {+ super(TextDiffResourceReference.class, "text-diff.js");}@Override@@ -23,7 +23,7 @@ public class DiffResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(- DiffResourceReference.class, "diff.css")));+ TextDiffResourceReference.class, "text-diff.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.css b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.cssnew file mode 100644index 0000000000..55db48cce5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.css@@ -0,0 +1,180 @@+.text-diff {+ width: 100%;+ border-collapse: separate;+}+.text-diff>tbody {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+ font-size: 0.9rem;+}++/* Line number styles */+.text-diff>tbody>tr>td.number {+ padding: 0.15rem 0.6rem 0.15rem 0;+ border-left: 1px solid var(--light-gray);+ text-align: right;+ color: var(--gray);+ white-space: nowrap;+}+.dark-mode .text-diff>tbody>tr>td.number {+ border-left-color: var(--dark-mode-lighter-dark);+ color: var(--dark-mode-gray);+}+.text-diff>tbody>tr>td.old.number {+ background: #ffdddd;+ border-left: 1px solid #f1c0c0;+}+.dark-mode .text-diff>tbody>tr>td.old.number {+ background: rgb(62, 20, 25);+ border-left-color: rgb(97, 48, 63);+}+.text-diff>tbody>tr>td.new.number {+ background: #dbffdb;+ border-left: 1px solid #c1e9c1;+}+.dark-mode .text-diff>tbody>tr>td.new.number {+ background: rgb(6, 49, 47);+ border-left-color: rgb(38, 76, 50);+}++/* Content backgrounds */+.text-diff>tbody>tr>td.old.content {+ background: #ffecec;+ border-color: #ffecec;+}+.dark-mode .text-diff>tbody>tr>td.old.content {+ background: rgb(49, 16, 20);+ border-color: rgb(49, 16, 20);+}+.text-diff>tbody>tr>td.old.operation {+ background: #ffecec;+}+.dark-mode .text-diff>tbody>tr>td.old.operation {+ background: rgb(49, 16, 20);+}+.text-diff>tbody>tr>td.old .delete {+ background-color: rgb(255, 146, 176);+}+.dark-mode .text-diff>tbody>tr>td.old .delete {+ background-color: rgb(108, 35, 44);+}+.text-diff>tbody>tr>td.new.content {+ background: #eaffea;+ border-color: #eaffea;+}+.dark-mode .text-diff>tbody>tr>td.new.content {+ background: rgb(4, 38, 36);+ border-color: rgb(4, 38, 36);+}+.text-diff>tbody>tr>td.new.operation {+ background: #eaffea;+}+.dark-mode .text-diff>tbody>tr>td.new.operation {+ background: rgb(4, 38, 36);+}+.text-diff>tbody>tr>td.new .insert {+ background-color: rgb(154, 255, 150);+}+.dark-mode .text-diff>tbody>tr>td.new .insert {+ background-color: rgb(5, 96, 78);+}+.text-diff>tbody>tr>td.old.new.content {+ background: #FCF8E4;+ border-color: #FCF8E4;+}+.dark-mode .text-diff>tbody>tr>td.old.new.content {+ background: rgb(52, 34, 0);+ border-color: rgb(52, 34, 0);+}+.text-diff>tbody>tr>td.old.new.operation {+ background: #FCF8E4;+}+.dark-mode .text-diff>tbody>tr>td.old.new.operation {+ background: rgb(52, 34, 0);+}+.text-diff>tbody>tr>td.content {+ white-space: pre-wrap;+ word-wrap: break-word;+ border: 1px solid transparent;+}++/* Operation column styles */+.text-diff>tbody>tr>td.operation {+ font-weight: bold;+ padding: 0 0.3rem 0 0.3rem;+ border-left: 1px solid var(--light-gray);+}+.dark-mode .text-diff>tbody>tr>td.operation {+ border-left-color: var(--dark-mode-lighter-dark);+}+.text-diff>tbody>tr>td.old.operation {+ border-left: 1px solid #f1c0c0;+}+.dark-mode .text-diff>tbody>tr>td.old.operation {+ border-left-color: rgb(97, 48, 63);+}+.text-diff>tbody>tr>td.new.operation {+ border-left: 1px solid #c1e9c1;+}+.dark-mode .text-diff>tbody>tr>td.new.operation {+ border-left-color: rgb(38, 76, 50);+}++/* Code row styles */+.text-diff>tbody>tr.code {+ background: inherit;+ border: inherit;+ border-radius: inherit;+ padding: inherit;+ margin: inherit;+ font-family: inherit;+ font-size: inherit;+}++/* Expand functionality styles */+.text-diff>tbody>tr:not(.expanded)+tr.expanded>td,+.text-diff>tbody>tr.expanded+tr:not(.expanded)>td {+ border-top: 1px solid var(--light-gray);+}+.dark-mode .text-diff>tbody>tr:not(.expanded)+tr.expanded>td,+.dark-mode .text-diff>tbody>tr.expanded+tr:not(.expanded)>td {+ border-top-color: var(--dark-mode-lighter-dark);+}+.text-diff>tbody>tr.expanded>td {+ background: #F6F9FC;+}+.dark-mode .text-diff>tbody>tr.expanded>td {+ background: var(--dark-mode-light-dark);+}+.text-diff>tbody>tr.expander>td.skipped {+ padding: 0.5rem 1.2rem;+ background: #F0F8FF;+ color: var(--gray);+}+.dark-mode .text-diff>tbody>tr.expander>td.skipped {+ background: rgb(23, 33, 53);+ color: var(--dark-mode-gray);+}+.text-diff>tbody>tr.expander>td.expander {+ text-align: center;+ overflow: hidden;+ vertical-align: middle;+}+.text-diff>tbody>tr.expander>td.expander a {+ display: block;+ background: #F0F8FF;+ color: var(--gray);+ padding: 2rem 0;+ margin: -2rem -1px;+}+.dark-mode .text-diff>tbody>tr.expander>td.expander a {+ background: rgb(23, 33, 53);+ color: var(--gray);+}+.text-diff>tbody>tr.expander>td.expander>a:hover,+.text-diff>tbody>tr.expander>td.expander>a:focus {+ background: var(--primary);+ color: white;+}+.text-diff>tbody>tr>td:first-child {+ border-left: none !important;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.js b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.jsnew file mode 100644index 0000000000..b66aeebdf8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/textdiff/text-diff.js@@ -0,0 +1,327 @@+onedev.server.textDiff = {+ /**+ * Save syntax highlighting class names for text at specific positions+ */+ saveHighlightedSyntaxes: function(syntaxes, text, style, lineIndex, beginPos) {+ if (lineIndex != undefined && beginPos != undefined && style != null) {+ var classNames = "cm-" + style.replace(/ +/g, " cm-");+ var lineSyntaxes = syntaxes[lineIndex];+ if (lineSyntaxes == undefined) {+ lineSyntaxes = [];+ syntaxes[lineIndex] = lineSyntaxes;+ }+ for (var i=0; i<text.length; i++)+ lineSyntaxes[i+beginPos] = classNames;+ }+ },++ /**+ * Extract line content from diff rows for syntax highlighting+ * Supports both unified diff format and split (side-by-side) format+ */+ extractLinesForSyntaxHighlight: function($rows, isSplitView) {+ var oldLines = [], newLines = [];++ $rows.each(function() {+ var $row = $(this);+ var $content = $row.children(".content");++ if (isSplitView) {+ // Split view: two content columns per row+ if ($content.length == 2) {+ var $old = $content.first();+ if (!$old.hasClass("none"))+ oldLines.push($old.text());++ var $new = $content.last();+ if (!$new.hasClass("none"))+ newLines.push($new.text());+ }+ } else {+ // Unified view: one content column per row+ if ($content.hasClass("old") && $content.hasClass("new")) {+ // Modified line with inline changes+ var oldPartials = [];+ var newPartials = [];++ $content.contents().each(function() {+ var $this = $(this);+ var text = $this.text();+ if ($this.hasClass("delete")) {+ oldPartials.push(text);+ } else if ($this.hasClass("insert")) {+ newPartials.push(text);+ } else {+ oldPartials.push(text);+ newPartials.push(text);+ }+ });+ oldLines.push(oldPartials.join(""));+ newLines.push(newPartials.join(""));+ } else if ($content.hasClass("old")) {+ oldLines.push($content.text());+ newLines.push("");+ } else if ($content.hasClass("new")) {+ oldLines.push("");+ newLines.push($content.text());+ } else {+ // Equal line+ oldLines.push($content.text());+ newLines.push($content.text());+ }+ }+ });++ return {oldLines: oldLines, newLines: newLines};+ },++ /**+ * Apply syntax highlighting to diff content+ * Supports both unified and split view formats+ */+ applySyntaxHighlightToContent: function($td, oldLineSyntaxes, newLineSyntaxes, isSplitView) {+ var $highlighted = $("<div></div>");++ var partial = [];+ var classNames = "";+ function appendPartial() {+ if (partial.length != 0) {+ var $span = $("<span></span>");+ $span.text(partial.join(""));+ $span.attr("class", classNames);+ $highlighted.append($span);+ }+ }++ var oldPos = 0, newPos = 0;+ $td.contents().each(function() {+ var $content = $(this);+ var text = $content.text();+ var lineSyntaxes;+ var pos;++ // Determine which syntax array to use based on content type+ if ($td.hasClass("old") && $td.hasClass("new")) {+ // Unified view: modified line with inline changes+ if ($content.hasClass("insert")) {+ lineSyntaxes = newLineSyntaxes;+ pos = newPos;+ newPos += text.length;+ } else if ($content.hasClass("delete")) {+ lineSyntaxes = oldLineSyntaxes;+ pos = oldPos;+ oldPos += text.length;+ } else {+ lineSyntaxes = oldLineSyntaxes;+ pos = oldPos;+ oldPos += text.length;+ newPos += text.length;+ }+ } else if ($td.hasClass("new")) {+ lineSyntaxes = newLineSyntaxes;+ pos = newPos;+ newPos += text.length;+ } else if ($td.hasClass("old")) {+ lineSyntaxes = oldLineSyntaxes;+ pos = oldPos;+ oldPos += text.length;+ } else if ($td.hasClass("right")) {+ // Split view: right side (new)+ lineSyntaxes = newLineSyntaxes;+ pos = newPos;+ oldPos += text.length;+ newPos += text.length;+ } else {+ // Split view: left side (old) or unified view: equal+ lineSyntaxes = oldLineSyntaxes;+ pos = oldPos;+ oldPos += text.length;+ newPos += text.length;+ }++ // Read base class names once per content node+ var baseClassNames = $content[0].className;+ if (baseClassNames == undefined)+ baseClassNames = "";++ // Apply syntax highlighting to each character+ for (var i=0; i<text.length; i++) {+ var currentClassNames = baseClassNames;++ if (lineSyntaxes) {+ var syntaxClassNames = lineSyntaxes[pos+i];+ if (syntaxClassNames != undefined && syntaxClassNames.length != 0) {+ if (currentClassNames.length != 0)+ currentClassNames += " ";+ currentClassNames += syntaxClassNames;+ }+ }+ if (currentClassNames != classNames) {+ appendPartial();+ partial = [];+ classNames = currentClassNames;+ }+ partial.push(text.charAt(i));+ }+ });+ appendPartial();++ $td.html($highlighted.html());+ },++ /**+ * Highlight syntax for unified diff view+ * Used by TextDiffPanel and BlobTextDiffPanel (unified mode)+ */+ highlightSyntaxForUnifiedDiff: function($rows, oldFileName, newFileName, onComplete) {+ var lines = onedev.server.textDiff.extractLinesForSyntaxHighlight($rows, false);+ var oldSyntaxes = [];+ var oldProcessed = false;+ var newSyntaxes = [];+ var newProcessed = false;++ function doneHighlight() {+ if (oldProcessed && newProcessed) {+ var oldLineIndex = 0;+ var newLineIndex = 0;+ $rows.each(function() {+ var $row = $(this);+ var $td = $row.children(".content");++ var oldLineSyntaxes = oldSyntaxes[oldLineIndex];+ var newLineSyntaxes = newSyntaxes[newLineIndex];++ onedev.server.textDiff.applySyntaxHighlightToContent($td, oldLineSyntaxes, newLineSyntaxes, false);++ oldLineIndex++;+ newLineIndex++;+ });++ if (onComplete)+ onComplete();+ }+ }++ var oldModeInfo = onedev.server.codemirror.findModeByFileName(oldFileName);+ if (oldModeInfo) {+ onedev.server.codemirror.highlightSyntax(+ lines.oldLines.join("\n"),+ oldModeInfo,+ function(text, style, lineIndex, beginPos) {+ onedev.server.textDiff.saveHighlightedSyntaxes(oldSyntaxes, text, style, lineIndex, beginPos);+ },+ undefined,+ function() {+ oldProcessed = true;+ doneHighlight();+ }+ );+ } else {+ oldProcessed = true;+ doneHighlight();+ }++ var newModeInfo = onedev.server.codemirror.findModeByFileName(newFileName);+ if (newModeInfo) {+ onedev.server.codemirror.highlightSyntax(+ lines.newLines.join("\n"),+ newModeInfo,+ function(text, style, lineIndex, beginPos) {+ onedev.server.textDiff.saveHighlightedSyntaxes(newSyntaxes, text, style, lineIndex, beginPos);+ },+ undefined,+ function() {+ newProcessed = true;+ doneHighlight();+ }+ );+ } else {+ newProcessed = true;+ doneHighlight();+ }+ },++ /**+ * Highlight syntax for split diff view (side-by-side)+ * Used by BlobTextDiffPanel (split mode)+ */+ highlightSyntaxForSplitDiff: function($rows, oldFileName, newFileName, onComplete) {+ var lines = onedev.server.textDiff.extractLinesForSyntaxHighlight($rows, true);+ var oldSyntaxes = [];+ var oldProcessed = false;+ var newSyntaxes = [];+ var newProcessed = false;++ function doneHighlight() {+ if (oldProcessed && newProcessed) {+ var oldLineIndex = 0;+ var newLineIndex = 0;+ $rows.each(function() {+ var $row = $(this);+ $row.children("td.content:not(.none)").each(function() {+ var $td = $(this);++ var oldLineSyntaxes = oldSyntaxes[oldLineIndex];+ var newLineSyntaxes = newSyntaxes[newLineIndex];++ onedev.server.textDiff.applySyntaxHighlightToContent($td, oldLineSyntaxes, newLineSyntaxes, true);+ });++ var $contents = $row.children("td.content");+ if ($contents.length == 2) {+ if (!$contents.first().hasClass("none"))+ oldLineIndex++;+ if (!$contents.last().hasClass("none"))+ newLineIndex++;+ } else {+ if ($contents.hasClass("old") || $contents.hasClass("equal"))+ oldLineIndex++;+ if ($contents.hasClass("new") || $contents.hasClass("equal"))+ newLineIndex++;+ }+ });++ if (onComplete)+ onComplete();+ }+ }++ var oldModeInfo = onedev.server.codemirror.findModeByFileName(oldFileName);+ if (oldModeInfo) {+ onedev.server.codemirror.highlightSyntax(+ lines.oldLines.join("\n"),+ oldModeInfo,+ function(text, style, lineIndex, beginPos) {+ onedev.server.textDiff.saveHighlightedSyntaxes(oldSyntaxes, text, style, lineIndex, beginPos);+ },+ undefined,+ function() {+ oldProcessed = true;+ doneHighlight();+ }+ );+ } else {+ oldProcessed = true;+ doneHighlight();+ }++ var newModeInfo = onedev.server.codemirror.findModeByFileName(newFileName);+ if (newModeInfo) {+ onedev.server.codemirror.highlightSyntax(+ lines.newLines.join("\n"),+ newModeInfo,+ function(text, style, lineIndex, beginPos) {+ onedev.server.textDiff.saveHighlightedSyntaxes(newSyntaxes, text, style, lineIndex, beginPos);+ },+ undefined,+ function() {+ newProcessed = true;+ doneHighlight();+ }+ );+ } else {+ newProcessed = true;+ doneHighlight();+ }+ }+};diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ChatTool.java b/server-core/src/main/java/io/onedev/server/web/behavior/ChatTool.javadeleted file mode 100644index d5f767a27d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/behavior/ChatTool.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.web.behavior;--import java.util.concurrent.CompletableFuture;--import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import io.onedev.server.web.websocket.ChatToolExecution;--public abstract class ChatTool extends Behavior {-- public abstract ToolSpecification getSpecification();-- public abstract CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments);--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentRevisionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentRevisionPanel.javaindex c3c29981f8..40cdce1bcd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentRevisionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentRevisionPanel.java@@ -15,13 +15,10 @@ import org.apache.wicket.markup.html.panel.Panel;import com.google.common.base.Splitter;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.support.CommentRevision;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.diff.DiffRenderer;-import io.onedev.server.util.diff.DiffUtils;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.asset.diff.DiffResourceReference;+import io.onedev.server.web.asset.textdiff.TextDiffResourceReference;+import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;abstract class CommentRevisionPanel extends Panel {@@ -47,13 +44,8 @@ abstract class CommentRevisionPanel extends Panel {newLines = Splitter.on("\n").splitToList(revision.getNewContent());elsenewLines = new ArrayList<>();- var renderedDiffs = new DiffRenderer(DiffUtils.diff(oldLines, newLines, WhitespaceOption.IGNORE_TRAILING)).renderDiffs();- if (StringUtils.isNotBlank(renderedDiffs)) {- add(new Label("content", renderedDiffs).setEscapeModelStrings(false));- } else {- add(new Label("content", "<div class='alert alert-notice alert-light'>" + _T("No obvious changes") + "</div>").setEscapeModelStrings(false));- }+ add(new PlainTextDiffPanel("content", oldLines, newLines));add(new AjaxLink<Void>("close") {@@ -78,7 +70,7 @@ abstract class CommentRevisionPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssReferenceHeaderItem.forReference(new DiffResourceReference()));+ response.render(CssReferenceHeaderItem.forReference(new TextDiffResourceReference()));}protected abstract CommentRevision getCommentRevision();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffExpandSupport.java b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffExpandSupport.javanew file mode 100644index 0000000000..339a42a156--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffExpandSupport.java@@ -0,0 +1,110 @@+package io.onedev.server.web.component.diff;++import java.io.Serializable;+import java.util.HashMap;+import java.util.Map;++import io.onedev.server.util.diff.DiffBlock;+import io.onedev.server.web.WebConstants;++/**+ * Utility class to handle diff expansion logic that is common between+ * TextDiffPanel and BlobTextDiffPanel.+ */+public class DiffExpandSupport implements Serializable {++ private final Map<Integer, Integer> contextSizes = new HashMap<>();++ /**+ * Gets the current or default context size for a given block index.+ */+ public int getContextSize(int blockIndex) {+ Integer contextSize = contextSizes.get(blockIndex);+ return contextSize != null ? contextSize : WebConstants.DIFF_CONTEXT_SIZE;+ }++ /**+ * Expands the context for a given block index.+ * @return the new context size after expansion+ */+ public int expand(int blockIndex) {+ int lastContextSize = getContextSize(blockIndex);+ int newContextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;+ contextSizes.put(blockIndex, newContextSize);+ return newContextSize;+ }++ /**+ * Appends equal lines with context and expanders.+ *+ * @param builder the string builder to append to+ * @param blockIndex the index of the current equal block+ * @param lastContextSize the previous context size (0 for initial render)+ * @param contextSize the current context size to render+ * @param block the diff block containing equal lines+ * @param totalBlocks total number of diff blocks+ * @param callback callback to append individual lines and expanders+ */+ public void appendEquals(StringBuilder builder, int blockIndex, int lastContextSize,+ int contextSize, DiffBlock<String> block, int totalBlocks, ExpandCallback callback) {++ if (blockIndex == 0) {+ // First block: show last N context lines+ int start = block.getElements().size() - contextSize;+ if (start < 0)+ start = 0;+ else if (start > 0)+ callback.appendExpander(builder, blockIndex, start);+ for (int j = start; j < block.getElements().size() - lastContextSize; j++)+ callback.appendEqual(builder, block, j, lastContextSize);+ } else if (blockIndex == totalBlocks - 1) {+ // Last block: show first N context lines+ int end = block.getElements().size();+ int skipped = 0;+ if (end > contextSize) {+ skipped = end - contextSize;+ end = contextSize;+ }+ for (int j = lastContextSize; j < end; j++)+ callback.appendEqual(builder, block, j, lastContextSize);+ if (skipped != 0)+ callback.appendExpander(builder, blockIndex, skipped);+ } else if (2 * contextSize < block.getElements().size()) {+ // Middle block with large content: show N lines at start, expander, N lines at end+ for (int j = lastContextSize; j < contextSize; j++)+ callback.appendEqual(builder, block, j, lastContextSize);+ callback.appendExpander(builder, blockIndex, block.getElements().size() - 2 * contextSize);+ for (int j = block.getElements().size() - contextSize; j < block.getElements().size() - lastContextSize; j++)+ callback.appendEqual(builder, block, j, lastContextSize);+ } else {+ // Middle block with small content: show all newly expanded lines+ for (int j = lastContextSize; j < block.getElements().size() - lastContextSize; j++)+ callback.appendEqual(builder, block, j, lastContextSize);+ }+ }++ /**+ * Callback interface for appending lines and expanders.+ */+ public interface ExpandCallback {+ /**+ * Appends an equal (unchanged) line.+ *+ * @param builder the string builder+ * @param block the diff block+ * @param lineIndex the line index within the block+ * @param lastContextSize the previous context size (0 means original, >0 means expanded)+ */+ void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize);++ /**+ * Appends an expander row.+ *+ * @param builder the string builder+ * @param blockIndex the block index+ * @param skippedLines the number of skipped lines+ */+ void appendExpander(StringBuilder builder, int blockIndex, int skippedLines);+ }+}+diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.javaindex ed7213dea1..9468a57f1e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java@@ -36,11 +36,10 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.diff.DiffRenderer;import io.onedev.server.web.component.diff.blob.text.BlobTextDiffPanel;-import io.onedev.server.web.component.diff.diffstat.DiffStatBar;-import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;+import io.onedev.server.web.component.diff.blob.title.BlobDiffTitle;import io.onedev.server.web.component.diff.revision.DiffViewMode;+import io.onedev.server.web.component.diff.stat.DiffStatBar;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/DiffRenderer.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.javarename to server-core/src/main/java/io/onedev/server/web/component/diff/blob/DiffRenderer.javaindex d07cfb5b6b..a449d89504 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/DiffRenderer.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.diff;+package io.onedev.server.web.component.diff.blob;import org.jspecify.annotations.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.javaindex f520be8e59..829c75a74f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java@@ -4,7 +4,7 @@ import org.apache.tika.mime.MediaType;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.git.BlobChange;-import io.onedev.server.web.component.diff.DiffRenderer;+import io.onedev.server.web.component.diff.blob.DiffRenderer;import io.onedev.server.web.component.diff.revision.DiffViewMode;public class ImageDiffRenderer implements DiffRenderer {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.javaindex 4d768eeab1..00e25e9acc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java@@ -9,6 +9,7 @@ import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;import java.io.Serializable;import java.text.MessageFormat;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;@@ -42,6 +43,8 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.HighlightedTextTool;import io.onedev.server.codequality.CodeProblem;import io.onedev.server.git.BlameBlock;@@ -60,7 +63,7 @@ import io.onedev.server.util.Pair;import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffMatchPatch.Operation;import io.onedev.server.util.diff.DiffUtils;-import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.diff.DiffExpandSupport;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;@@ -78,11 +81,11 @@ import io.onedev.server.web.util.CodeCommentInfo;import io.onedev.server.web.util.DiffPlanarRange;import io.onedev.server.web.util.WicketUtils;-public class BlobTextDiffPanel extends Panel {+public class BlobTextDiffPanel extends Panel implements ChatToolAware {private final BlobChange change;- private final Map<Integer, Integer> contextSizes = new HashMap<>();+ private final DiffExpandSupport expandSupport = new DiffExpandSupport();private final DiffViewMode diffMode;@@ -255,27 +258,26 @@ public class BlobTextDiffPanel extends Panel {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();switch (params.getParameterValue("action").toString("")) {- case "expand":- if (blameInfo != null) {- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- }- int index = params.getParameterValue("param1").toInt();- Integer lastContextSize = contextSizes.get(index);- if (lastContextSize == null)- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;- int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;- contextSizes.put(index, contextSize);-- StringBuilder builder = new StringBuilder();- appendEquals(builder, index, lastContextSize, contextSize);-- String expanded = StringUtils.replace(builder.toString(), "\n", "");- String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",- getMarkupId(), index, escapeJavaScript(expanded));- target.appendJavaScript(script);- break;+ case "expand":+ if (blameInfo != null) {+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ }+ int index = params.getParameterValue("param1").toInt();+ int lastContextSize = expandSupport.getContextSize(index);+ int contextSize = expandSupport.expand(index);++ StringBuilder builder = new StringBuilder();+ DiffBlock<String> block = change.getDiffBlocks().get(index);+ expandSupport.appendEquals(builder, index, lastContextSize, contextSize,+ block, change.getDiffBlocks().size(), new ExpandCallbackImpl());++ String expanded = StringUtils.replace(builder.toString(), "\n", "");+ String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",+ getMarkupId(), index, escapeJavaScript(expanded));+ target.appendJavaScript(script);+ break;case "openSelectionPopover":String jsonOfPosition = String.format("{left: %d, top: %d}",params.getParameterValue("param1").toInt(),@@ -426,22 +428,6 @@ public class BlobTextDiffPanel extends Panel {}}));-- if (getAnnotationSupport() != null) {- var markRange = getAnnotationSupport().getMarkRange();- if (markRange != null) {- String fileName;- List<String> fileLines;- if (markRange.isLeftSide()) {- fileName = change.getOldBlobIdent().getName();- fileLines = change.getOldText().getLines();- } else {- fileName = change.getNewBlobIdent().getName();- fileLines = change.getNewText().getLines();- }- add(new HighlightedTextTool(fileName, fileLines, markRange));- }- }setOutputMarkupId(true);}@@ -587,13 +573,13 @@ public class BlobTextDiffPanel extends Panel {+ "</colgroup>",baseLineNumColumnWidth+newProblemsWidth, operationColumnWidth));}+ ExpandCallbackImpl callback = new ExpandCallbackImpl();for (int i=0; i<change.getDiffBlocks().size(); i++) {DiffBlock<String> block = change.getDiffBlocks().get(i);if (block.getOperation() == Operation.EQUAL) {- Integer lastContextSize = contextSizes.get(i);- if (lastContextSize == null)- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;- appendEquals(builder, i, 0, lastContextSize);+ int contextSize = expandSupport.getContextSize(i);+ expandSupport.appendEquals(builder, i, 0, contextSize,+ block, change.getDiffBlocks().size(), callback);} else if (block.getOperation() == Operation.DELETE) {if (i+1<change.getDiffBlocks().size()) {DiffBlock<String> nextBlock = change.getDiffBlocks().get(i+1);@@ -744,39 +730,6 @@ public class BlobTextDiffPanel extends Panel {builder.append(toHtml(line, null));}- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {- DiffBlock<String> block = change.getDiffBlocks().get(index);- if (index == 0) {- int start = block.getElements().size()-contextSize;- if (start < 0)- start=0;- else if (start > 0)- appendExpander(builder, index, start);- for (int j=start; j<block.getElements().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else if (index == change.getDiffBlocks().size()-1) {- int end = block.getElements().size();- int skipped = 0;- if (end > contextSize) {- skipped = end-contextSize;- end = contextSize;- }- for (int j=lastContextSize; j<end; j++)- appendEqual(builder, block, j, lastContextSize);- if (skipped != 0)- appendExpander(builder, index, skipped);- } else if (2*contextSize < block.getElements().size()) {- for (int j=lastContextSize; j<contextSize; j++)- appendEqual(builder, block, j, lastContextSize);- appendExpander(builder, index, block.getElements().size() - 2*contextSize);- for (int j=block.getElements().size()-contextSize; j<block.getElements().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else {- for (int j=lastContextSize; j<block.getElements().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- }- }-private void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize) {if (lastContextSize != 0)builder.append("<tr class='code expanded'>");@@ -1116,5 +1069,38 @@ public class BlobTextDiffPanel extends Panel {String lastNewCommitHash;}++ private class ExpandCallbackImpl implements DiffExpandSupport.ExpandCallback {+ @Override+ public void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize) {+ BlobTextDiffPanel.this.appendEqual(builder, block, lineIndex, lastContextSize);+ }++ @Override+ public void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ BlobTextDiffPanel.this.appendExpander(builder, blockIndex, skippedLines);+ }+ }++ @Override+ public Collection<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ if (getAnnotationSupport() != null) {+ var markRange = getAnnotationSupport().getMarkRange();+ if (markRange != null) {+ String fileName;+ List<String> fileLines;+ if (markRange.isLeftSide()) {+ fileName = change.getOldBlobIdent().getName();+ fileLines = change.getOldText().getLines();+ } else {+ fileName = change.getNewBlobIdent().getName();+ fileLines = change.getNewText().getLines();+ }+ tools.add(new HighlightedTextTool(fileName, fileLines, markRange));+ }+ }+ return tools;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffResourceReference.javaindex 8f5b598cb5..b88a51bc52 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffResourceReference.java@@ -10,10 +10,10 @@ import org.apache.wicket.request.resource.CssResourceReference;import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;import io.onedev.server.web.asset.codeproblem.CodeProblemResourceReference;import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceReference;-import io.onedev.server.web.asset.diff.DiffResourceReference;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;+import io.onedev.server.web.asset.textdiff.TextDiffResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class BlobTextDiffResourceReference extends BaseDependentResourceReference {@@ -27,7 +27,7 @@ public class BlobTextDiffResourceReference extends BaseDependentResourceReferenc@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new DiffResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.cssindex f067a66cab..5b6d420850 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css@@ -6,17 +6,6 @@.blob-text-diff>.text-diff>tbody>tr>td {position: relative;}-.blob-text-diff>.text-diff>tbody>tr>td.number {- padding: 0.15rem 0.6rem 0.15rem 0;- border-left: 1px solid var(--light-gray);- text-align: right;- color: var(--gray);- white-space: nowrap;-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.number {- border-left-color: var(--dark-mode-lighter-dark);- color: var(--dark-mode-gray);-}.blob-text-diff>.text-diff>tbody>tr>td.number>.coverage {display: block;position: absolute;@@ -44,52 +33,12 @@background: #b37600;}--.blob-text-diff>.text-diff>tbody>tr:not(.expanded)+tr.expanded>td, .blob-text-diff>.text-diff>tbody>tr.expanded+tr:not(.expanded)>td {- border-top: 1px solid var(--light-gray);-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr:not(.expanded)+tr.expanded>td,-.dark-mode .blob-text-diff>.text-diff>tbody>tr.expanded+tr:not(.expanded)>td {- border-top-color: var(--dark-mode-lighter-dark);-}-.blob-text-diff>.text-diff>tbody>tr.expanded>td {- background: #F6F9FC;-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr.expanded>td {- background: var(--dark-mode-light-dark);-}+/* Additional skipped border for blob diffs */.blob-text-diff>.text-diff>tbody>tr.expander>td.skipped {- padding: 0.5rem 1.2rem;border-left: 1px solid var(--light-gray);- background: #F0F8FF;- color: var(--gray);}.dark-mode .blob-text-diff>.text-diff>tbody>tr.expander>td.skipped {border-left-color: var(--dark-mode-lighter-dark);- background: rgb(23, 33, 53);- color: var(--dark-mode-gray);-}-.blob-text-diff>.text-diff>tbody>tr.expander>td.expander {- text-align: center;- overflow: hidden;- vertical-align: middle;-}-.blob-text-diff>.text-diff>tbody>tr.expander>td.expander a {- display: block;- background: #F0F8FF;- color: var(--gray);- padding: 2rem 0;- margin: -2rem -1px;-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr.expander>td.expander a {- background: rgb(23, 33, 53);- color: var(--gray);-}--.blob-text-diff>.text-diff>tbody>tr.expander>td.expander>a:hover,-.blob-text-diff>.text-diff>tbody>tr.expander>td.expander>a:focus {- background: var(--primary);- color: white;}.blob-text-diff>.text-diff>tbody>tr>td:last-child {@@ -112,16 +61,28 @@.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.operation {border-left-color: var(--dark-mode-lighter-dark);}-.blob-text-diff>.text-diff>tbody>tr>td:FIRST-CHILD {- border-left: 1px solid var(--light-gray);+.blob-text-diff>.text-diff>tbody>tr>td:first-child {+ border-left: 1px solid var(--light-gray) !important;}-.dark-mode .blob-text-diff>.text-diff>tbody>tr>td:FIRST-CHILD {+.blob-text-diff>.text-diff>tbody>tr>td.old.number {+ border-left: 1px solid #f1c0c0 !important;+}+.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.old.number {+ border-left-color: rgb(97, 48, 63) !important;+}+.blob-text-diff>.text-diff>tbody>tr>td.new.number {+ border-left: 1px solid #c1e9c1 !important;+}+.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.new.number {+ border-left-color: rgb(38, 76, 50) !important;+}+.dark-mode .blob-text-diff>.text-diff>tbody>tr>td:first-child {border-left-color: var(--dark-mode-lighter-dark);}-.blob-text-diff>.text-diff>tbody>tr:LAST-CHILD>td {+.blob-text-diff>.text-diff>tbody>tr:last-child>td {border-bottom: 1px solid var(--light-gray);}-.dark-mode .blob-text-diff>.text-diff>tbody>tr:LAST-CHILD>td {+.dark-mode .blob-text-diff>.text-diff>tbody>tr:last-child>td {border-bottom-color: var(--dark-mode-lighter-dark);}.blob-text-diff>.text-diff>tbody>tr>td.old.operation {@@ -143,22 +104,7 @@border-left-color: rgb(103, 68, 0);}-.blob-text-diff>.text-diff>tbody>tr>td.old.number {- background: #ffdddd;- border-left: 1px solid #f1c0c0;-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.old.number {- background: rgb(62, 20, 25);- border-left-color: rgb(97, 48, 63);-}-.blob-text-diff>.text-diff>tbody>tr>td.new.number {- background: #dbffdb;- border-left: 1px solid #c1e9c1;-}-.dark-mode .blob-text-diff>.text-diff>tbody>tr>td.new.number {- background: rgb(6, 49, 47);- border-left-color: rgb(38, 76, 50);-}+/* Special styling for modified lines (old+new) */.blob-text-diff>.text-diff>tbody>tr>td.old.new.number {background: #FAF3D0;border-left: 1px solid #EBD049;@@ -207,3 +153,6 @@.blob-text-diff>.text-diff>tbody>tr>td.blame.abbr .same-as-above {margin-left: 1rem;}+.blob-text-diff>.text-diff {+ table-layout: fixed;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.jsindex de5c88d30f..173cd19574 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js@@ -533,214 +533,19 @@ onedev.server.blobTextDiff = {return;}- var oldLines = [], newLines = [];+ // Determine if this is split view (side-by-side) or unified view+ var isSplitView = $codeTrs.first().children(".content").length == 2;- $codeTrs.each(function() {- var $codeTr = $(this);- var $content = $codeTr.children(".content");- if ($content.length == 2) {- var $old = $content.first();- if (!$old.hasClass("none"))- oldLines.push($old.text());-- var $new = $content.last();- if (!$new.hasClass("none"))- newLines.push($new.text());- } else if ($content.hasClass("old") && $content.hasClass("new")) {- var oldPartials = [];- var newPartials = [];-- $content.contents().each(function() {- var $this = $(this);- var text = $this.text();- if ($this.hasClass("delete")) {- oldPartials.push(text);- } else if ($this.hasClass("insert")) {- newPartials.push(text);- } else {- oldPartials.push(text);- newPartials.push(text);- }- });- oldLines.push(oldPartials.join(""));- newLines.push(newPartials.join(""));- } else if ($content.hasClass("old")) {- oldLines.push($content.text());- } else if ($content.hasClass("new")) {- newLines.push($content.text());- } else {- oldLines.push($content.text());- newLines.push($content.text());- }- });-- function saveSyntaxes(syntaxes, text, style, lineIndex, beginPos) {- if (lineIndex != undefined && beginPos != undefined && style != null) {- var classNames = "cm-" + style.replace(/ +/g, " cm-");- var lineSyntaxes = syntaxes[lineIndex];- if (lineSyntaxes == undefined) {- lineSyntaxes = [];- syntaxes[lineIndex] = lineSyntaxes;- }- for (var i=0; i<text.length; i++)- lineSyntaxes[i+beginPos] = classNames;- }- }-- var oldSyntaxes = [];- var oldProcessed = false;- var newSyntaxes = [];- var newProcessed = false;-- function doneHighlight() {- if (oldProcessed && newProcessed) {- var $codeTr = $firstCodeTr;- var oldLineIndex = 0;- var newLineIndex = 0;- while (true) {- var oldLineSyntaxes = oldSyntaxes[oldLineIndex];- var newLineSyntaxes = newSyntaxes[newLineIndex];- $codeTr.children("td.content:not(.none)").each(function() {- var $td = $(this);-- var $highlighted = $("<div></div>");-- var partial = [];- var classNames = "";- function appendPartial() {- if (partial.length != 0) {- var $span = $("<span></span>");- $span.text(partial.join(""));- $span.attr("class", classNames);- $highlighted.append($span);- }- }-- var oldPos = newPos = 0;- $td.contents().each(function() {- var $content = $(this);- var text = $content.text();- var lineSyntaxes;- var pos;- if ($td.hasClass("old") && $td.hasClass("new")) {- if ($content.hasClass("insert")) {- lineSyntaxes = newLineSyntaxes;- pos = newPos;- newPos += text.length;- } else if ($content.hasClass("delete")) {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- } else {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- newPos += text.length;- }- } else if ($td.hasClass("new")) {- lineSyntaxes = newLineSyntaxes;- pos = newPos;- newPos += text.length;- } else if ($td.hasClass("old")) {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- } else if ($td.hasClass("right")) {- lineSyntaxes = newLineSyntaxes;- pos = newPos;- oldPos += text.length;- newPos += text.length;- } else {- lineSyntaxes = oldLineSyntaxes;- pos = oldPos;- oldPos += text.length;- newPos += text.length;- }-- for (var i=0; i<text.length; i++) {- var currentClassNames = $content[0].className;- if (currentClassNames == undefined)- currentClassNames = "";-- if (lineSyntaxes) {- var syntaxClassNames = lineSyntaxes[pos+i];- if (syntaxClassNames != undefined && syntaxClassNames.length != 0) {- if (currentClassNames.length != 0)- currentClassNames += " ";- currentClassNames += syntaxClassNames;- }- }- if (currentClassNames != classNames) {- appendPartial();- partial = [];- classNames = currentClassNames;- }- partial.push(text.charAt(i));- }- })- appendPartial();- $td.html($highlighted.html());- });-- var $contents = $codeTr.children("td.content");- if ($contents.length == 2) {- if (!$contents.first().hasClass("none"))- oldLineIndex++;- if (!$contents.last().hasClass("none"))- newLineIndex++;- } else {- if ($contents.hasClass("old") || $contents.hasClass("equal"))- oldLineIndex++;- if ($contents.hasClass("new") || $contents.hasClass("equal"))- newLineIndex++;- }-- $codeTr.find(onedev.server.blobTextDiff.symbolClasses).mouseover($container.data("symbolHover"));- if ($codeTr.is($lastCodeTr))- break;- $codeTr = $codeTr.next();- }-- $codeTrs.addClass("syntaxHighlighted");- }- }-- var oldModeInfo = onedev.server.codemirror.findModeByFileName(oldBlobPath);- if (oldModeInfo) {- onedev.server.codemirror.highlightSyntax(- oldLines.join("\n"),- oldModeInfo,- function(text, style, lineIndex, beginPos) {- saveSyntaxes(oldSyntaxes, text, style, lineIndex, beginPos);- },- undefined,- function() {- oldProcessed = true;- doneHighlight();- }- );- } else {- oldProcessed = true;- doneHighlight();- }-- var newModeInfo = onedev.server.codemirror.findModeByFileName(newBlobPath);- if (newModeInfo) {- onedev.server.codemirror.highlightSyntax(- newLines.join("\n"),- newModeInfo,- function(text, style, lineIndex, beginPos) {- saveSyntaxes(newSyntaxes, text, style, lineIndex, beginPos);- },- undefined,- function() {- newProcessed = true;- doneHighlight();- }- );+ if (isSplitView) {+ onedev.server.textDiff.highlightSyntaxForSplitDiff($codeTrs, oldBlobPath, newBlobPath, function() {+ $codeTrs.addClass("syntaxHighlighted");+ $codeTrs.find(onedev.server.blobTextDiff.symbolClasses).mouseover($container.data("symbolHover"));+ });} else {- newProcessed = true;- doneHighlight();+ onedev.server.textDiff.highlightSyntaxForUnifiedDiff($codeTrs, oldBlobPath, newBlobPath, function() {+ $codeTrs.addClass("syntaxHighlighted");+ $codeTrs.find(onedev.server.blobTextDiff.symbolClasses).mouseover($container.data("symbolHover"));+ });}});},diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/BlobDiffTitle.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.htmlrename to server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/BlobDiffTitle.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/BlobDiffTitle.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.javarename to server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/BlobDiffTitle.javaindex 417993568e..4ccb900076 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/BlobDiffTitle.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.diff.difftitle;+package io.onedev.server.web.component.diff.blob.title;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/DiffTitleResourceReference.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/DiffTitleResourceReference.javaindex 22e6a8963e..18d9565a9f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/DiffTitleResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.diff.difftitle;+package io.onedev.server.web.component.diff.blob.title;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/diff-title.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/diff-title.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/diff-title.cssrename to server-core/src/main/java/io/onedev/server/web/component/diff/blob/title/diff-title.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 4892493d22..bbc9cc8f37 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -1187,9 +1187,12 @@ public abstract class RevisionDiffPanel extends Panel {protected void onActive(AjaxRequestTarget target) {selectedPath = change.getPath();var encodedPath = encodePath(selectedPath);- target.appendJavaScript(String.format(- "onedev.server.revisionDiff.setDiffLinkActive('diff-link-%s');$('#diff-link-%s')[0].scrollIntoViewIfNeeded(false);",- encodedPath, encodedPath));+ target.appendJavaScript(String.format("""+ onedev.server.revisionDiff.setDiffLinkActive('diff-link-%s');+ var $diffLink = $('#diff-link-%s');+ if ($diffLink.length > 0)+ $diffLink[0].scrollIntoViewIfNeeded(false);+ """, encodedPath, encodedPath));}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.html b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.htmlrename to server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.javarename to server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.javaindex 120e913ef0..7e9c8ce2f0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBar.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.diff.diffstat;+package io.onedev.server.web.component.diff.stat;import static io.onedev.server.web.translation.Translation._T;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBarResourceReference.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBarResourceReference.javaindex 1a24322af0..977cdb34b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/DiffStatBarResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.diff.diffstat;+package io.onedev.server.web.component.diff.stat;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css b/server-core/src/main/java/io/onedev/server/web/component/diff/stat/diff-stat-bar.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.cssrename to server-core/src/main/java/io/onedev/server/web/component/diff/stat/diff-stat-bar.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.htmlnew file mode 100644index 0000000000..bba125bcdd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <div wicket:id="content"></div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.javanew file mode 100644index 0000000000..f3144bcdac--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java@@ -0,0 +1,244 @@+package io.onedev.server.web.component.diff.text;++import static io.onedev.server.util.diff.DiffRenderer.toHtml;+import static io.onedev.server.web.translation.Translation._T;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;+import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;++import java.text.MessageFormat;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.diff.DiffBlock;+import io.onedev.server.util.diff.DiffMatchPatch.Operation;+import io.onedev.server.util.diff.DiffUtils;+import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.asset.icon.IconScope;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.component.diff.DiffExpandSupport;+import io.onedev.server.web.component.svg.SpriteImage;++public class PlainTextDiffPanel extends Panel {++ private final boolean showLineNumbers;++ private final DiffExpandSupport expandSupport = new DiffExpandSupport();++ private final List<DiffBlock<String>> diffBlocks;++ private final String fileName;++ private AbstractPostAjaxBehavior callbackBehavior;++ public PlainTextDiffPanel(String id, List<String> oldLines, List<String> newLines) {+ this(id, oldLines, newLines, false, null);+ }++ public PlainTextDiffPanel(String id, List<String> oldLines, List<String> newLines, boolean showLineNumbers) {+ this(id, oldLines, newLines, showLineNumbers, null);+ }++ public PlainTextDiffPanel(String id, List<String> oldLines, List<String> newLines, boolean showLineNumbers, String fileName) {+ super(id);+ this.showLineNumbers = showLineNumbers;+ this.fileName = fileName;+ diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.IGNORE_TRAILING);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("content", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ return renderDiffs();+ }+ }).setEscapeModelStrings(false));++ add(callbackBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ if ("expand".equals(params.getParameterValue("action").toString(""))) {+ int index = params.getParameterValue("param1").toInt();+ int lastContextSize = expandSupport.getContextSize(index);+ int contextSize = expandSupport.expand(index);++ StringBuilder builder = new StringBuilder();+ DiffBlock<String> block = diffBlocks.get(index);+ expandSupport.appendEquals(builder, index, lastContextSize, contextSize,+ block, diffBlocks.size(), new ExpandCallbackImpl());++ String expanded = StringUtils.replace(builder.toString(), "\n", "");+ String script = String.format("onedev.server.plainTextDiff.expand('%s', %d, \"%s\");",+ getMarkupId(), index, escapeJavaScript(expanded));+ target.appendJavaScript(script);+ }+ }++ });++ setOutputMarkupId(true);+ }++ private String renderDiffs() {+ boolean hasChanges = diffBlocks.stream().anyMatch(block -> block.getOperation() != Operation.EQUAL);+ if (!hasChanges) {+ return "<div class='alert alert-notice alert-light-warning'>" + _T("Nothing changed yet") + "</div>";+ }++ StringBuilder builder = new StringBuilder();+ builder.append("<table class='text-diff");+ if (fileName != null)+ builder.append(" cm-s-eclipse");+ builder.append("'><colgroup>");+ if (showLineNumbers) {+ int baseLineNumColumnWidth = 66;+ int operationColumnWidth = 15;+ builder.append(String.format("<col width='%d'></col><col width='%d'></col><col width='%d'></col><col></col></colgroup>",+ baseLineNumColumnWidth, baseLineNumColumnWidth, operationColumnWidth));+ } else {+ builder.append("<col width='15'></col><col></col></colgroup>");+ }++ ExpandCallbackImpl callback = new ExpandCallbackImpl();+ for (int i = 0; i < diffBlocks.size(); i++) {+ DiffBlock<String> block = diffBlocks.get(i);+ if (block.getOperation() == Operation.EQUAL) {+ int contextSize = expandSupport.getContextSize(i);+ expandSupport.appendEquals(builder, i, 0, contextSize,+ block, diffBlocks.size(), callback);+ } else if (block.getOperation() == Operation.DELETE) {+ for (int j = 0; j < block.getElements().size(); j++)+ appendDelete(builder, block, j);+ } else {+ for (int j = 0; j < block.getElements().size(); j++)+ appendInsert(builder, block, j);+ }+ }++ builder.append("</table>");+ return builder.toString();+ }++ private void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize) {+ if (lastContextSize != 0)+ builder.append("<tr class='code expanded'>");+ else+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ int newLineNo = block.getNewStart() + lineIndex;++ if (showLineNumbers) {+ builder.append("<td class='number noselect'>").append(oldLineNo + 1).append("</td>");+ builder.append("<td class='number noselect'>").append(newLineNo + 1).append("</td>");+ }++ builder.append("<td class='operation'> </td>");+ builder.append("<td class='content equal'>");+ appendLine(builder, block.getElements().get(lineIndex));+ builder.append("</td>");+ builder.append("</tr>");+ }++ private void appendDelete(StringBuilder builder, DiffBlock<String> block, int lineIndex) {+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;++ if (showLineNumbers) {+ builder.append("<td class='number noselect old'>").append(oldLineNo + 1).append("</td>");+ builder.append("<td class='number noselect old'></td>");+ }++ builder.append("<td class='operation old'>-</td>");+ builder.append("<td class='content old'>");+ appendLine(builder, block.getElements().get(lineIndex));+ builder.append("</td></tr>");+ }++ private void appendInsert(StringBuilder builder, DiffBlock<String> block, int lineIndex) {+ builder.append("<tr class='code original'>");++ int newLineNo = block.getNewStart() + lineIndex;++ if (showLineNumbers) {+ builder.append("<td class='number noselect new'></td>");+ builder.append("<td class='number noselect new'>").append(newLineNo + 1).append("</td>");+ }++ builder.append("<td class='operation new'>+</td>");+ builder.append("<td class='content new'>");+ appendLine(builder, block.getElements().get(lineIndex));+ builder.append("</td></tr>");+ }++ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");++ String expandSvg = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref(IconScope.class, "expand2"));+ String ellipsisSvg = String.format("<svg class='icon'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref(IconScope.class, "ellipsis"));++ String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);+ var skippedMessage = MessageFormat.format(_T("skipped {0} lines"), skippedLines);++ if (showLineNumbers) {+ builder.append("<td colspan='2' class='expander noselect'><a data-tippy-content='").append(_T("Show more lines")).append("' href=\"")+ .append(script).append("\">").append(expandSvg).append("</a></td>");+ } else {+ builder.append("<td class='expander noselect'><a data-tippy-content='").append(_T("Show more lines")).append("' href=\"")+ .append(script).append("\">").append(expandSvg).append("</a></td>");+ }++ builder.append("<td colspan='2' class='skipped noselect'>").append(ellipsisSvg).append(" ")+ .append(skippedMessage).append(" ").append(ellipsisSvg).append("</td>");+ builder.append("</tr>");+ }++ private void appendLine(StringBuilder builder, String line) {+ if (line.length() == 0)+ builder.append(" ");+ else+ builder.append(toHtml(line, null));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new PlainTextDiffResourceReference()));++ CharSequence callback = callbackBehavior.getCallbackFunction(explicit("action"), explicit("param1"));+ String fileNameParam = fileName != null ? "'" + escapeJavaScript(fileName) + "'" : "null";+ String script = String.format("onedev.server.plainTextDiff.onDomReady('%s', %s, %s);",+ getMarkupId(), callback, fileNameParam);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ private class ExpandCallbackImpl implements DiffExpandSupport.ExpandCallback {+ @Override+ public void appendEqual(StringBuilder builder, DiffBlock<String> block, int lineIndex, int lastContextSize) {+ PlainTextDiffPanel.this.appendEqual(builder, block, lineIndex, lastContextSize);+ }++ @Override+ public void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ PlainTextDiffPanel.this.appendExpander(builder, blockIndex, skippedLines);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffResourceReference.javanew file mode 100644index 0000000000..1cb5334b17--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.web.component.diff.text;++import java.util.List;++import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.textdiff.TextDiffResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class PlainTextDiffResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public PlainTextDiffResourceReference() {+ super(PlainTextDiffResourceReference.class, "plain-text-diff.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));+ return dependencies;+ }++}+diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/plain-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/text/plain-text-diff.jsnew file mode 100644index 0000000000..5dd0e3e982--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/plain-text-diff.js@@ -0,0 +1,61 @@+onedev.server.plainTextDiff = {+ onDomReady: function(containerId, callback, fileName) {+ var $container = $("#" + containerId);+ $container.data("callback", callback);+ $container.data("fileName", fileName);++ $container.find("td.expander a").each(function() {+ tippy(this, {+ delay: [500, 0],+ placement: 'auto'+ });+ });++ if (fileName) {+ onedev.server.plainTextDiff.highlightSyntax($container, fileName);+ }+ },+ expand: function(containerId, blockIndex, expandedHtml) {+ var $container = $("#" + containerId);+ var $expanderTr = $container.find(".expander" + blockIndex);+ var $prevTr = $expanderTr.prev();+ var $nextTr = $expanderTr.next();+ $expanderTr.replaceWith(expandedHtml);++ var $expandedTrs;+ if ($prevTr.length != 0 && $nextTr.length != 0) {+ $expandedTrs = $prevTr.nextAll().filter($nextTr.prevAll());+ } else if ($prevTr.length != 0) {+ $expandedTrs = $prevTr.nextAll();+ } else {+ $expandedTrs = $nextTr.prevAll();+ }++ $container.find("td.expander a").each(function() {+ tippy(this, {+ delay: [500, 0],+ placement: 'auto'+ });+ });++ var fileName = $container.data("fileName");+ if (fileName) {+ var $textDiff = $container.find("table.text-diff");+ $textDiff.removeClass("syntax-highlighted");+ onedev.server.plainTextDiff.highlightSyntax($container, fileName);+ }+ $(document).trigger('afterElementReplace', containerId);+ },+ highlightSyntax: function($container, fileName) {+ var $textDiff = $container.find("table.text-diff");+ if ($textDiff.hasClass("syntax-highlighted"))+ return;++ var $trs = $textDiff.find("tr.code");++ onedev.server.textDiff.highlightSyntaxForUnifiedDiff($trs, fileName, fileName, function() {+ $textDiff.addClass("syntax-highlighted");+ });+ }+};+diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.htmlindex f9e09a12c0..e7289a04f4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html@@ -18,7 +18,7 @@</form></wicket:fragment><wicket:fragment wicket:id="optionsFrag">- <a wicket:id="aiSummarize" t:data-tippy-content="Summarize comments with AI" class="btn btn-xs btn-outline-secondary btn-hover-primary btn-icon"><wicket:svg href="ai3" class="icon"></wicket:svg></a>+ <a wicket:id="aiSummarize" t:data-tippy-content="Summarize comments with AI" class="btn btn-xs btn-outline-secondary btn-hover-primary btn-icon"><wicket:svg href="ai2" class="icon"></wicket:svg></a><div class="btn-group"><a wicket:id="showComments" t:data-tippy-content="Toggle comments" class="btn btn-xs text-muted btn-outline-secondary btn-active-secondary btn-icon"><wicket:svg href="comments" class="icon"></wicket:svg></a><a wicket:id="showChangeHistory" t:data-tippy-content="Toggle change history" class="btn btn-xs text-muted btn-outline-secondary btn-active-secondary btn-icon"><wicket:svg href="history" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.javaindex 9d6fc5974f..da3305237a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java@@ -10,12 +10,12 @@ import io.onedev.server.web.asset.atwho.AtWhoResourceReference;import io.onedev.server.web.asset.caret.CaretResourceReference;import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;import io.onedev.server.web.asset.cookies.CookiesResourceReference;-import io.onedev.server.web.asset.diff.DiffResourceReference;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;+import io.onedev.server.web.asset.textdiff.TextDiffResourceReference;import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -31,7 +31,7 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AtWhoResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new DiffResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));diff --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 48d9fd4f1a..d00da1d1fe 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@@ -484,4 +484,4 @@}.dark-mode .markdown-rendered .callout-content {color: var(--dark-mode-gray) !important;-}\ No newline at end of file+}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 e7437161c2..39ca24094e 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@@ -1095,7 +1095,7 @@ onedev.server.markdown = {var $this = $(this);var suggestionFile = $this.data("suggestionfile");if (suggestionFile) {- onedev.server.diff.highlightSyntax($this.children(".text-diff"), suggestionFile);+ onedev.server.textDiff.highlightSyntaxForUnifiedDiff($this.children(".text-diff"), suggestionFile, suggestionFile);} else {var modeName = $this.data("language");if (modeName) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 72c7d46d49..8624545ab2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -7,6 +7,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.File;import java.io.Serializable;import java.time.ZoneId;+import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;@@ -60,6 +61,8 @@ import com.google.common.collect.Sets;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.OneDev;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.commandhandler.Upgrade;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.model.User;@@ -70,7 +73,6 @@ import io.onedev.server.web.WebSession;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;import io.onedev.server.web.behavior.ZoneIdBehavior;import io.onedev.server.web.component.svg.SpriteImage;@@ -162,10 +164,10 @@ public abstract class BasePage extends WebPage {if (payload.getMessage() instanceof ObservablesChanged observablesChanged) {notifyObservablesChange(payload.getHandler(), observablesChanged.getObservables());} else if (payload.getMessage() instanceof ChatToolExecution chatToolExecution) {- for (var behavior : findBehaviors(ChatTool.class)) {- if (behavior.getSpecification().name().equals(chatToolExecution.getToolName())) {+ for (var tool : findChatTools()) {+ if (tool.getSpecification().name().equals(chatToolExecution.getToolName())) {try {- var executionFuture = behavior.execute(payload.getHandler(), chatToolExecution.getToolArguments());+ var executionFuture = tool.execute(payload.getHandler(), chatToolExecution.getToolArguments());chatToolExecution.setExecutionFuture(executionFuture);} catch (Throwable t) {var executionFuture = new CompletableFuture<ChatToolExecution.Result>();@@ -412,10 +414,24 @@ public abstract class BasePage extends WebPage {super.onAfterRender();}+ public Collection<ChatTool> findChatTools() {+ var tools = new ArrayList<ChatTool>();+ if (this instanceof ChatToolAware)+ tools.addAll(((ChatToolAware) this).getChatTools());++ visitChildren(ChatToolAware.class, (IVisitor<Component, Void>) (object, visit) -> {+ tools.addAll(((ChatToolAware) object).getChatTools());+ });++ return tools;+ }+public <T extends Behavior> Collection<T> findBehaviors(Class<T> type) {Collection<T> behaviors = new HashSet<>();behaviors.addAll(getBehaviors(type));- visitChildren(Component.class, (IVisitor<Component, Void>) (object, visit) -> behaviors.addAll(object.getBehaviors(type)));+ visitChildren(Component.class, (IVisitor<Component, Void>) (object, visit) -> {+ behaviors.addAll(object.getBehaviors(type));+ });return behaviors;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex d47080aed2..598596502d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -71,6 +71,8 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.event.project.CommitIndexed;import io.onedev.server.git.Blob;@@ -106,7 +108,6 @@ import io.onedev.server.util.FilenameUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.component.commit.status.CommitStatusLink;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -141,7 +142,7 @@ import io.onedev.server.web.util.EditParamsAware;import io.onedev.server.web.websocket.ChatToolExecution;public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,- EditParamsAware, JobAuthorizationContextAware {+ EditParamsAware, JobAuthorizationContextAware, ChatToolAware {private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";@@ -377,75 +378,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,}});-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getRootFilesAndFolders")- .description("List files and folders under repository root in json format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(null), false));- }-- });-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getFilesAndSubfolders")- .description("List all files and subfolders under specified folder in json format")- .parameters(JsonObjectSchema.builder()- .addStringProperty("folderPath").description(_T("Folder path to list all files and subfolders"))- .required("folderPath").build())- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(arguments.get("folderPath").asText()), false));- }-- });- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getTextContent")- .description("Get text content of specified file in json format")- .parameters(JsonObjectSchema.builder()- .addStringProperty("filePath").description(_T("File path to get text content"))- .required("filePath").build())- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- var filePath = arguments.get("filePath").asText();- filePath = StringUtils.strip(filePath.replace('\\', '/'), "/");- var blobIdent = gitService.getBlobIdent(getProject(), getCommit().copy(), filePath);- if (blobIdent == null)- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "File not found")), false));- if (!blobIdent.isFile())- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a file")), false));-- var blob = getProject().getBlob(blobIdent, true);- if (blob.getText() != null)- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", true, "textContent", blob.getText().getContent())), false));- else- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a text file")), false));- }-- }- );}/*@@ -881,7 +813,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,&& getBlobIdent().isFile()&& getBlob(true).getText() != null&& getBlob(true).getLfsPointer() == null) {- blobContent = new SourceViewPanel(BLOB_CONTENT_ID, this, false);+ blobContent = new SourceViewPanel(BLOB_CONTENT_ID, this, null);} else {Fragment fragment = new Fragment(BLOB_CONTENT_ID, "binaryOrLargeFileFrag", this);@@ -1781,4 +1713,72 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,return convertToJson(Map.of("successful", true, "filesAndFolders", filesAndFolders));}+ @Override+ public Collection<ChatTool> getChatTools() {+ return List.of(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getRootFilesAndFolders")+ .description("List files and folders under repository root in json format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(null), false));+ }++ }, new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getFilesAndSubfolders")+ .description("List all files and subfolders under specified folder in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("folderPath").description(_T("Folder path to list all files and subfolders"))+ .required("folderPath").build())+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(arguments.get("folderPath").asText()), false));+ }++ }, new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getTextContent")+ .description("Get text content of specified file in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("filePath").description(_T("File path to get text content"))+ .required("filePath").build())+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var filePath = arguments.get("filePath").asText();+ filePath = StringUtils.strip(filePath.replace('\\', '/'), "/");+ var blobIdent = gitService.getBlobIdent(getProject(), getCommit().copy(), filePath);+ if (blobIdent == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "File not found")), false));+ if (!blobIdent.isFile())+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a file")), false));++ var blob = getProject().getBlob(blobIdent, true);+ if (blob.getText() != null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", true, "textContent", blob.getText().getContent())), false));+ else+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a text file")), false));+ }+ }+ );+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.htmlindex c1cc5bd513..68273495b2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html@@ -4,7 +4,7 @@<div class="body"><form wicket:id="form"><div wicket:id="feedback"></div>- <div wicket:id="changesOfOthers" class="mb-4"></div>+ <div wicket:id="otherChange" class="mb-4"></div><div wicket:id="commitMessage" class="no-autosize mb-4"></div><input wicket:id="save" type="submit" t:value="Commit" class="btn btn-primary mr-1"><input wicket:id="cancel" type="button" t:value="Cancel" class="btn btn-secondary">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex c0d3d22662..f1011b0d13 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -3,9 +3,11 @@ package io.onedev.server.web.page.project.blob.render.commitoption;import static io.onedev.server.web.translation.Translation._T;import java.text.MessageFormat;+import java.util.ArrayList;import java.util.Arrays;import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Map;import java.util.Set;@@ -53,8 +55,7 @@ import io.onedev.server.util.Provider;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;-import io.onedev.server.web.component.diff.blob.BlobDiffPanel;-import io.onedev.server.web.component.diff.revision.DiffViewMode;+import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.blob.RevisionResolved;@@ -70,7 +71,7 @@ public class CommitOptionPanel extends Panel {private CommitMessageBean commitMessageBean = new CommitMessageBean();- private BlobChange changesOfOthers;+ private BlobChange otherChange;private boolean contentModified;@@ -135,22 +136,58 @@ public class CommitOptionPanel extends Panel {return OneDev.getInstance(GitService.class);}- private void newChangesOfOthersContainer(@Nullable AjaxRequestTarget target) {- Component changesOfOthersContainer;- if (changesOfOthers != null)- changesOfOthersContainer = new BlobDiffPanel("changesOfOthers", changesOfOthers, DiffViewMode.UNIFIED, null);- else- changesOfOthersContainer = new WebMarkupContainer("changesOfOthers").setVisible(false);+ private void addOrReplaceOtherChangeContainer(@Nullable AjaxRequestTarget target) {+ Component otherChangeContainer;+ if (otherChange != null) {+ List<String> oldLines;+ List<String> newLines;+ if (otherChange.getType() == DiffEntry.ChangeType.ADD) {+ oldLines = new ArrayList<>();+ if (otherChange.getNewText() != null)+ newLines = otherChange.getNewText().getLines();+ else+ newLines = null;+ } else if (otherChange.getType() == DiffEntry.ChangeType.DELETE) {+ if (otherChange.getOldText() != null)+ oldLines = otherChange.getOldText().getLines();+ else+ oldLines = null;+ newLines = new ArrayList<>();+ } else {+ if (otherChange.getOldText() != null)+ oldLines = otherChange.getOldText().getLines();+ else+ oldLines = null;+ if (otherChange.getNewText() != null)+ newLines = otherChange.getNewText().getLines();+ else+ newLines = null;+ }+ if (oldLines != null && newLines != null) {+ if (!oldLines.equals(newLines)) {+ form.warn(_T("Someone made below change since you started editing"));+ otherChangeContainer = new PlainTextDiffPanel("otherChange", oldLines, newLines, true, context.getBlobIdent().path);+ } else {+ form.warn(_T("Someone changed file mode since you started editing"));+ otherChangeContainer = new WebMarkupContainer("otherChange").setVisible(false);+ }+ } else {+ form.warn(_T("Someone changed file type since you started editing"));+ otherChangeContainer = new WebMarkupContainer("otherChange").setVisible(false);+ }+ } else {+ otherChangeContainer = new WebMarkupContainer("otherChange").setVisible(false);+ }if (target != null) {- form.replace(changesOfOthersContainer);+ form.replace(otherChangeContainer);target.add(form);- if (changesOfOthers != null) {+ if (otherChange != null) {String script = String.format("$('#%s .commit-option input[type=submit]').val('Commit and overwrite');",getMarkupId());target.appendJavaScript(script);}} else {- form.add(changesOfOthersContainer);+ form.add(otherChangeContainer);}}@@ -163,7 +200,7 @@ public class CommitOptionPanel extends Panel {add(form);form.add(new FencedFeedbackPanel("feedback", form));- newChangesOfOthersContainer(null);+ addOrReplaceOtherChangeContainer(null);form.add(BeanContext.edit("commitMessage", commitMessageBean));AjaxButton saveButton = new AjaxButton("save") {@@ -238,7 +275,7 @@ public class CommitOptionPanel extends Panel {}private boolean save(AjaxRequestTarget target) {- changesOfOthers = null;+ otherChange = null;if (newContentProvider != null && StringUtils.isBlank(context.getNewPath())) {form.error("Please specify file name.");@@ -339,15 +376,13 @@ public class CommitOptionPanel extends Panel {if (pathChange.getNewObjectId().equals(ObjectId.zeroId())) {if (newContentProvider != null) {oldPaths.clear();- changesOfOthers = getBlobChange(path, pathChange, lastPrevCommitId, prevCommitId);- form.warn(_T("Someone made below change since you started editing"));+ otherChange = getBlobChange(path, pathChange, lastPrevCommitId, prevCommitId);break;} else {newCommitId = obsoleteCommitException.getOldCommitId();}} else {- changesOfOthers = getBlobChange(path, pathChange, lastPrevCommitId, prevCommitId);- form.warn(_T("Someone made below change since you started editing"));+ otherChange = getBlobChange(path, pathChange, lastPrevCommitId, prevCommitId);break;}}@@ -362,7 +397,7 @@ public class CommitOptionPanel extends Panel {target.appendJavaScript("$(window).resize();");return true;} else {- newChangesOfOthersContainer(target);+ addOrReplaceOtherChangeContainer(target);return false;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.cssindex fb49732628..425464f0d9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css@@ -3,4 +3,4 @@}.commit-option>.body textarea {height: 360px;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.htmlindex 36b611d03b..369f88eece 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html@@ -9,8 +9,13 @@</div><div wicket:id="editPlainTab" class="tab edit-plain mr-4 d-flex align-items-stretch"><a class="d-flex align-items-center font-weight-bold">- <wicket:svg href="yaml" class="icon mr-1"></wicket:svg>- <wicket:t>YAML</wicket:t>+ <span wicket:id="tabHead"></span>+ </a>+ </div>+ <div wicket:id="changesTab" class="tab changes mr-4 d-flex align-items-stretch">+ <a class="d-flex align-items-center font-weight-bold">+ <wicket:svg href="diff2" class="icon mr-1"></wicket:svg>+ <wicket:t>Changes</wicket:t></a></div><div wicket:id="saveTab" class="save tab mr-4 d-flex align-items-stretch">@@ -24,14 +29,16 @@<div wicket:id="editOptions" class="options ml-auto d-none d-sm-flex align-items-center"></div></div><div class="body flex-grow-1 d-flex flex-column">- <form wicket:id="content" class="content leave-confirm d-flex d-none flex-grow-1 flex-column" onsubmit="return false;">+ <form wicket:id="form" class="leave-confirm d-flex d-none flex-grow-1 flex-column" onsubmit="return false;"><div wicket:id="feedback" class="feedback flex-shrink-0"></div><div wicket:id="editor" class="editor d-flex flex-column flex-grow-1 autofit"></div><a wicket:id="edit" class="edit submit d-none"><wicket:t>submit</wicket:t></a><a wicket:id="editPlain" class="edit-plain submit d-none"><wicket:t>submit</wicket:t></a>+ <a wicket:id="changes" class="changes submit d-none"><wicket:t>submit</wicket:t></a><a wicket:id="save" class="save submit d-none"><wicket:t>submit</wicket:t></a><a wicket:id="flush" class="flush submit d-none"><wicket:t>submit</wicket:t></a></form>+ <div wicket:id="changesViewer" class="changes-viewer flex-grow-1 flex-column autofit p-4"></div><div wicket:id="commitOptions" class="commit-options flex-grow-1 d-none flex-column autofit"></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex 6179e7b4df..364a39669f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.blob.render.edit;import java.nio.charset.StandardCharsets;import java.util.Arrays;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxCallListener;@@ -35,22 +36,20 @@ import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupportpublic abstract class BlobEditPanel extends Panel {- public static enum Tab {EDIT, EDIT_PLAIN, SAVE, FLUSH};+ public static enum Tab {EDIT, EDIT_PLAIN, CHANGES, SAVE, FLUSH};protected final BlobRenderContext context;private Form<?> form;private FormComponentPanel<byte[]> editor;-- private CommitOptionPanel commitOption;++ private CommitOptionPanel commitOption;private AbstractDefaultAjaxBehavior recreateBehavior;private Tab currentTab = Tab.EDIT;-- private byte[] editingContent;-+public BlobEditPanel(String id, BlobRenderContext context) {super(id);this.context = context;@@ -60,7 +59,22 @@ public abstract class BlobEditPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new WebMarkupContainer("editPlainTab").setVisible(this instanceof PlainEditSupport));+ add(new WebMarkupContainer("editPlainTab") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (BlobEditPanel.this instanceof PlainEditSupport)+ add(((PlainEditSupport)BlobEditPanel.this).renderTabHead("tabHead"));+ else+ add(new WebMarkupContainer("tabHead"));+ }++ }.setVisible(this instanceof PlainEditSupport));++ add(new WebMarkupContainer("changesTab")+ .setVisible(context.getMode() != Mode.ADD || context.getNewPath() != null));+add(new WebMarkupContainer("saveTab").setVisible(context.getMode() != Mode.ADD || context.getNewPath() != null));@@ -86,7 +100,7 @@ public abstract class BlobEditPanel extends Panel {add(newEditOptions("editOptions"));- add(form = new Form<Void>("content") {+ add(form = new Form<Void>("form") {private AjaxSubmitLink newSubmitLink(String componentId, Tab tab) {return new AjaxSubmitLink(componentId) {@@ -100,11 +114,8 @@ public abstract class BlobEditPanel extends Panel {&& editor instanceof EditCompleteAware&& !((EditCompleteAware)editor).onEditComplete(target)) {onError(target, form);- } else if (currentTab == Tab.EDIT || currentTab == Tab.EDIT_PLAIN) {- editingContent = editor.getModelObject();- onFlushed(target, editingContent);} else {- onFlushed(target, editingContent);+ onFlushed(target, editor.getModelObject());}} else {if (currentTab == Tab.EDIT@@ -112,29 +123,29 @@ public abstract class BlobEditPanel extends Panel {&& !((EditCompleteAware)editor).onEditComplete(target)) {onError(target, form);} else {- if (currentTab == Tab.EDIT && tab == Tab.EDIT_PLAIN- || currentTab == Tab.EDIT_PLAIN && tab == Tab.EDIT- || tab == Tab.SAVE) {- editingContent = editor.getModelObject();- }- if (tab != Tab.SAVE) {- if (tab == Tab.EDIT)- editor = newEditor("editor", editingContent);- else- editor = ((PlainEditSupport)BlobEditPanel.this).newPlainEditor("editor", editingContent);+ var editingContent = editor.getModelObject();+ if (tab == Tab.EDIT) {+ editor = newEditor("editor", editingContent);+ form.replace(editor);+ updateForm(target);+ hideChangesViewer(target);+ } else if (tab == Tab.EDIT_PLAIN) {+ editor = ((PlainEditSupport)BlobEditPanel.this).newPlainEditor("editor", editingContent);form.replace(editor);+ updateForm(target);+ hideChangesViewer(target);+ } else if (tab == Tab.CHANGES) {+ showChangesViewer(target);} else {commitOption.onContentChange(target);+ hideChangesViewer(target);}String script = String.format("onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.%s'));",BlobEditPanel.this.getMarkupId(true), tab.name().toLowerCase().replace("_", "-"));- target.appendJavaScript(script);-+ target.appendJavaScript(script);currentTab = tab;-- updateForm(target);}}}@@ -182,6 +193,7 @@ public abstract class BlobEditPanel extends Panel {add(newSubmitLink("edit", Tab.EDIT));add(newSubmitLink("editPlain", Tab.EDIT_PLAIN));+ add(newSubmitLink("changes", Tab.CHANGES));add(newSubmitLink("save", Tab.SAVE));add(newSubmitLink("flush", Tab.FLUSH));@@ -192,11 +204,13 @@ public abstract class BlobEditPanel extends Panel {});+ add(newChangesViewerPlaceholder());+add(commitOption = new CommitOptionPanel("commitOptions", context, new Provider<byte[]>() {@Overridepublic byte[] get() {- return editingContent;+ return editor.getModelObject();}}));@@ -217,6 +231,26 @@ public abstract class BlobEditPanel extends Panel {setOutputMarkupId(true);}+ private void showChangesViewer(IPartialPageRequestHandler handler) {+ var changesViewer = newChangesViewer("changesViewer", getInitialContent(), editor.getModelObject());+ changesViewer.setOutputMarkupPlaceholderTag(true);+ replace(changesViewer);+ handler.add(changesViewer);+ }++ private void hideChangesViewer(AjaxRequestTarget target) {+ var changesViewer = newChangesViewerPlaceholder();+ replace(changesViewer);+ target.add(changesViewer);+ }++ private Component newChangesViewerPlaceholder() {+ var changesViewer = new WebMarkupContainer("changesViewer");+ changesViewer.setVisible(false);+ changesViewer.setOutputMarkupPlaceholderTag(true);+ return changesViewer;+ }+@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);@@ -241,6 +275,8 @@ public abstract class BlobEditPanel extends Panel {protected abstract FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent);+ protected abstract Component newChangesViewer(String componentId, byte[] initialContent, byte[] editingContent);+public FormComponentPanel<byte[]> getEditor() {return editor;}@@ -253,17 +289,35 @@ public abstract class BlobEditPanel extends Panel {}protected void updateEditingContent(IPartialPageRequestHandler handler, byte[] editingContent) {- this.editingContent = editingContent;- if (currentTab == Tab.EDIT) {+ if (currentTab == Tab.EDIT)editor = newEditor("editor", editingContent);- form.replace(editor);- } else if (currentTab == Tab.EDIT_PLAIN) {+ elseeditor = ((PlainEditSupport)BlobEditPanel.this).newPlainEditor("editor", editingContent);- form.replace(editor);+ form.replace(editor);++ if (currentTab == Tab.EDIT || currentTab == Tab.EDIT_PLAIN) {+ updateForm(handler);} else {+ // Update editor instead of form to keep form invisible+ editor.setOutputMarkupId(true);+ handler.add(editor);+ }+ handler.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId()));++ if (currentTab == Tab.CHANGES) {+ showChangesViewer(handler);+ } else if (currentTab == Tab.SAVE) {commitOption.onContentChange(handler);}- updateForm(handler);+ }++ private byte[] getInitialContent() {+ if (context.getMode() == Mode.EDIT) {+ var blob = context.getProject().getBlob(context.getBlobIdent(), true);+ return blob.getBytes();+ } else {+ return new byte[0];+ }}protected Tab getCurrentTab() {@@ -271,7 +325,7 @@ public abstract class BlobEditPanel extends Panel {}protected void requestToFlush(IPartialPageRequestHandler handler) {- handler.appendJavaScript(String.format("$('#%s>.blob-edit>.body>.content>.flush').click();", getMarkupId()));+ handler.appendJavaScript(String.format("$('#%s>.blob-edit>.body>form>.flush').click();", getMarkupId()));}protected void onFlushed(IPartialPageRequestHandler handler, byte[] editingContent) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.jsindex 73c9dc5aad..1a242848f4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js@@ -7,30 +7,38 @@ onedev.server.blobEdit = {$head.find(".edit>a").click(function() {if (!$(this).parent().hasClass("active")) {- $body.find(">.content>.edit.submit").click();+ $body.find(">form>.edit.submit").click();}});$head.find(".edit-plain>a").click(function() {if (!$(this).parent().hasClass("active")) {- $body.find(">.content>.edit-plain.submit").click();+ $body.find(">form>.edit-plain.submit").click();}});+ $head.find(".changes>a").click(function() {+ if (!$(this).parent().hasClass("active")) {+ onedev.server.viewState.getFromViewAndSetToHistory();+ $body.find(">form>.changes.submit").click();+ }+ });$head.find(".save>a").click(function() {- onedev.server.viewState.getFromViewAndSetToHistory();- $body.find(">.content>.save.submit").click();+ if (!$(this).parent().hasClass("active")) {+ onedev.server.viewState.getFromViewAndSetToHistory();+ $body.find(">form>.save.submit").click();+ }});$blobEdit.on("getViewState", function(e) {- var $content = $body.children(".content");- if ($content.is(":visible"))+ var $form = $body.children("form");+ if ($form.is(":visible"))return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};elsereturn undefined;});$blobEdit.on("setViewState", function(e, viewState) {- var $content = $body.children(".content");- if ($content.is(":visible") && viewState.scroll) {+ var $form = $body.children("form");+ if ($form.is(":visible") && viewState.scroll) {$body.scrollLeft(viewState.scroll.left);$body.scrollTop(viewState.scroll.top);}@@ -58,14 +66,16 @@ onedev.server.blobEdit = {$body.children().removeClass("d-flex");- var $content = $body.children(".content");+ var $form = $body.children("form");if ($tab.hasClass("edit") || $tab.hasClass("edit-plain")) {- $content.addClass("d-flex");- } else {+ $form.addClass("d-flex");+ } else if ($tab.hasClass("save")) {$body.children(".commit-options").addClass("d-flex");- }+ } else {+ $body.children(".changes-viewer").addClass("d-flex");+ }- if (!$tab.hasClass("save"))+ if (!$tab.hasClass("save") && !$tab.hasClass("changes"))onedev.server.viewState.getFromHistoryAndSetToView();},recordFormFlags: function(formId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.javaindex ca2c2f9ca6..a8c4f17214 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java@@ -2,10 +2,13 @@ package io.onedev.server.web.page.project.blob.render.edit.plain;import java.io.Serializable;+import org.apache.wicket.Component;import org.apache.wicket.markup.html.form.FormComponentPanel;public interface PlainEditSupport extends Serializable {FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent);+ Component renderTabHead(String componentId);+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.javaindex 328a4b5424..8f9c74ee77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java@@ -1,7 +1,9 @@package io.onedev.server.web.page.project.blob.render.noname;+import org.apache.wicket.Component;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.FormComponentPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -24,4 +26,9 @@ public class NoNameEditPanel extends BlobEditPanel {return new NoNameFormComponent(componentId);}+ @Override+ protected Component newChangesViewer(String componentId, byte[] initialContent, byte[] editingContent) {+ return new Label(componentId, "Changes");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.javaindex 0f31f06e28..d55db9615d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java@@ -1,189 +1,207 @@-package io.onedev.server.web.page.project.blob.render.renderers.buildspec;--import static java.util.concurrent.CompletableFuture.completedFuture;--import java.nio.charset.StandardCharsets;-import java.util.concurrent.CompletableFuture;-import java.util.stream.Collectors;--import javax.inject.Inject;-import javax.validation.Validator;--import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.html.form.FormComponentPanel;--import com.fasterxml.jackson.databind.JsonNode;-import com.google.common.base.Joiner;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.ai.BuildSpecSchema;-import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.data.migration.VersionedYamlDoc;-import io.onedev.server.service.TemporalFutureService;-import io.onedev.server.web.behavior.ChatTool;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;-import io.onedev.server.web.websocket.ChatToolExecution;--public class BuildSpecBlobEditPanel extends BlobEditPanel implements PlainEditSupport {-- @Inject- private Validator validator;-- @Inject- private TemporalFutureService temporalFutureService;-- public BuildSpecBlobEditPanel(String id, BlobRenderContext context) {- super(id, context);- }-- private String getBuildSpecFutureId() {- return "buildspec:" + getSession().getId() + ":" + getPath();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- if (getCurrentTab() == Tab.EDIT || getCurrentTab() == Tab.EDIT_PLAIN) {- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getBuildSpecEditInstructions")- .description("Get instructions on how to edit CI/CD spec")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- var instructions = """- OneDev CI/CD spec is a yaml file conforming to below schema:-- <!SCHEMA BEGIN!>- %s- <!SCHEMA END!>-- When editing CI/CD spec, remember that:-- 1. If command step is used, turn on the "run in container" if possible, unless requested by user explicitly- 2. Different steps run in isolated environments, with shared job workspace. So it will not work installing dependencies in one step, and run commands relying on them in another step. You should put them in a single step unless requested by user explicitly- 3. If cache step is used:- 3.1 It should be placed before the step building or testing the project- 3.2 If the project has lock files (package.json, pom.xml, etc.):- 3.2.1 A generate checksum step should be placed before the cache step, to generate checksum of all relevant lock files and store it in a file named checksum.txt- 3.2.2 The key property should be configured as <keyname>-@file:checksum.txt@- 3.2.3 The load keys property should be configured as <keyname>- 3.2.4 The upload strategy property should be configured as UPLOAD_IF_NOT_HIT- 4. If user wants to pass files between different jobs, one job should publish files via the publish artifact step, and another jobs can then download them into job workspace via job dependency- 5. Call tools such as getRootFilesAndFolders, getFilesAndSubfolders and getTextContent to get project structure, and figure out what docker image and commands to use to build or test the project if requested by user- 6. After editing the CI/CD spec, call saveBuildSpec tool to save the result. If saving fails, fix errors according to error messages and schema above and save again- """.formatted(BuildSpecSchema.get());- return completedFuture(new ChatToolExecution.Result(instructions, true));- }-- });-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentBuildSpec")- .description("Get current CI/CD spec in yaml format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- requestToFlush(handler);- var future = new CompletableFuture<ChatToolExecution.Result>();- temporalFutureService.addFuture(getBuildSpecFutureId(), future);- return future;- }-- });-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("saveBuildSpec")- .description("Save CI/CD spec")- .parameters(JsonObjectSchema.builder()- .addStringProperty("buildSpec").description("CI/CD spec yaml to save")- .required("buildSpec").build())- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- if (getCurrentTab() == Tab.EDIT || getCurrentTab() == Tab.EDIT_PLAIN) {- var buildSpecString = arguments.get("buildSpec").asText();- BuildSpec buildSpec;- try {- buildSpec = BuildSpec.parse(buildSpecString.getBytes(StandardCharsets.UTF_8));- } catch (Throwable t) {- return completedFuture(new ChatToolExecution.Result("Malformed CI/CD spec, please fix and save again", false));- }- var violations = validator.validate(buildSpec);- String result;- if (!violations.isEmpty()) {- result = "Failed to validate CI/CD spec, please fix errors below and save again:\n\n" +- Joiner.on("\n").join(violations.stream().map(it -> String.format("\t-> Location: %s, Error: %s", it.getPropertyPath(), it.getMessage())).collect(Collectors.toList()));- } else {- updateEditingContent(handler, buildSpecString.getBytes(StandardCharsets.UTF_8));- result = "CI/CD spec saved successfully";- }- return completedFuture(new ChatToolExecution.Result(result, false));- } else {- throw new ExplicitException("CI/CD spec is not being edited currently");- }- }-- });- }- }-- @Override- protected void onFlushed(IPartialPageRequestHandler handler, byte[] editingContent) {- CompletableFuture<ChatToolExecution.Result> future = temporalFutureService.removeFuture(getBuildSpecFutureId());- if (future != null) {- if (getCurrentTab() == Tab.EDIT || getCurrentTab() == Tab.EDIT_PLAIN) {- var buildSpecString = new String(editingContent, StandardCharsets.UTF_8);- try {- var buildSpec = BuildSpec.parse(buildSpecString.getBytes(StandardCharsets.UTF_8));- buildSpecString = VersionedYamlDoc.fromBean(buildSpec).toYaml();- } catch (Throwable t) {- }- future.complete(new ChatToolExecution.Result(buildSpecString, false));- } else {- future.completeExceptionally(new ExplicitException("CI/CD spec is not being edited currently"));- }- }- }-- @Override- protected void onFlushError(IPartialPageRequestHandler handler) {- var future = temporalFutureService.removeFuture(getBuildSpecFutureId());- if (future != null)- future.completeExceptionally(new ExplicitException("There are errors in current CI/CD spec, please fix first"));- }-- @Override- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {- return new BuildSpecEditPanel(componentId, context, initialContent);- }-- @Override- public FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent) {- return new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent);- }--}+package io.onedev.server.web.page.project.blob.render.renderers.buildspec;++import static java.util.concurrent.CompletableFuture.completedFuture;++import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.concurrent.CompletableFuture;+import java.util.stream.Collectors;++import javax.inject.Inject;+import javax.validation.Validator;++import org.apache.wicket.Component;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.html.form.FormComponentPanel;++import com.fasterxml.jackson.databind.JsonNode;+import com.google.common.base.Joiner;++import dev.langchain4j.agent.tool.ToolSpecification;+import dev.langchain4j.model.chat.request.json.JsonObjectSchema;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.ai.BuildSpecSchema;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.data.migration.VersionedYamlDoc;+import io.onedev.server.service.TemporalFutureService;+import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;+import io.onedev.server.web.websocket.ChatToolExecution;++public class BuildSpecBlobEditPanel extends BlobEditPanel implements PlainEditSupport, ChatToolAware {++ @Inject+ private Validator validator;++ @Inject+ private TemporalFutureService temporalFutureService;++ public BuildSpecBlobEditPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ private String getBuildSpecFutureId() {+ return "buildspec:" + getSession().getId() + ":" + getPath();+ }++ @Override+ protected void onFlushed(IPartialPageRequestHandler handler, byte[] editingContent) {+ CompletableFuture<ChatToolExecution.Result> future = temporalFutureService.removeFuture(getBuildSpecFutureId());+ if (future != null) {+ if (getCurrentTab() != Tab.SAVE) {+ var buildSpecString = new String(editingContent, StandardCharsets.UTF_8);+ try {+ var buildSpec = BuildSpec.parse(buildSpecString.getBytes(StandardCharsets.UTF_8));+ buildSpecString = VersionedYamlDoc.fromBean(buildSpec).toYaml();+ } catch (Throwable t) {+ }+ future.complete(new ChatToolExecution.Result(buildSpecString, false));+ } else {+ future.completeExceptionally(new ExplicitException("CI/CD spec is not being edited currently"));+ }+ }+ }++ @Override+ protected void onFlushError(IPartialPageRequestHandler handler) {+ var future = temporalFutureService.removeFuture(getBuildSpecFutureId());+ if (future != null)+ future.completeExceptionally(new ExplicitException("There are errors in current CI/CD spec, please fix first"));+ }++ @Override+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {+ return new BuildSpecEditPanel(componentId, context, initialContent);+ }++ @Override+ public FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent) {+ return new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent);+ }++ @Override+ public Component renderTabHead(String componentId) {+ return new BuildSpecPlainTabHead(componentId);+ }++ @Override+ protected Component newChangesViewer(String componentId, byte[] initialContent, byte[] editingContent) {+ var oldLines = Arrays.asList(new String(initialContent, StandardCharsets.UTF_8).split("\n"));+ var newLines = Arrays.asList(new String(editingContent, StandardCharsets.UTF_8).split("\n"));+ return new PlainTextDiffPanel(componentId, oldLines, newLines, true, BuildSpec.BLOB_PATH);+ }++ @Override+ public Collection<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ if (getCurrentTab() != Tab.SAVE) {+ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getBuildSpecEditInstructions")+ .description("Get instructions on how to edit CI/CD spec")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var instructions = """+ OneDev CI/CD spec is a yaml file conforming to below schema:++ <!SCHEMA BEGIN!>+ %s+ <!SCHEMA END!>++ When editing CI/CD spec, remember that:++ 1. If command step is used, turn on the "run in container" if possible, unless requested by user explicitly+ 2. Different steps run in isolated environments, with shared job workspace. So it will not work installing dependencies in one step, and run commands relying on them in another step. You should put them in a single step unless requested by user explicitly+ 3. If cache step is used:+ 3.1 It should be placed before the step building or testing the project+ 3.2 If the project has lock files (package.json, pom.xml, etc.):+ 3.2.1 A generate checksum step should be placed before the cache step, to generate checksum of all relevant lock files and store it in a file named checksum.txt+ 3.2.2 The key property should be configured as <keyname>-@file:checksum.txt@+ 3.2.3 The load keys property should be configured as <keyname>+ 3.2.4 The upload strategy property should be configured as UPLOAD_IF_NOT_HIT+ 4. If user wants to pass files between different jobs, one job should publish files via the publish artifact step, and another jobs can then download them into job workspace via job dependency+ 5. Call tools such as getRootFilesAndFolders, getFilesAndSubfolders and getTextContent to get project structure, and figure out what docker image and commands to use to build or test the project if requested by user+ 6. After editing the CI/CD spec, call saveBuildSpec tool to save the result. If saving fails, fix errors according to error messages and schema above and save again+ """.formatted(BuildSpecSchema.get());+ return completedFuture(new ChatToolExecution.Result(instructions, true));+ }++ });++ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentBuildSpec")+ .description("Get current CI/CD spec in yaml format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ requestToFlush(handler);+ var future = new CompletableFuture<ChatToolExecution.Result>();+ temporalFutureService.addFuture(getBuildSpecFutureId(), future);+ return future;+ }++ });++ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("saveBuildSpec")+ .description("Save CI/CD spec")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("buildSpec").description("CI/CD spec yaml to save")+ .required("buildSpec").build())+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (getCurrentTab() != Tab.SAVE) {+ var buildSpecString = arguments.get("buildSpec").asText();+ BuildSpec buildSpec;+ try {+ buildSpec = BuildSpec.parse(buildSpecString.getBytes(StandardCharsets.UTF_8));+ } catch (Throwable t) {+ return completedFuture(new ChatToolExecution.Result("Malformed CI/CD spec, please fix and save again", false));+ }+ var violations = validator.validate(buildSpec);+ String result;+ if (!violations.isEmpty()) {+ result = "Failed to validate CI/CD spec, please fix errors below and save again:\n\n" ++ Joiner.on("\n").join(violations.stream().map(it -> String.format("\t-> Location: %s, Error: %s", it.getPropertyPath(), it.getMessage())).collect(Collectors.toList()));+ } else {+ updateEditingContent(handler, buildSpecString.getBytes(StandardCharsets.UTF_8));+ result = "CI/CD spec saved successfully";+ }+ return completedFuture(new ChatToolExecution.Result(result, false));+ } else {+ throw new ExplicitException("CI/CD spec is not being edited currently");+ }+ }++ });+ }+ return tools;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 90b1372779..516b3f0a31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -543,8 +543,8 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {}@Override- protected boolean isViewPlainSupported() {- return true;+ protected String getPlainName() {+ return "YAML";}private abstract class ElementsViewer<T extends NamedElement> extends Fragment {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.htmlnew file mode 100644index 0000000000..f4513e55dc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.html@@ -0,0 +1,4 @@+<wicket:panel>+ <wicket:svg href="yaml" class="icon mr-1"></wicket:svg>+ <wicket:t>YAML</wicket:t>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.javanew file mode 100644index 0000000000..d5edf32408--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecPlainTabHead.java@@ -0,0 +1,11 @@+package io.onedev.server.web.page.project.blob.render.renderers.buildspec;++import org.apache.wicket.markup.html.panel.Panel;++public class BuildSpecPlainTabHead extends Panel {++ public BuildSpecPlainTabHead(String id) {+ super(id);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.javaindex f34a6b75ea..143743b132 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java@@ -69,9 +69,9 @@ public class BuildSpecRenderer implements BlobRenderer {&& context.getBlobIdent().isFile()&& isBuildSpec(context.getBlobIdent().path)) {if (BlobRenderer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)- return new SourceViewPanel(componentId, context, false);+ return new SourceViewPanel(componentId, context, null);else if (context.isViewPlain())- return new SourceViewPanel(componentId, context, true);+ return new SourceViewPanel(componentId, context, "YAML");elsereturn new BuildSpecBlobViewPanel(componentId, context);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex b654f01687..53d61edbfc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -80,9 +80,4 @@ public class GitLinkPanel extends BlobViewPanel {return false;}- @Override- protected boolean isViewPlainSupported() {- return false;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.javaindex eaef41af16..629f160930 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java@@ -34,9 +34,4 @@ public class ImageViewPanel extends BlobViewPanel {return false;}- @Override- protected boolean isViewPlainSupported() {- return false;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.javaindex aa6c4ce79d..e1963f51b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java@@ -1,9 +1,14 @@package io.onedev.server.web.page.project.blob.render.renderers.markdown;+import java.nio.charset.StandardCharsets;+import java.util.Arrays;++import org.apache.wicket.Component;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.FormComponentPanel;+import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;@@ -24,4 +29,11 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {return new MarkdownBlobEditor(componentId, context, initialContent);}+ @Override+ protected Component newChangesViewer(String componentId, byte[] initialContent, byte[] editingContent) {+ var oldLines = Arrays.asList(new String(initialContent, StandardCharsets.UTF_8).split("\n"));+ var newLines = Arrays.asList(new String(editingContent, StandardCharsets.UTF_8).split("\n"));+ return new PlainTextDiffPanel(componentId, oldLines, newLines, true, context.getBlobIdent().path);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.javaindex 3a102a3ca3..b749e807b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java@@ -41,9 +41,4 @@ public class MarkdownBlobViewPanel extends BlobViewPanel {return true;}- @Override- protected boolean isViewPlainSupported() {- return false;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.javaindex 49fca3155d..3cf1a8f902 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java@@ -31,7 +31,7 @@ public class MarkdownRenderer implements BlobRenderer {&& isMarkdown(context.getBlobIdent().path)&& context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {if (context.getPosition() != null || context.getMode() == Mode.BLAME)- return new SourceViewPanel(componentId, context, false);+ return new SourceViewPanel(componentId, context, null);elsereturn new MarkdownBlobViewPanel(componentId, context);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.javaindex abf5286ed4..16c8808096 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java@@ -79,9 +79,4 @@ public class SymbolLinkPanel extends BlobViewPanel {return false;}- @Override- protected boolean isViewPlainSupported() {- return false;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.javaindex 4a21b2c549..4dae064b40 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java@@ -37,10 +37,5 @@ public class VideoViewPanel extends BlobViewPanel {protected boolean isEditSupported() {return false;}-- @Override- protected boolean isViewPlainSupported() {- return false;- }-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.javaindex 2298097325..764e8c8301 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java@@ -1,5 +1,9 @@package io.onedev.server.web.page.project.blob.render.source;+import java.nio.charset.StandardCharsets;+import java.util.Arrays;++import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -12,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;+import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;import io.onedev.server.web.component.sourceformat.OptionChangeCallback;import io.onedev.server.web.component.sourceformat.SourceFormatPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -107,4 +112,11 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {target.appendJavaScript(script);}+ @Override+ protected Component newChangesViewer(String componentId, byte[] initialContent, byte[] editingContent) {+ var oldLines = Arrays.asList(new String(initialContent, StandardCharsets.UTF_8).split("\n"));+ var newLines = Arrays.asList(new String(editingContent, StandardCharsets.UTF_8).split("\n"));+ return new PlainTextDiffPanel(componentId, oldLines, newLines, true, context.getBlobIdent().path);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 6ba3a7fe42..2f14ebb9e7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -73,6 +73,8 @@ import io.onedev.commons.jsymbol.SymbolExtractorRegistry;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.HighlightedTextTool;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.codequality.BlobTarget;@@ -107,7 +109,6 @@ import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;import io.onedev.server.web.component.codecomment.CodeCommentPanel;@@ -144,7 +145,7 @@ import io.onedev.server.web.websocket.ChatToolExecution;* @author robin**/-public class SourceViewPanel extends BlobViewPanel implements Positionable, SearchMenuContributor {+public class SourceViewPanel extends BlobViewPanel implements Positionable, SearchMenuContributor, ChatToolAware {private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);@@ -225,12 +226,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate BlameMessageBehavior blameMessageBehavior;- private final boolean viewPlainMode;+ private final String plainName;- public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {+ public SourceViewPanel(String id, BlobRenderContext context, @Nullable String plainName) {super(id, context);- this.viewPlainMode = viewPlainMode;+ this.plainName = plainName;Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);@@ -926,36 +927,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}});-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentFileInformation")- .description("Get information of current file in json format, including file name and file content")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();- var map = Map.of(- "fileName", context.getBlobIdent().getName(),- "fileContent", Joiner.on('\n').join(lines)- );- return completedFuture(new ChatToolExecution.Result(convertToJson(map), false));- }-- });-- var markRange = getMarkRange();- if (markRange != null) {- add(new HighlightedTextTool(- context.getBlobIdent().getName(),- context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines(),- markRange));- }}private boolean isOutlineVisibleInitially() {@@ -1381,8 +1352,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}@Override- protected boolean isViewPlainSupported() {- return viewPlainMode;+ protected String getPlainName() {+ return plainName;}private void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {@@ -1460,4 +1431,39 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear};}+ @Override+ public Collection<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentFileInformation")+ .description("Get information of current file in json format, including file name and file content")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();+ var map = Map.of(+ "fileName", context.getBlobIdent().getName(),+ "fileContent", Joiner.on('\n').join(lines)+ );+ return completedFuture(new ChatToolExecution.Result(convertToJson(map), false));+ }++ });++ var markRange = getMarkRange();+ if (markRange != null) {+ tools.add(new HighlightedTextTool(+ context.getBlobIdent().getName(),+ context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines(),+ markRange));+ }+ return tools;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.htmlindex 679d537a01..40392c04ba 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html@@ -34,7 +34,7 @@</a></div><!-- Put all options in a single line to make :empty selector working -->- <div class="options d-flex align-items-center"><wicket:enclosure child="viewPlain"><label class="checkbox"><input type="checkbox" wicket:id="viewPlain"> <wicket:t>YAML</wicket:t></label></wicket:enclosure><wicket:enclosure child="blame"><label class="checkbox"><input type="checkbox" wicket:id="blame"> <wicket:t>Blame</wicket:t></label></wicket:enclosure><wicket:container wicket:id="extraOptions"></wicket:container></div>+ <div class="options d-flex align-items-center"><label wicket:id="viewPlainContainer" class="checkbox"><input type="checkbox" wicket:id="viewPlain"> <wicket:container wicket:id="plainName"></wicket:container></label><label wicket:id="blameContainer" class="checkbox"><input type="checkbox" wicket:id="blame"> <wicket:t>Blame</wicket:t></label><wicket:container wicket:id="extraOptions"></wicket:container></div><div wicket:id="formats" class="formats d-none d-sm-block"></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex a46fa4691e..f75f279b3e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -56,7 +56,10 @@ public abstract class BlobViewPanel extends Panel {protected abstract boolean isEditSupported();- protected abstract boolean isViewPlainSupported();+ @Nullable+ protected String getPlainName() {+ return null;+ }protected WebMarkupContainer newFormats(String id) {WebMarkupContainer options = new WebMarkupContainer(id);@@ -236,15 +239,17 @@ public abstract class BlobViewPanel extends Panel {add(new ResourceLink<Void>("download", new RawBlobResourceReference(),RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent(), ContentDisposition.ATTACHMENT)));- add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW && context.isViewPlain())) {-+ var viewPlainContainer = new WebMarkupContainer("viewPlainContainer") {+@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(isViewPlainSupported());+ setVisible(getPlainName() != null);}-- }.add(new OnChangeAjaxBehavior() {++ };+ add(viewPlainContainer);+ viewPlainContainer.add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW && context.isViewPlain())).add(new OnChangeAjaxBehavior() {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -260,8 +265,9 @@ public abstract class BlobViewPanel extends Panel {}}));+ viewPlainContainer.add(new Label("plainName", Model.of(getPlainName())));- add(new CheckBox("blame", Model.of(context.getMode() == Mode.BLAME)) {+ var blameContainer = new WebMarkupContainer("blameContainer") {@Overrideprotected void onConfigure() {@@ -269,8 +275,10 @@ public abstract class BlobViewPanel extends Panel {var blob = context.getProject().getBlob(context.getBlobIdent(), true);setVisible(blob.getLfsPointer() == null && blob.getText() != null);}-- }.add(new OnChangeAjaxBehavior() {++ };+ add(blameContainer);+ blameContainer.add(new CheckBox("blame", Model.of(context.getMode() == Mode.BLAME)).add(new OnChangeAjaxBehavior() {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 8e540dbce9..b4c2730c8b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -41,6 +41,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.IssueHelper;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -57,7 +59,6 @@ import io.onedev.server.service.SettingService;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;@@ -80,7 +81,7 @@ import io.onedev.server.web.util.CursorSupport;import io.onedev.server.web.websocket.ChatToolExecution;import io.onedev.server.xodus.VisitInfoService;-public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {+public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext, ChatToolAware {public static final String PARAM_ISSUE = "issue";@@ -381,48 +382,6 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input}});-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentIssue")- .description("Get info of current issue in json format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getDetail(getIssue().getProject(), getIssue())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- });-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentIssueComments")- .description("Get comments of current issue in json format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getComments(getIssue())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- });RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {@@ -491,4 +450,51 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputreturn new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));}+ @Override+ public Collection<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentIssue")+ .description("Get info of current issue in json format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ try {+ return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getDetail(getIssue().getProject(), getIssue())), false));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ });++ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentIssueComments")+ .description("Get comments of current issue in json format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ try {+ return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getComments(getIssue())), false));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ });+ return tools;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex e8bb22e220..6b2f9a6c2f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -74,6 +74,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Sets;import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.PullRequestHelper;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;@@ -120,7 +122,6 @@ import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.behavior.ChatTool;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;@@ -179,7 +180,7 @@ import io.onedev.server.web.util.editbean.LabelsBean;import io.onedev.server.web.websocket.ChatToolExecution;import io.onedev.server.xodus.VisitInfoService;-public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {+public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware, ChatToolAware {public static final String PARAM_REQUEST = "request";@@ -947,48 +948,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRadd(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentPullRequest")- .description("Get info of current pull request in json format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getDetail(getPullRequest().getProject(), getPullRequest())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- });-- add(new ChatTool() {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getCurrentPullRequestComments")- .description("Get comments of current pull request in json format")- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getComments(getPullRequest())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- });-RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {@Override@@ -2447,4 +2406,51 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest.getChangeObservable(getPullRequest().getId()));}+ @Override+ public Collection<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentPullRequest")+ .description("Get info of current pull request in json format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ try {+ return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getDetail(getPullRequest().getProject(), getPullRequest())), false));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ });++ tools.add(new ChatTool() {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentPullRequestComments")+ .description("Get comments of current pull request in json format")+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ try {+ return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getComments(getPullRequest())), false));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ });+ return tools;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.htmlindex 2cf245dd3a..464ebb8c88 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html@@ -22,7 +22,7 @@</div></wicket:fragment><wicket:fragment wicket:id="optionsFrag">- <a wicket:id="aiSummarize" t:data-tippy-content="Summarize comments with AI" class="btn btn-xs btn-outline-secondary btn-hover-primary btn-icon"><wicket:svg href="ai3" class="icon"></wicket:svg></a>+ <a wicket:id="aiSummarize" t:data-tippy-content="Summarize comments with AI" class="btn btn-xs btn-outline-secondary btn-hover-primary btn-icon"><wicket:svg href="ai2" class="icon"></wicket:svg></a><div class="btn-group"><a wicket:id="showComments" t:data-tippy-content="Toggle comments" class="btn btn-xs text-muted btn-outline-secondary btn-active-secondary btn-icon"><wicket:svg href="comments" class="icon"></wicket:svg></a><a wicket:id="showCommits" t:data-tippy-content="Toggle commits" class="btn btn-xs text-muted btn-outline-secondary btn-active-secondary btn-icon"><wicket:svg href="commit" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.javaindex 6a4845f9e9..120e1794fa 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java@@ -4689,6 +4689,8 @@ public class Translation_de extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "Änderungen");+ m.put("Flush", "Leeren");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.javaindex f9d1f60071..01f3acdb4d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java@@ -4689,6 +4689,8 @@ public class Translation_es extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "Cambios");+ m.put("Flush", "Vaciar");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.javaindex 13df69c691..c61009692b 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java@@ -4689,6 +4689,8 @@ public class Translation_fr extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "Modifications");+ m.put("Flush", "Vider");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.javaindex b5eab92909..c3d97fa31e 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java@@ -4689,6 +4689,8 @@ public class Translation_it extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "Modifiche");+ m.put("Flush", "Svuota");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.javaindex 0bb28c8828..6d9da66160 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java@@ -4689,6 +4689,8 @@ public class Translation_ja extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "変更");+ m.put("Flush", "フラッシュ");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.javaindex 397202f5d3..6442aa0964 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java@@ -4689,6 +4689,8 @@ public class Translation_ko extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "변경 사항");+ m.put("Flush", "플러시");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.javaindex 31d04b772e..336d337560 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java@@ -4689,6 +4689,8 @@ public class Translation_pt extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");+ m.put("Changes", "Alterações");+ m.put("Flush", "Descarregar");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.javaindex 15aead1c2f..184d704093 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java@@ -1929,6 +1929,7 @@ public class Translation_zh extends TranslationResourceBundle {m.put("Literal", "字面量");m.put("Literal default value", "字面量默认值");m.put("Literal value", "字面量值");+ m.put("Load Keys", "加载键");m.put("Loading emojis...", "加载表情符号...");m.put("Loading...", "加载...");m.put("Log", "日志");@@ -4712,7 +4713,8 @@ public class Translation_zh extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("Load Keys", "加载键");+ m.put("Changes", "更改");+ m.put("Flush", "刷新");}@Overridediff --git a/server-ee b/server-eeindex 2ffb778511..b364a0b732 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 2ffb7785110deb316b9347e27b2807bd4cc6ef5a+Subproject commit b364a0b73246e853912ce0577ee5f67cf70fc5e6