DevTools: Support line markers in UISourceCode and Code Mirror

DevTools: Support line markers in UISourceCode and Code Mirror

BUG=590936
Committed: https://crrev.com/793006fe5a219a9ab67787235bb71c459e435163
Cr-Commit-Position: refs/heads/master@{#380296}

[alph, 2016-03-08 00:53:30]

alph@chromium.org changed reviewers:
+ pfeldman@chromium.org

[pfeldman, 2016-03-09 02:14:20]

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/components/EditorLineMarkerDecorator.js:15:
decorate: function(data) { }
decorate: function(UISourceCode, CodeMirrorTextEditor)

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js:1126:
setGutterMarker: function(lineNumber, type, element)
addGutterDecoration(line, type, element)

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:344:
this._decorateLineMarker(marker);
runtime.extensions(decorator,
event.type).instance().then(decorate(this.uiSourceCode, this.editor);

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:352:
var marker = /** @type {!WebInspector.UISourceCode.LineMarker} */ (event.data);
ditto

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:353:
this._textEditor.setGutterMarker(marker.line(), marker.type(), null);
How do you know what the decorator is doing? CodeMirrorTextEditor should not be
aware of markers - it is layering violation.

[dgozman, 2016-03-09 05:25:37]

dgozman@chromium.org changed reviewers:
+ dgozman@chromium.org

[dgozman, 2016-03-09 05:25:38]

We can reuse the markers for color swatch in css sources!

[dgozman, 2016-03-09 05:27:49]

On 2016/03/09 05:25:38, dgozman wrote:
> We can reuse the markers for color swatch in css sources!

And diff annotations :-)

[alph, 2016-03-09 22:42:10]

On 2016/03/09 05:25:38, dgozman wrote:
> We can reuse the markers for color swatch in css sources!

That's the plan. But it's a matter for a separate patch.

[alph, 2016-03-09 22:42:18]

ptal

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/components/EditorLineMarkerDecorator.js:15:
decorate: function(data) { }
On 2016/03/09 02:14:20, pfeldman wrote:
> decorate: function(UISourceCode, CodeMirrorTextEditor)

Done.

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js:1126:
setGutterMarker: function(lineNumber, type, element)
On 2016/03/09 02:14:20, pfeldman wrote:
> addGutterDecoration(line, type, element)

Done.

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

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:344:
this._decorateLineMarker(marker);
On 2016/03/09 02:14:20, pfeldman wrote:
> runtime.extensions(decorator,
> event.type).instance().then(decorate(this.uiSourceCode, this.editor);

Done.

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:352:
var marker = /** @type {!WebInspector.UISourceCode.LineMarker} */ (event.data);
On 2016/03/09 02:14:20, pfeldman wrote:
> ditto

Done.

https://codereview.chromium.org/1768183003/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:353:
this._textEditor.setGutterMarker(marker.line(), marker.type(), null);
On 2016/03/09 02:14:20, pfeldman wrote:
> How do you know what the decorator is doing? CodeMirrorTextEditor should not
be
> aware of markers - it is layering violation.

Done.

[pfeldman, 2016-03-09 23:52:57]

lgtm

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
File
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
(right):

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js:1160:
_batchOperation: function(action)
This is not necessary.

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
File third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js
(right):

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:365:
decorator.decorate(this.uiSourceCode(), this._textEditor);
swap these lines.

[alph, 2016-03-09 23:58:22]

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
File
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js
(right):

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js:1160:
_batchOperation: function(action)
On 2016/03/09 23:52:56, pfeldman wrote:
> This is not necessary.

Done.

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
File third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js
(right):

https://codereview.chromium.org/1768183003/diff/80001/third_party/WebKit/Sour...
third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.js:365:
decorator.decorate(this.uiSourceCode(), this._textEditor);
On 2016/03/09 23:52:57, pfeldman wrote:
> swap these lines.

Done.

[alph, 2016-03-09 23:58:28]

The CQ bit was checked by alph@chromium.org

[alph, 2016-03-09 23:58:28]

The patchset sent to the CQ was uploaded after l-g-t-m from
pfeldman@chromium.org
Link to the patchset: https://codereview.chromium.org/1768183003/#ps100001
(title: "addressing comments.")

[commit-bot: I haz the power, 2016-03-09 23:59:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1768183003/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1768183003/100001

[commit-bot: I haz the power, 2016-03-10 01:45:18]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-03-10 01:47:46]

Description was changed from

==========
DevTools: Support line markers in UISourceCode and Code Mirror

BUG=590936
==========

to

==========
DevTools: Support line markers in UISourceCode and Code Mirror

BUG=590936

Committed: https://crrev.com/793006fe5a219a9ab67787235bb71c459e435163
Cr-Commit-Position: refs/heads/master@{#380296}
==========

[commit-bot: I haz the power, 2016-03-10 01:47:47]

Patchset 6 (id:??) landed as
https://crrev.com/793006fe5a219a9ab67787235bb71c459e435163
Cr-Commit-Position: refs/heads/master@{#380296}