.properties: Use key, value for token names; attr-name, `attr-v…

…alue` as aliases (#3377)

components/prism-properties.js

@@ -1,9 +1,13 @@
 Prism.languages.properties = {
 	'comment': /^[ \t]*[#!].*$/m,
-	'attr-value': {
+	'value': {
 		pattern: /(^[ \t]*(?:\\(?:\r\n|[\s\S])|[^\\\s:=])+(?: *[=:] *(?! )| ))(?:\\(?:\r\n|[\s\S])|[^\\\r\n])+/m,
-		lookbehind: true
+		lookbehind: true,
+		alias: 'attr-value'
+	},
+	'key': {
+		pattern: /^[ \t]*(?:\\(?:\r\n|[\s\S])|[^\\\s:=])+(?= *[=:]| )/m,
+		alias: 'attr-name'
 	},
-	'attr-name': /^[ \t]*(?:\\(?:\r\n|[\s\S])|[^\\\s:=])+(?= *[=:]| )/m,
 	'punctuation': /[=:]/
 };

tests/languages/properties/key_value_feature.test

@@ -11,26 +11,26 @@ baz
 ----------------------------------------------------
 
 [
-	["attr-name", "foo"],
-	["attr-value", "bar"],
-	["attr-name", "foo\\:\\=\\ bar"],
-	["attr-value", "bar\\:\\= \\\r\nbaz"],
+	["key", "foo"],
+	["value", "bar"],
+	["key", "foo\\:\\=\\ bar"],
+	["value", "bar\\:\\= \\\r\nbaz"],
 
-	["attr-name", "foo"],
+	["key", "foo"],
 	["punctuation", "="],
-	["attr-value", "bar"],
-	["attr-name", "foo\\:\\=\\ bar"],
+	["value", "bar"],
+	["key", "foo\\:\\=\\ bar"],
 	["punctuation", "="],
-	["attr-value", "bar\\:\\= \\\r\nbaz"],
+	["value", "bar\\:\\= \\\r\nbaz"],
 
-	["attr-name", "foo"],
+	["key", "foo"],
 	["punctuation", ":"],
-	["attr-value", "bar"],
-	["attr-name", "foo\\:\\=\\ bar"],
+	["value", "bar"],
+	["key", "foo\\:\\=\\ bar"],
 	["punctuation", ":"],
-	["attr-value", "bar\\:\\= \\\r\nbaz"]
+	["value", "bar\\:\\= \\\r\nbaz"]
 ]
 
 ----------------------------------------------------
 
-Checks for keys and values.
+Checks for keys and values.