Changeset 274230 in webkit

Timestamp:

Mar 10, 2021 12:43:35 PM (17 months ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Syntax highlighting for JSX is incorrect
​https://bugs.webkit.org/show_bug.cgi?id=217613
<rdar://problem/70210975>

Reviewed by BJ Burg.

Out of the box, React specifies the "js" extension for JSX files.
Use JSX mode for source map resources with the "js" extension. This
appears to match what the other browsers' developer tools do.

• UserInterface/Models/SourceMapResource.js:

(WI.SourceMapResource):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/SourceMapResource.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-03-10  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Syntax highlighting for JSX is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=217613
+        <rdar://problem/70210975>
+
+        Reviewed by BJ Burg.
+
+        Out of the box, React specifies the "js" extension for JSX files.
+        Use JSX mode for source map resources with the "js" extension. This
+        appears to match what the other browsers' developer tools do.
+
+        * UserInterface/Models/SourceMapResource.js:
+        (WI.SourceMapResource):
+
 2021-03-10  Razvan Caliman  <rcaliman@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/SourceMapResource.js

@@ -37 +37 @@
         var inheritedMIMEType = this._sourceMap.originalSourceCode instanceof WI.Resource ? this._sourceMap.originalSourceCode.syntheticMIMEType : null;
 
-        var fileExtension = WI.fileExtensionForURL(url) || "";
-        var fileExtensionMIMEType = WI.mimeTypeForFileExtension(fileExtension, true);
+        let fileExtension = WI.fileExtensionForURL(url) || "";
+
+        // React serves JSX resources with "js" extension.
+        let fileExtensionMIMEType = fileExtension === "js" ? "text/jsx" : WI.mimeTypeForFileExtension(fileExtension, true);
 
         // FIXME: This is a layering violation. It should use a helper function on the