DevTools: Preserve the text when doing a line-by-line diff

DevTools: Preserve the text when doing a line-by-line diff
This is in preperation of being able to revert changes in the sources panel.

BUG=610061
Committed: https://crrev.com/36bc4339122248e74d411a656a6dff4db2b2a790
Cr-Commit-Position: refs/heads/master@{#420554}

[einbinder, 2016-09-16 19:28:16]

einbinder@chromium.org changed reviewers:
+ lushnikov@chromium.org

[einbinder, 2016-09-16 19:28:17]

ptal

[lushnikov, 2016-09-16 20:09:54]

can we add a simple test to exercise Diff?

[vinodsonkusare77_gmail.com, 2016-09-19 05:04:33]

https://youtu.be/yD6KioQhnAc

On Sat, Sep 17, 2016 at 12:58 AM, <einbinder@chromium.org> wrote:

> Reviewers: lushnikov
> CL: https://codereview.chromium.org/2349823002/
>
> Message:
> ptal
>
> Description:
> DevTools: Preserve the text when doing a line-by-line diff
> This is in preperation of being able to revert changes in the sources
> panel.
>
> BUG=610061
>
> Affected files (+17, -3 lines):
> M third_party/WebKit/Source/devtools/front_end/diff/Diff.js
>
>
> Index: third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> diff --git a/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> b/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> index 13fc91d1d158fd6ff2df04404b43fce479fd74b3..
> 46c6f0020ca56d2f09d713b5d9e0cf91fc565c6f 100644
> --- a/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> +++ b/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> @@ -17,16 +17,29 @@ WebInspector.Diff = {
> /**
> * @param {!Array.<string>} lines1
> * @param {!Array.<string>} lines2
> - * @return {!Array.<!{0: number, 1: string}>}
> + * @return {!Array.<!{0: number, 1: !Array.<string>}>}
> */
> lineDiff: function(lines1, lines2)
> {
> var lineToChar = new Map();
> + var charToLine = new Map();
> var charCode = 33;
> var text1 = encode(lines1);
> var text2 = encode(lines2);
>
> - return WebInspector.Diff.charDiff(text1, text2);
> + var diff = WebInspector.Diff.charDiff(text1, text2);
> + var lineDiff = [];
> + for (var i = 0; i < diff.length; i++) {
> + var lines = [];
> + for (var j = 0; j < diff[i][1].length; j++)
> + lines.push(charToLine.get(diff[i][1][j]));
> +
> + lineDiff.push({
> + 0: diff[i][0],
> + 1: lines
> + });
> + }
> + return lineDiff;
>
> /**
> * @param {!Array.<string>} lines
> @@ -41,6 +54,7 @@ WebInspector.Diff = {
> if (!character) {
> character = String.fromCharCode(charCode++);
> lineToChar.set(line, character);
> + charToLine.set(character,line);
> }
> text += character;
> }
> @@ -49,7 +63,7 @@ WebInspector.Diff = {
> },
>
> /**
> - * @param {!Array.<!{0: number, 1: string}>} diff
> + * @param {!Array.<!{0: number, 1: !Array.<string>}>} diff
> * @return {!Array<!Array<number>>}
> */
> convertToEditDiff: function(diff)
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "DevTools Reviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to devtools-reviews+unsubscribe@chromium.org.
>

-- 
You received this message because you are subscribed to the Google Groups "Blink
Reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to blink-reviews+unsubscribe@chromium.org.

[vinodsonkusare77_gmail.com, 2016-09-19 05:04:33]

https://youtu.be/yD6KioQhnAc

On Sat, Sep 17, 2016 at 12:58 AM, <einbinder@chromium.org> wrote:

> Reviewers: lushnikov
> CL: https://codereview.chromium.org/2349823002/
>
> Message:
> ptal
>
> Description:
> DevTools: Preserve the text when doing a line-by-line diff
> This is in preperation of being able to revert changes in the sources
> panel.
>
> BUG=610061
>
> Affected files (+17, -3 lines):
> M third_party/WebKit/Source/devtools/front_end/diff/Diff.js
>
>
> Index: third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> diff --git a/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> b/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> index 13fc91d1d158fd6ff2df04404b43fce479fd74b3..
> 46c6f0020ca56d2f09d713b5d9e0cf91fc565c6f 100644
> --- a/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> +++ b/third_party/WebKit/Source/devtools/front_end/diff/Diff.js
> @@ -17,16 +17,29 @@ WebInspector.Diff = {
> /**
> * @param {!Array.<string>} lines1
> * @param {!Array.<string>} lines2
> - * @return {!Array.<!{0: number, 1: string}>}
> + * @return {!Array.<!{0: number, 1: !Array.<string>}>}
> */
> lineDiff: function(lines1, lines2)
> {
> var lineToChar = new Map();
> + var charToLine = new Map();
> var charCode = 33;
> var text1 = encode(lines1);
> var text2 = encode(lines2);
>
> - return WebInspector.Diff.charDiff(text1, text2);
> + var diff = WebInspector.Diff.charDiff(text1, text2);
> + var lineDiff = [];
> + for (var i = 0; i < diff.length; i++) {
> + var lines = [];
> + for (var j = 0; j < diff[i][1].length; j++)
> + lines.push(charToLine.get(diff[i][1][j]));
> +
> + lineDiff.push({
> + 0: diff[i][0],
> + 1: lines
> + });
> + }
> + return lineDiff;
>
> /**
> * @param {!Array.<string>} lines
> @@ -41,6 +54,7 @@ WebInspector.Diff = {
> if (!character) {
> character = String.fromCharCode(charCode++);
> lineToChar.set(line, character);
> + charToLine.set(character,line);
> }
> text += character;
> }
> @@ -49,7 +63,7 @@ WebInspector.Diff = {
> },
>
> /**
> - * @param {!Array.<!{0: number, 1: string}>} diff
> + * @param {!Array.<!{0: number, 1: !Array.<string>}>} diff
> * @return {!Array<!Array<number>>}
> */
> convertToEditDiff: function(diff)
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "DevTools Reviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to devtools-reviews+unsubscribe@chromium.org.
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[einbinder, 2016-09-21 23:42:21]

einbinder@chromium.org changed reviewers:
- vinodsonkusare77@gmail.com

[einbinder, 2016-09-21 23:42:22]

ptal, Added a test

[lushnikov, 2016-09-23 00:36:04]

lgtm

https://codereview.chromium.org/2349823002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/devtools/front_end/diff/Diff.js (right):

https://codereview.chromium.org/2349823002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/diff/Diff.js:24: var lineToChar =
new Map();
can we annotate these while we are here?

[einbinder, 2016-09-23 01:06:35]

https://codereview.chromium.org/2349823002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/devtools/front_end/diff/Diff.js (right):

https://codereview.chromium.org/2349823002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/diff/Diff.js:24: var lineToChar =
new Map();
On 2016/09/23 at 00:36:04, lushnikov wrote:
> can we annotate these while we are here?

Done.

[einbinder, 2016-09-23 01:06:38]

The CQ bit was checked by einbinder@chromium.org

[einbinder, 2016-09-23 01:06:38]

The patchset sent to the CQ was uploaded after l-g-t-m from
lushnikov@chromium.org
Link to the patchset: https://codereview.chromium.org/2349823002/#ps60001
(title: "Docs")

[commit-bot: I haz the power, 2016-09-23 01:07:05]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-23 02:41:30]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-09-23 02:43:20]

Description was changed from

==========
DevTools: Preserve the text when doing a line-by-line diff
This is in preperation of being able to revert changes in the sources panel.

BUG=610061
==========

to

==========
DevTools: Preserve the text when doing a line-by-line diff
This is in preperation of being able to revert changes in the sources panel.

BUG=610061

Committed: https://crrev.com/36bc4339122248e74d411a656a6dff4db2b2a790
Cr-Commit-Position: refs/heads/master@{#420554}
==========

[commit-bot: I haz the power, 2016-09-23 02:43:21]

Patchset 4 (id:??) landed as
https://crrev.com/36bc4339122248e74d411a656a6dff4db2b2a790
Cr-Commit-Position: refs/heads/master@{#420554}