Web Inspector: Regression: Showing of color swatches no longer works in Details Sidebar

• Component: Web Inspector
• Status: RESOLVED FIXED

[Tobias Reiss]

I introduced a regression by trying to fix an ESLint issue. The ESLint report was correct but the fix was wrong.

Commit that introduced the regression:
http://svn.webkit.org/repository/webkit/trunk@182142 268f45cc-cd09-0410-ab3c-d52691b4dbfc
https://github.com/WebKit/webkit/commit/b18ef637e495d9f64bca6e431d7ec71df8bc062d#diff-97910c4c4acd4a860a96c6592a3ab666L1013

[Radar WebKit Bug Importer]

<rdar://problem/20474687>

[Tobias Reiss]

Created attachment 250393 [details]
patch

[Timothy Hatcher]

Comment on attachment 250393 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=250393&action=review

> Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:396
> +                this._codeMirror.setUniqueBookmark(codeMirrorTextMarker.find().from, swatchElement);

I think codeMirrorTextMarker.find() can return null/undefined. Maybe this need a null check and early return?

[Tobias Reiss]

Comment on attachment 250393 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=250393&action=review

>> Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:396
>> +                this._codeMirror.setUniqueBookmark(codeMirrorTextMarker.find().from, swatchElement);
> 
> I think codeMirrorTextMarker.find() can return null/undefined. Maybe this need a null check and early return?

Nit: If that's the case I would rather create a new bug because I just re-enabled the code that was here before I removed it. Just without the variable declaration that initially triggered the ESLint report. I can investigate into the missing null check afterwards, if that's okay for you?

[Timothy Hatcher]

Comment on attachment 250393 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=250393&action=review

>>> Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:396
>>> +                this._codeMirror.setUniqueBookmark(codeMirrorTextMarker.find().from, swatchElement);
>> 
>> I think codeMirrorTextMarker.find() can return null/undefined. Maybe this need a null check and early return?
> 
> Nit: If that's the case I would rather create a new bug because I just re-enabled the code that was here before I removed it. Just without the variable declaration that initially triggered the ESLint report. I can investigate into the missing null check afterwards, if that's okay for you?

Fair enough.

[WebKit Commit Bot]

Comment on attachment 250393 [details]
patch

Clearing flags on attachment: 250393

Committed r182576: <http://trac.webkit.org/changeset/182576>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.