Title: [264717] trunk/Source/WebInspectorUI
Revision
264717
Author
bb...@apple.com
Date
2020-07-22 11:59:45 -0700 (Wed, 22 Jul 2020)

Log Message

Web Inspector: Sources tab empty, sidebar nonfunctional
https://bugs.webkit.org/show_bug.cgi?id=214611
<rdar://problem/65898051>

Reviewed by Devin Rousso.

This is caused when a subresource fails its initial load. This generates a
networking IssueMessage without a source code location, which is not adequately handled.

* UserInterface/Views/IssueTreeElement.js:
(WI.IssueTreeElement.prototype._updateTitles):
(WI.IssueTreeElement):
If there is no sourceCodeLocation for the issue, then don't try to compute line numbers.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (264716 => 264717)


--- trunk/Source/WebInspectorUI/ChangeLog	2020-07-22 18:47:32 UTC (rev 264716)
+++ trunk/Source/WebInspectorUI/ChangeLog	2020-07-22 18:59:45 UTC (rev 264717)
@@ -1,3 +1,19 @@
+2020-07-22  Brian Burg  <bb...@apple.com>
+
+        Web Inspector: Sources tab empty, sidebar nonfunctional
+        https://bugs.webkit.org/show_bug.cgi?id=214611
+        <rdar://problem/65898051>
+
+        Reviewed by Devin Rousso.
+
+        This is caused when a subresource fails its initial load. This generates a
+        networking IssueMessage without a source code location, which is not adequately handled.
+
+        * UserInterface/Views/IssueTreeElement.js:
+        (WI.IssueTreeElement.prototype._updateTitles):
+        (WI.IssueTreeElement):
+        If there is no sourceCodeLocation for the issue, then don't try to compute line numbers.
+
 2020-07-21  Devin Rousso  <drou...@apple.com>
 
         Web Inspector: unable to save files that are base64 encoded

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js (264716 => 264717)


--- trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js	2020-07-22 18:47:32 UTC (rev 264716)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js	2020-07-22 18:59:45 UTC (rev 264717)
@@ -58,15 +58,18 @@
 
     _updateTitles()
     {
-        var displayLineNumber = this._issueMessage.sourceCodeLocation.displayLineNumber;
-        var displayColumnNumber = this._issueMessage.sourceCodeLocation.displayColumnNumber;
-        var title;
-        if (displayColumnNumber > 0)
-            title = WI.UIString("Line %d:%d").format(displayLineNumber + 1, displayColumnNumber + 1); // The user visible line and column numbers are 1-based.
-        else
-            title = WI.UIString("Line %d").format(displayLineNumber + 1); // The user visible line number is 1-based.
+        if (this._issueMessage.sourceCodeLocation) {
+            let displayLineNumber = this._issueMessage.sourceCodeLocation.displayLineNumber;
+            let displayColumnNumber = this._issueMessage.sourceCodeLocation.displayColumnNumber;
+            var lineNumberLabel;
+            if (displayColumnNumber > 0)
+                lineNumberLabel = WI.UIString("Line %d:%d").format(displayLineNumber + 1, displayColumnNumber + 1); // The user visible line and column numbers are 1-based.
+            else
+                lineNumberLabel = WI.UIString("Line %d").format(displayLineNumber + 1); // The user visible line number is 1-based.
 
-        this.mainTitle = title + " " + this._issueMessage.text;
+            this.mainTitle = `${lineNumberLabel} ${this._issueMessage.text}`;
+        } else
+            this.mainTitle = this._issueMessage.text;
     }
 };
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to