Field accessor Sub Props! Wowee!

src/test/data/horsescript.neigh

@@ -2,7 +2,7 @@
 toString([!donkey])
 true, false, null, tiny, 'old', 'operator+inside'
 
-@currentField.id, @currentField.title, @currentField.email, @currentField.sip
+@currentField.title, @currentField.email, @currentField.sip
 @currentField.picture, @currentField.department, @currentField.jobTitle
 
 @currentField.DisplayName, @currentField.LocationUri
@@ -14,13 +14,30 @@ true, false, null, tiny, 'old', 'operator+inside'
 @currentField.fileName, @currentField.serverRelativeUrl, @currentField.serverUrl
 @currentField.thumbnailRenderer.spItemUrl, @currentField.thumbnailRenderer.fileVersion, @currentField.thumbnailRenderer.sponsorToken
 
-@currentField.desc, @currentField.displayValue, @currentField.numeric
+@currentField.id, @currentField.displayValue
+@currentField.desc, @currentField.numeric
 
 @currentWeb,@me,@now,@rowIndex,@window.innerHeight,@window.innerWidth
 @isSelected,@lcid,@UIlcid
 
 @thumbnail.small,@thumbnail.medium,@thumbnail.large
 @thumbnail.150,@thumbnail.4048,@thumbnail.100x200,@thumbnail.1000x1600
 
+[$Title,sa] [$!Title.DisplayName]
+[$Editor.title], [$Editor.email], [$Editor.sip]
+[$Editor.picture], [$Editor.department], [$Editor.jobTitle]
+
+[$Location.DisplayName], [$Location.LocationUri]
+[$Location.Address.City], [$Location.Address.CountryOrRegion], [$Location.Address.State], [$Location.Address.Street]
+[$Location.Coordinates.Latitude], [$Location.Coordinates.Longitude]
+
+[$Lookup_x0020_Field.lookupId], [$Lookup_x0020_Field.lookupValue]
+
+[$Image.fileName], [$Image.serverRelativeUrl], [$Image.serverUrl]
+[$Image.thumbnailRenderer.spItemUrl], [$Image.thumbnailRenderer.fileVersion], [$Image.thumbnailRenderer.sponsorToken]
+
+[$Title.id], [$Title.displayValue]
+[$Hyperlink.desc], [$Approval.numeric]
+
 This stuff be bad on purpose (mostly)
 @thumbnail,@window,@currentField.Coordinates,@currentField.Address,@currentField.thumbnailRenderer

syntaxes/horsescript.tmLanguage.json

@@ -273,11 +273,130 @@
           "name": "punctuation.section.brackets.end.horsescript"
         }
       },
-      "name": "variable.parameter.horsescript",
       "patterns": [
         {
-          "match": "[^\\]]+",
-          "name": "variable.parameter.inner.horsescript"
+          "match": "(?<=\\[\\$)[^~#%&*{}\\:<>?/+|\",.\\]]+",
+          "name": "variable.parameter.field.horsescript"
+        },
+        {
+          "match": "\\.",
+          "name": "punctuation.accessor.horsescript"
+        },
+        {
+          "match": "title(?=\\W|$)",
+          "name": "support.constant.person.title.horsescript"
+        },
+        {
+          "match": "email(?=\\W|$)",
+          "name": "support.constant.person.email.horsescript"
+        },
+        {
+          "match": "sip(?=\\W|$)",
+          "name": "support.constant.person.sip.horsescript"
+        },
+        {
+          "match": "picture(?=\\W|$)",
+          "name": "support.constant.person.picture.horsescript"
+        },
+        {
+          "match": "department(?=\\W|$)",
+          "name": "support.constant.person.department.horsescript"
+        },
+        {
+          "match": "jobTitle(?=\\W|$)",
+          "name": "support.constant.person.jobtitle.horsescript"
+        },
+        {
+          "match": "DisplayName(?=\\W|$)",
+          "name": "support.constant.location.displayname.horsescript"
+        },
+        {
+          "match": "LocationUri(?=\\W|$)",
+          "name": "support.constant.location.locationuri.horsescript"
+        },
+        {
+          "match": "Address(?=\\.(City|CountryOrRegion|State|Street)\\b)",
+          "name": "variable.language.location.address.horsescript"
+        },
+        {
+          "match": "(?<=\\.Address\\.)City(?=\\W|$)",
+          "name": "support.constant.location.address.city.horsescript"
+        },
+        {
+          "match": "(?<=\\.Address\\.)CountryOrRegion(?=\\W|$)",
+          "name": "support.constant.location.address.countryorregion.horsescript"
+        },
+        {
+          "match": "(?<=\\.Address\\.)State(?=\\W|$)",
+          "name": "support.constant.location.address.state.horsescript"
+        },
+        {
+          "match": "(?<=\\.Address\\.)Street(?=\\W|$)",
+          "name": "support.constant.location.address.street.horsescript"
+        },
+        {
+          "match": "Coordinates(?=\\.(Latitude|Longitude)\\b)",
+          "name": "variable.language.location.coordinates.horsescript"
+        },
+        {
+          "match": "(?<=\\.Coordinates\\.)Latitude(?=\\W|$)",
+          "name": "support.constant.location.coordinates.latitude.horsescript"
+        },
+        {
+          "match": "(?<=\\.Coordinates\\.)Longitude(?=\\W|$)",
+          "name": "support.constant.location.coordinates.longitude.horsescript"
+        },
+        {
+          "match": "lookupId(?=\\W|$)",
+          "name": "support.constant.lookup.lookupid.horsescript"
+        },
+        {
+          "match": "lookupValue(?=\\W|$)",
+          "name": "support.constant.lookup.lookupvalue.horsescript"
+        },
+        {
+          "match": "fileName(?=\\W|$)",
+          "name": "support.constant.image.filename.horsescript"
+        },
+        {
+          "match": "serverRelativeUrl(?=\\W|$)",
+          "name": "support.constant.image.serverrelativeurl.horsescript"
+        },
+        {
+          "match": "serverUrl(?=\\W|$)",
+          "name": "support.constant.image.serverurl.horsescript"
+        },
+        {
+          "match": "thumbnailRenderer(?=\\.(spItemUrl|fileVersion|sponsorToken)\\b)",
+          "name": "variable.language.image.thumbnailrenderer.horsescript"
+        },
+        {
+          "match": "(?<=\\.thumbnailRenderer\\.)spItemUrl(?=\\W|$)",
+          "name": "support.constant.image.thumbnailrenderer.spitemurl.horsescript"
+        },
+        {
+          "match": "(?<=\\.thumbnailRenderer\\.)fileVersion(?=\\W|$)",
+          "name": "support.constant.image.thumbnailrenderer.fileversion.horsescript"
+        },
+        {
+          "match": "(?<=\\.thumbnailRenderer\\.)sponsorToken(?=\\W|$)",
+          "name": "support.constant.image.thumbnailrenderer.sponsortoken.horsescript"
+        },
+        {
+          "match": "desc(?=\\W|$)",
+          "name": "support.constant.hyperlink.desc.horsescript"
+        },
+        {
+          "match": "numeric(?=\\W|$)",
+          "name": "support.constant.moderation.numeric.horsescript"
+        },
+        {
+          "match": "displayValue(?=\\W|$)",
+          "name": "support.constant.field.displayvalue.horsescript"
+        },
+        {
+          "match": "id(?=\\W|$)",
+          "name": "support.constant.field.id.horsescript"
         }
       ]
     },