Skip to content

Commit 22d3058

Browse files
committed
Add #16 coloring for diff
1 parent f6b0260 commit 22d3058

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

controller/diff.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ var parent = null,
44
view = null;
55

66
var diff = {
7+
colorFormat: function (diffText) {
8+
return diffText
9+
.replace(/(^\-\s[\S\s]+?$)/gm, "{red-fg}$1{/red-fg}")
10+
.replace(/(^\+\s[\S\s]+?$)/gm, "{green-fg}$1{/green-fg}")
11+
.replace(/(^@@\s[\S\s]+?@@)/gm, "{cyan-fg}$1{/cyan-fg}");
12+
},
713
show: function () {
814
var diffText = parent.git.diff(
915
parent.prevFocused.name,
1016
parent.prevFocused.selected
1117
);
1218

13-
view.textarea.setValue(diffText);
14-
view.textarea.scrollTo(0);
19+
view.textarea.setContent(diff.colorFormat(diffText));
1520

1621
view.layout.show();
1722
view.textarea.focus();
@@ -20,7 +25,7 @@ var diff = {
2025

2126
hide: function (reload) {
2227
view.layout.hide();
23-
view.textarea.clearValue();
28+
view.textarea.setContent("");
2429
parent.show(reload);
2530
},
2631

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"name": "git-commander",
3-
"version": "0.0.7",
4-
"description": "A git tool with a easy terminal interface.",
5-
"author": "Jin Kim",
3+
"version": "0.0.8",
64
"license": "MIT",
75
"repository": {
86
"type": "git",

view/diff.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var init = function (screen) {
1313
styles.textarea.parent = layout;
1414
styles.menubar.parent = layout;
1515

16-
textarea = blessed.textarea(styles.textarea);
16+
textarea = blessed.text(styles.textarea);
1717
menubar = blessed.listbar(styles.menubar);
1818

1919
return {

view/style/diff.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"width": "100%",
1313
"height": "100%-3",
1414
"border": "line",
15+
"tags": true,
16+
"scrollable": true,
1517
"mouse": true,
1618
"vi": true,
1719
"keys": true,

0 commit comments

Comments
 (0)