SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve copy&paste on diff page (#6218)

Browse Source
This commit is contained in:
Marc Bernard 2023-04-17 00:06:30 +02:00 committed by GitHub
parent b0abad47a7
commit b3ecd13639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap
View File

@ -270,7 +270,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION.
METHOD add_filter_sub_menu.
@ -1094,6 +1094,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
CREATE OBJECT ri_html TYPE zcl_abapgit_html.
" Note: CSS classes "new" and "old" are used to enable column-based copy to clipboard
" New line
lv_mark = ` `.
IF is_diff_line-result IS NOT INITIAL.
@ -1107,7 +1109,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
ENDIF.
lv_new = |<td class="num diff_others" line-num="{ is_diff_line-new_num }"></td>|
&& |<td class="mark diff_others">{ lv_mark }</td>|
&& |<td class="code{ lv_bg } diff_left">{ is_diff_line-new }</td>|.
&& |<td class="code{ lv_bg } diff_left new">{ is_diff_line-new }</td>|.
" Old line
CLEAR lv_bg.
@ -1123,7 +1125,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
ENDIF.
lv_old = |<td class="num diff_others" line-num="{ is_diff_line-old_num }"></td>|
&& |<td class="mark diff_others">{ lv_mark }</td>|
&& |<td class="code{ lv_bg } diff_right">{ is_diff_line-old }</td>|.
&& |<td class="code{ lv_bg } diff_right old">{ is_diff_line-old }</td>|.
" render line, inverse sides if remote is newer
ri_html->add( '<tr class="diff_line">' ).
@ -1161,6 +1163,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
CREATE OBJECT ri_html TYPE zcl_abapgit_html.
" Note: CSS classes "new" and "old" are used to enable column-based copy to clipboard
" Release delayed subsequent update lines
IF is_diff_line-result <> zif_abapgit_definitions=>c_diff-update.
LOOP AT mt_delayed_lines ASSIGNING <ls_diff_line>.
@ -1168,7 +1172,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
ri_html->add( |<td class="num diff_others" line-num="{ <ls_diff_line>-old_num }"></td>|
&& |<td class="num diff_others" line-num=""></td>|
&& |<td class="mark diff_others">-</td>|
&& |<td class="code diff_del diff_unified">{ <ls_diff_line>-old }</td>| ).
&& |<td class="code diff_del diff_unified old">{ <ls_diff_line>-old }</td>| ).
ri_html->add( '</tr>' ).
ENDLOOP.
LOOP AT mt_delayed_lines ASSIGNING <ls_diff_line>.
@ -1176,7 +1180,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
ri_html->add( |<td class="num diff_others" line-num=""></td>|
&& |<td class="num diff_others" line-num="{ <ls_diff_line>-new_num }"></td>|
&& |<td class="mark diff_others">+</td>|
&& |<td class="code diff_ins diff_others">{ <ls_diff_line>-new }</td>| ).
&& |<td class="code diff_ins diff_unified new">{ <ls_diff_line>-new }</td>| ).
ri_html->add( '</tr>' ).
ENDLOOP.
CLEAR mt_delayed_lines.
@ -1190,12 +1194,12 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_DIFF IMPLEMENTATION.
ri_html->add( |<td class="num diff_others" line-num=""></td>|
&& |<td class="num diff_others" line-num="{ is_diff_line-new_num }"></td>|
&& |<td class="mark diff_others">+</td>|
&& |<td class="code diff_ins diff_others">{ is_diff_line-new }</td>| ).
&& |<td class="code diff_ins diff_unified new">{ is_diff_line-new }</td>| ).
WHEN zif_abapgit_definitions=>c_diff-delete.
ri_html->add( |<td class="num diff_others" line-num="{ is_diff_line-old_num }"></td>|
&& |<td class="num diff_others" line-num=""></td>|
&& |<td class="mark diff_others">-</td>|
&& |<td class="code diff_del diff_unified">{ is_diff_line-old }</td>| ).
&& |<td class="code diff_del diff_unified old">{ is_diff_line-old }</td>| ).
WHEN OTHERS. "none
ri_html->add( |<td class="num diff_others" line-num="{ is_diff_line-old_num }"></td>|
&& |<td class="num diff_others" line-num="{ is_diff_line-new_num }"></td>|

20
src/ui/zabapgit_js_common.w3mi.data.js
View File

@ -1200,20 +1200,22 @@ DiffColumnSelection.prototype.getSelectedText = function() {
} else {
var newline = "";
var realThis = this;
var copySide = "";
[].forEach.call(nodes, function(tr, i) {
var cellIdx = (i == 0 ? 0 : realThis.selectedColumnIdx);
if (tr.cells.length > cellIdx) {
var tdSelected = tr.cells[cellIdx];
var tdLineNum = tr.cells[realThis.lineNumColumnIdx];
// copy is interesting for remote code, don't copy lines which exist only locally
if (i == 0 || tdLineNum.getAttribute("line-num") != "") {
// decide which side to copy based on first line of selection
if (i == 0) {
copySide = (tdSelected.classList.contains("new") ? "new" : "old" );
}
// copy is interesting only for one side of code, do not copy lines which exist on other side
if (i == 0 || copySide == "new" && !tdSelected.classList.contains("old") || copySide == "old" && !tdSelected.classList.contains("new")) {
text += newline + tdSelected.textContent;
// special processing for TD tag which sometimes contains newline
// (expl: /src/ui/zabapgit_js_common.w3mi.data.js) so don't add newline again in that case.
// (expl: /src/ui/zabapgit_js_common.w3mi.data.js) so do not add newline again in that case.
var lastChar = tdSelected.textContent[tdSelected.textContent.length - 1];
if (lastChar == "\n") newline = "";
else newline = "\n";
}
}
@ -1474,7 +1476,7 @@ LinkHints.prototype.handleKey = function(event) {
var hint = this.hintsMap[this.pendingPath];
if (hint) { // we are there, we have a fully specified tooltip. Let's activate or yank it
if (hint) { // we are there, we have a fully specified tooltip. Let us activate or yank it
this.displayHints(false);
event.preventDefault();
if (this.yankModeActive) {
@ -1484,7 +1486,7 @@ LinkHints.prototype.handleKey = function(event) {
this.hintActivate(hint);
}
} else {
// we are not there yet, but let's filter the link so that only
// we are not there yet, but let us filter the link so that only
// the partially matched are shown
var visibleHints = this.filterHints();
if (!visibleHints) {
@ -2480,4 +2482,4 @@ function toggleSticky() {
} else {
header.classList.remove(stickyClass);
}
}
}