Added support for URIs (#2708)

components.json

@@ -501,7 +501,8 @@
 				"css",
 				"javascript",
 				"json",
-				"markup"
+				"markup",
+				"uri"
 			],
 			"owner": "danielgtaylor"
 		},
@@ -1210,6 +1211,14 @@
 			"alias": ["uscript", "uc"],
 			"owner": "RunDevelopment"
 		},
+		"uri": {
+			"title": "URI",
+			"alias": "url",
+			"aliasTitles": {
+				"url": "URL"
+			},
+			"owner": "RunDevelopment"
+		},
 		"v": {
 			"title": "V",
 			"require": "clike",

components/prism-http.js

@@ -12,7 +12,8 @@
 				'request-target': {
 					pattern: /^(\s)(?:https?:\/\/|\/)\S*(?=\s)/,
 					lookbehind: true,
-					alias: 'url'
+					alias: 'url',
+					inside: Prism.languages.uri
 				},
 				// HTTP Version
 				'http-version': {

components/prism-uri.js

@@ -0,0 +1,96 @@
+// https://tools.ietf.org/html/rfc3986#appendix-A
+
+Prism.languages.uri = {
+	'scheme': {
+		pattern: /^[a-z][a-z0-9+.-]*:/im,
+		greedy: true,
+		inside: {
+			'scheme-delimiter': /:$/
+		}
+	},
+	'fragment': {
+		pattern: /#[\w\-.~!$&'()*+,;=%:@/?]*/,
+		inside: {
+			'fragment-delimiter': /^#/
+		}
+	},
+	'query': {
+		pattern: /\?[\w\-.~!$&'()*+,;=%:@/?]*/,
+		inside: {
+			'query-delimiter': {
+				pattern: /^\?/,
+				greedy: true
+			},
+			'pair-delimiter': /[&;]/,
+			'pair': {
+				pattern: /^[^=][\s\S]*/,
+				inside: {
+					'key': /^[^=]+/,
+					'value': {
+						pattern: /(^=)[\s\S]+/,
+						lookbehind: true
+					}
+				}
+			}
+		}
+	},
+	'authority': {
+		pattern: RegExp(
+			/^\/\//.source
+			// [ userinfo "@" ]
+			+ /(?:[\w\-.~!$&'()*+,;=%:]*@)?/.source
+			// host
+			+ (
+				'(?:'
+				// IP-literal
+				+ /\[(?:[0-9a-fA-F:.]{2,48}|v[0-9a-fA-F]+\.[\w\-.~!$&'()*+,;=]+)\]/.source
+				+ '|'
+				// IPv4address or registered name
+				+ /[\w\-.~!$&'()*+,;=%]*/.source
+				+ ')'
+			)
+			// [ ":" port ]
+			+ /(?::\d*)?/.source,
+			'm'
+		),
+		inside: {
+			'authority-delimiter': /^\/\//,
+			'user-info-segment': {
+				pattern: /^[\w\-.~!$&'()*+,;=%:]*@/,
+				inside: {
+					'user-info-delimiter': /@$/,
+					'user-info': /^[\w\-.~!$&'()*+,;=%:]+/
+				}
+			},
+			'port-segment': {
+				pattern: /:\d*$/,
+				inside: {
+					'port-delimiter': /^:/,
+					'port': /^\d+/
+				}
+			},
+			'host': {
+				pattern: /[\s\S]+/,
+				inside: {
+					'ip-literal': {
+						pattern: /^\[[\s\S]+\]$/,
+						inside: {
+							'ip-literal-delimiter': /^\[|\]$/,
+							'ipv-future': /^v[\s\S]+/,
+							'ipv6-address': /^[\s\S]+/
+						}
+					},
+					'ipv4-address': /^(?:(?:[03-9]\d?|[12]\d{0,2})\.){3}(?:[03-9]\d?|[12]{0,2})$/
+				}
+			}
+		}
+	},
+	'path': {
+		pattern: /^[\w\-.~!$&'()*+,;=%:@/]+/m,
+		inside: {
+			'path-separator': /\//
+		}
+	}
+};
+
+Prism.languages.url = Prism.languages.uri;

examples/prism-uri.html

@@ -0,0 +1,13 @@
+<h2>Full example</h2>
+<pre><code>https://john.doe@www.example.com:123/forum/questions/?tag=networking&order=newest#top
+https://example.com/path/resource.txt#fragment
+ldap://[2001:db8::7]/c=GB?objectClass?one
+mailto:John.Doe@example.com
+news:comp.infosystems.www.servers.unix
+tel:+1-816-555-1212
+telnet://192.0.2.16:80/
+urn:oasis:names:specification:docbook:dtd:xml:4.1.2
+//example.com/path/resource.txt
+/path/resource.txt
+path/resource.txt
+</code></pre>

plugins/autoloader/prism-autoloader.js

@@ -224,6 +224,7 @@
 		"tsconfig": "typoscript",
 		"uscript": "unrealscript",
 		"uc": "unrealscript",
+		"url": "uri",
 		"vb": "visual-basic",
 		"vba": "visual-basic",
 		"xeoracube": "xeora",

plugins/show-language/prism-show-language.js

@@ -199,6 +199,8 @@
 		"tsconfig": "TSConfig",
 		"uscript": "UnrealScript",
 		"uc": "UnrealScript",
+		"uri": "URI",
+		"url": "URL",
 		"vbnet": "VB.Net",
 		"vhdl": "VHDL",
 		"vim": "vim",