HTTP: Improved content highlighting

components/prism-http.js

@@ -1,50 +1,79 @@
-Prism.languages.http = {
-	'request-line': {
-		pattern: /^(?:POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\s(?:https?:\/\/|\/)\S+\sHTTP\/[0-9.]+/m,
-		inside: {
-			// HTTP Verb
-			property: /^(?:POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,
-			// Path or query argument
-			'attr-name': /:\w+/
-		}
-	},
-	'response-status': {
-		pattern: /^HTTP\/1.[01] \d+.*/m,
-		inside: {
-			// Status, e.g. 200 OK
-			property: {
-                pattern: /(^HTTP\/1.[01] )\d+.*/i,
-                lookbehind: true
-            }
+(function (Prism) {
+	Prism.languages.http = {
+		'request-line': {
+			pattern: /^(?:POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\s(?:https?:\/\/|\/)\S+\sHTTP\/[0-9.]+/m,
+			inside: {
+				// HTTP Verb
+				'property': /^(?:POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,
+				// Path or query argument
+				'attr-name': /:\w+/
+			}
+		},
+		'response-status': {
+			pattern: /^HTTP\/1.[01] \d+.*/m,
+			inside: {
+				// Status, e.g. 200 OK
+				'property': {
+					pattern: /(^HTTP\/1.[01] )\d+.*/i,
+					lookbehind: true
+				}
+			}
+		},
+		// HTTP header name
+		'header-name': {
+			pattern: /^[\w-]+:(?=.)/m,
+			alias: 'keyword'
 		}
-	},
-	// HTTP header name
-	'header-name': {
-        pattern: /^[\w-]+:(?=.)/m,
-        alias: 'keyword'
-    }
-};
+	};
 
-// Create a mapping of Content-Type headers to language definitions
-var httpLanguages = {
-	'application/json': Prism.languages.javascript,
-	'application/xml': Prism.languages.markup,
-	'text/xml': Prism.languages.markup,
-	'text/html': Prism.languages.markup
-};
+	// Create a mapping of Content-Type headers to language definitions
+	var langs = Prism.languages;
+	var httpLanguages = {
+		'application/javascript': langs.javascript,
+		'application/json': langs.json || langs.javascript,
+		'application/xml': langs.xml,
+		'text/xml': langs.xml,
+		'text/html': langs.html,
+		'text/css': langs.css
+	};
 
-// Insert each content type parser that has its associated language
-// currently loaded.
-for (var contentType in httpLanguages) {
-	if (httpLanguages[contentType]) {
-		var options = {};
-		options[contentType] = {
-			pattern: RegExp('(content-type:\\s*' + contentType + '[\\w\\W]*?)(?:\\r?\\n|\\r){2}[\\w\\W]*', 'i'),
-			lookbehind: true,
-			inside: {
-				rest: httpLanguages[contentType]
-			}
-		};
+	// Declare which types can also be suffixes
+	var suffixTypes = {
+		'application/json': true,
+		'application/xml': true
+	};
+
+	/**
+	 * Returns a pattern for the given content type which matches it and any type which has it as a suffix.
+	 *
+	 * @param {string} contentType
+	 * @returns {string}
+	 */
+	function getSuffixPattern(contentType) {
+		var suffix = contentType.replace(/^[a-z]+\//, '');
+		var suffixPattern = '\\w+/(?:[\\w.-]+\\+)+' + suffix + '(?![+\\w.-])';
+		return '(?:' + contentType + '|' + suffixPattern + ')';
+	}
+
+	// Insert each content type parser that has its associated language
+	// currently loaded.
+	var options;
+	for (var contentType in httpLanguages) {
+		if (httpLanguages[contentType]) {
+			options = options || {};
+
+			var pattern = suffixTypes[contentType] ? getSuffixPattern(contentType) : contentType;
+			options[contentType] = {
+				pattern: RegExp('(content-type:\\s*' + pattern + '[\\s\\S]*?)(?:\\r?\\n|\\r){2}[\\s\\S]*', 'i'),
+				lookbehind: true,
+				inside: {
+					rest: httpLanguages[contentType]
+				}
+			};
+		}
+	}
+	if (options) {
 		Prism.languages.insertBefore('http', 'header-name', options);
 	}
-}
+
+}(Prism));

tests/languages/css+http/css_inclusion.test

@@ -0,0 +1,25 @@
+Content-type: text/css
+
+a.link:hover {
+	color: red;
+}
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" text/css",
+	["text/css", [
+		["selector", "a.link:hover"],
+		["punctuation", "{"],
+		["property", "color"],
+		["punctuation", ":"],
+		" red",
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for JavaScript content in HTTP.

tests/languages/javascript+http/javascript_inclusion.test

@@ -1,21 +1,21 @@
-Content-type: application/json
+Content-type: application/javascript
 
-{"foo":"bar"}
+var a = true;
 
 ----------------------------------------------------
 
 [
 	["header-name", "Content-type:"],
-	" application/json",
-	["application/json", [
-		["punctuation", "{"],
-		["string", "\"foo\""],
-		["punctuation", ":"],
-		["string", "\"bar\""],
-		["punctuation", "}"]
+	" application/javascript",
+	["application/javascript", [
+		["keyword", "var"],
+		" a ",
+		["operator", "="],
+		["boolean", "true"],
+		["punctuation", ";"]
 	]]
 ]
 
 ----------------------------------------------------
 
-Checks for JSON content in HTTP.
+Checks for JavaScript content in HTTP.

tests/languages/json+http/json-suffix_inclusion.test

@@ -0,0 +1,21 @@
+Content-type: application/x.foo+bar+json
+
+{"foo":"bar"}
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" application/x.foo+bar+json",
+	["application/json", [
+		["punctuation", "{"],
+		["property", "\"foo\""],
+		["operator", ":"],
+		["string", "\"bar\""],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for content with JSON suffix in HTTP.

tests/languages/json+http/json_inclusion.test

@@ -0,0 +1,21 @@
+Content-type: application/json
+
+{"foo":"bar"}
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" application/json",
+	["application/json", [
+		["punctuation", "{"],
+		["property", "\"foo\""],
+		["operator", ":"],
+		["string", "\"bar\""],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for JSON content in HTTP.

tests/languages/markup+http/html_inclusion.test

@@ -0,0 +1,30 @@
+Content-type: text/html
+
+<b></b>
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" text/html",
+	["text/html", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"b"
+			]],
+			["punctuation", ">"]
+		]],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"b"
+			]],
+			["punctuation", ">"]
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for HTML content in HTTP.

tests/languages/markup+http/xml-suffix_inclusion.test

@@ -0,0 +1,30 @@
+Content-type: text/x.anything+something-else+xml
+
+<foo></foo>
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" text/x.anything+something-else+xml",
+	["application/xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"foo"
+			]],
+			["punctuation", ">"]
+		]],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"foo"
+			]],
+			["punctuation", ">"]
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for content with XML suffix in HTTP.

tests/languages/markup+http/markup_inclusion.test → tests/languages/markup+http/xml_inclusion.test

@@ -16,12 +16,12 @@ Content-type: application/xml
 			["punctuation", ">"]
 		]],
 		["tag", [
-            ["tag", [
-                ["punctuation", "</"],
-                "foo"
-            ]],
-            ["punctuation", ">"]
-        ]]
+			["tag", [
+				["punctuation", "</"],
+				"foo"
+			]],
+			["punctuation", ">"]
+		]]
 	]]
 ]