notation3 fixes

README.md

@@ -13,7 +13,7 @@ Each syntax highlighter reflects a complete implementation of the grammar specif
  - TriG
  - N-Triples (NT)
  - N-Quads (NQ)
- - Notation3
+ - Notation3 (N3)
 
 #### Currently supported platforms:
  - Sublime Text 3
@@ -24,7 +24,7 @@ Each syntax highlighter reflects a complete implementation of the grammar specif
  - Macaroon Light (in beta)
 
 #### *Planned langauage support*:
- - ShEx
+ - ShExC
  - RDFa
  - JSON-LD
 

src/color-schemes/macaroon-dark.js

@@ -158,6 +158,7 @@ module.exports = {
 			// language-tags
 			'string.unquoted.language-tag': -5,
 			'punctuation.separator.language-tag.symbol': -60,
+			'string.unquoted.barename': -30,
 
 			// numerics
 			'keyword.operator.arithmetic': -0,

src/syntax/notation3.sublime-syntax-source

@@ -148,7 +148,7 @@ contexts:
   barenameCslTail:
     - match: ','
       scope: punctuation.separator.barename.n3
-      set: barename
+      push: barename
     - include: else_pop
 
   prefix:
@@ -227,7 +227,7 @@ contexts:
 
   pathList:
     - _switch:
-        - pathItem: expression
+        - pathItem: [pathList, expression]
     - include: else_pop
 
   pathTail:
@@ -260,7 +260,7 @@ contexts:
         2: punctuation.definition.keyword.predicate.has.n3
       set: expression
       pop: true
-    - match: '((@)is)\b'
+    - match: '((@)?is)\b'
       captures:
         1: support.function.built-in.is.n3
         2: punctuation.definition.keyword.predicate.is.n3
@@ -269,10 +269,11 @@ contexts:
     - include: expression
 
   predicate_EXPECT_OF:
-    - match: '((@)of)\b'
+    - match: '((@)?of)\b'
       captures:
         1: support.constant.predicate.of.n3
         2: punctuation.definition.keyword.predicate.of.n3
+      pop: true
     - _throw: true
 
   propertyList:
@@ -283,6 +284,7 @@ contexts:
   propertyListTail:
     - match: ';'
       scope: punctuation.separator.property-list.n3
+      set: propertyList
     - include: else_pop
 
   objectTail: