Web Inspector: Support JSX (React) syntax highlighting
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jan 2018 21:03:22 +0000 (21:03 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jan 2018 21:03:22 +0000 (21:03 +0000)
https://bugs.webkit.org/show_bug.cgi?id=181607
<rdar://problem/36442564>

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2018-01-12
Reviewed by Brian Burg.

* UserInterface/Base/MIMETypeUtilities.js:
(WI.mimeTypeForFileExtension):
(WI.fileExtensionForMIMEType):
* UserInterface/Models/Resource.js:
Support the jsx extension and mime types.

* UserInterface/Main.html:
* Scripts/update-codemirror-resources.rb:
* UserInterface/External/CodeMirror/jsx.js: Added.
Include new mode from CodeMirror@d8926768.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Scripts/update-codemirror-resources.rb
Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js
Source/WebInspectorUI/UserInterface/External/CodeMirror/jsx.js [new file with mode: 0644]
Source/WebInspectorUI/UserInterface/Main.html
Source/WebInspectorUI/UserInterface/Models/Resource.js

index 748bcaf..20064a5 100644 (file)
@@ -1,3 +1,22 @@
+2018-01-12  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Support JSX (React) syntax highlighting
+        https://bugs.webkit.org/show_bug.cgi?id=181607
+        <rdar://problem/36442564>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/MIMETypeUtilities.js:
+        (WI.mimeTypeForFileExtension):
+        (WI.fileExtensionForMIMEType):
+        * UserInterface/Models/Resource.js:
+        Support the jsx extension and mime types.
+
+        * UserInterface/Main.html:
+        * Scripts/update-codemirror-resources.rb:
+        * UserInterface/External/CodeMirror/jsx.js: Added.
+        Include new mode from CodeMirror@d8926768.
+
 2018-01-11  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Rename "Query String" section as "Query String Parameters" for clarity
index baab8be..b8c3af4 100755 (executable)
@@ -47,6 +47,7 @@ CODE_MIRROR_FILES_TO_COPY = %w(
   mode/css/css.js
   mode/htmlmixed/htmlmixed.js
   mode/javascript/javascript.js
+  mode/jsx/jsx.js
   mode/livescript/livescript.js
   mode/sass/sass.js
   mode/sql/sql.js
index 5ea8a22..5e50fd2 100644 (file)
@@ -54,6 +54,7 @@ WI.mimeTypeForFileExtension = function(extension)
         "coffee": "text/x-coffeescript",
         "ls": "text/x-livescript",
         "ts": "text/typescript",
+        "jsx": "text/jsx",
 
         // Stylesheet types.
         "css": "text/css",
@@ -100,6 +101,7 @@ WI.fileExtensionForMIMEType = function(mimeType)
         "text/x-coffeescript": "coffee",
         "text/x-livescript": "ls",
         "text/typescript": "ts",
+        "text/jsx": "jsx",
 
         // Stylesheet types.
         "text/css": "css",
diff --git a/Source/WebInspectorUI/UserInterface/External/CodeMirror/jsx.js b/Source/WebInspectorUI/UserInterface/External/CodeMirror/jsx.js
new file mode 100644 (file)
index 0000000..039e37b
--- /dev/null
@@ -0,0 +1,148 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  // Depth means the amount of open braces in JS context, in XML
+  // context 0 means not in tag, 1 means in tag, and 2 means in tag
+  // and js block comment.
+  function Context(state, mode, depth, prev) {
+    this.state = state; this.mode = mode; this.depth = depth; this.prev = prev
+  }
+
+  function copyContext(context) {
+    return new Context(CodeMirror.copyState(context.mode, context.state),
+                       context.mode,
+                       context.depth,
+                       context.prev && copyContext(context.prev))
+  }
+
+  CodeMirror.defineMode("jsx", function(config, modeConfig) {
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false, allowMissingTagName: true})
+    var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
+
+    function flatXMLIndent(state) {
+      var tagName = state.tagName
+      state.tagName = null
+      var result = xmlMode.indent(state, "")
+      state.tagName = tagName
+      return result
+    }
+
+    function token(stream, state) {
+      if (state.context.mode == xmlMode)
+        return xmlToken(stream, state, state.context)
+      else
+        return jsToken(stream, state, state.context)
+    }
+
+    function xmlToken(stream, state, cx) {
+      if (cx.depth == 2) { // Inside a JS /* */ comment
+        if (stream.match(/^.*?\*\//)) cx.depth = 1
+        else stream.skipToEnd()
+        return "comment"
+      }
+
+      if (stream.peek() == "{") {
+        xmlMode.skipAttribute(cx.state)
+
+        var indent = flatXMLIndent(cx.state), xmlContext = cx.state.context
+        // If JS starts on same line as tag
+        if (xmlContext && stream.match(/^[^>]*>\s*$/, false)) {
+          while (xmlContext.prev && !xmlContext.startOfLine)
+            xmlContext = xmlContext.prev
+          // If tag starts the line, use XML indentation level
+          if (xmlContext.startOfLine) indent -= config.indentUnit
+          // Else use JS indentation level
+          else if (cx.prev.state.lexical) indent = cx.prev.state.lexical.indented
+        // Else if inside of tag
+        } else if (cx.depth == 1) {
+          indent += config.indentUnit
+        }
+
+        state.context = new Context(CodeMirror.startState(jsMode, indent),
+                                    jsMode, 0, state.context)
+        return null
+      }
+
+      if (cx.depth == 1) { // Inside of tag
+        if (stream.peek() == "<") { // Tag inside of tag
+          xmlMode.skipAttribute(cx.state)
+          state.context = new Context(CodeMirror.startState(xmlMode, flatXMLIndent(cx.state)),
+                                      xmlMode, 0, state.context)
+          return null
+        } else if (stream.match("//")) {
+          stream.skipToEnd()
+          return "comment"
+        } else if (stream.match("/*")) {
+          cx.depth = 2
+          return token(stream, state)
+        }
+      }
+
+      var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
+      if (/\btag\b/.test(style)) {
+        if (/>$/.test(cur)) {
+          if (cx.state.context) cx.depth = 0
+          else state.context = state.context.prev
+        } else if (/^</.test(cur)) {
+          cx.depth = 1
+        }
+      } else if (!style && (stop = cur.indexOf("{")) > -1) {
+        stream.backUp(cur.length - stop)
+      }
+      return style
+    }
+
+    function jsToken(stream, state, cx) {
+      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+        jsMode.skipExpression(cx.state)
+        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                                    xmlMode, 0, state.context)
+        return null
+      }
+
+      var style = jsMode.token(stream, cx.state)
+      if (!style && cx.depth != null) {
+        var cur = stream.current()
+        if (cur == "{") {
+          cx.depth++
+        } else if (cur == "}") {
+          if (--cx.depth == 0) state.context = state.context.prev
+        }
+      }
+      return style
+    }
+
+    return {
+      startState: function() {
+        return {context: new Context(CodeMirror.startState(jsMode), jsMode)}
+      },
+
+      copyState: function(state) {
+        return {context: copyContext(state.context)}
+      },
+
+      token: token,
+
+      indent: function(state, textAfter, fullLine) {
+        return state.context.mode.indent(state.context.state, textAfter, fullLine)
+      },
+
+      innerMode: function(state) {
+        return state.context
+      }
+    }
+  }, "xml", "javascript")
+
+  CodeMirror.defineMIME("text/jsx", "jsx")
+  CodeMirror.defineMIME("text/typescript-jsx", {name: "jsx", base: {name: "javascript", typescript: true}})
+});
index ad344f2..60b7c38 100644 (file)
     <script src="External/CodeMirror/css.js"></script>
     <script src="External/CodeMirror/htmlmixed.js"></script>
     <script src="External/CodeMirror/javascript.js"></script>
+    <script src="External/CodeMirror/jsx.js"></script>
     <script src="External/CodeMirror/livescript.js"></script>
     <script src="External/CodeMirror/mark-selection.js"></script>
     <script src="External/CodeMirror/matchbrackets.js"></script>
index cca9804..393053b 100644 (file)
@@ -1165,6 +1165,8 @@ WI.Resource._mimeTypeMap = {
     "text/livescript": WI.Resource.Type.Script,
     "text/x-livescript": WI.Resource.Type.Script,
     "text/typescript": WI.Resource.Type.Script,
+    "text/typescript-jsx": WI.Resource.Type.Script,
+    "text/jsx": WI.Resource.Type.Script,
     "text/x-clojure": WI.Resource.Type.Script,
-    "text/x-coffeescript": WI.Resource.Type.Script
+    "text/x-coffeescript": WI.Resource.Type.Script,
 };