double colon inlined fixes

Author: wclr

src/purescript.coffee

@@ -87,7 +87,6 @@ purescriptGrammar =
     ,
       include: '#type_synonym_declaration'
     ,
-      # data and newtype
       include: '#data_type_declaration'
     ,
       include: '#typeclass_declaration'
@@ -115,6 +114,8 @@ purescriptGrammar =
       include: '#data_ctor'
     ,
       include: '#infix_op'
+    ,
+      include: '#double_colon_inlined_signature'
     ,
       include: '#constants_numeric_decimal'
     ,
@@ -136,8 +137,6 @@ purescriptGrammar =
       include: '#double_colon_orphan'
     ,
      include: '#comments'
-    ,
-      include: '#double_colon_inlined_signature'
     ,
       name: 'keyword.other.arrow'
       match: /\<-|-\>/
@@ -550,8 +549,44 @@ purescriptGrammar =
     #   ]
 
     double_colon_inlined_signature:
+      patterns: [
+        patterns: [
+          match: '(SomeType)\s*({doubleColon})(.*)'
+          captures:
+            1: name: 'meta.type-signature'
+            2: name: 'keyword.other.double-colon'
+            3: {name: 'meta.type-signature', patterns: [include: '#type_signature']}
+
+        ]
+      ,
+        patterns: [
+          match: '({doubleColon})(.*)(<-)'
+          captures:
+            1: name: 'keyword.other.double-colon'
+            2: {name: 'meta.type-signature', patterns: [ include: '#type_signature']}
+            3: name: 'keyword.other.double-colon'
+
+        ]
+      ,
+        patterns: [
+          match: '({doubleColon})(.*)'
+          captures:
+            1: name: 'keyword.other.double-colon'
+            2: {
+              name: 'meta.type-signature'
+              patterns: [
+                include: "#record_types"
+                include: '#type_signature'
+              ]
+            }
+
+        ]
+      ]
+
+    _double_colon_inlined_signature:
       patterns: [
         # Note recursive regex matching nested parens
+        # match: '\\((?<paren>(?:[^()]|\\(\\g<paren>\\))*)(::|∷)(?<paren2>(?:[^()]|\\(\\g<paren2>\\))*)\\)'
         match: [
           # '\\(',
           # '(?<paren>(?:[^()]|\\(\\g<paren>\\))*)',
@@ -836,8 +871,10 @@ purescriptGrammar =
       ]
     type_signature:
       patterns: [
-        #   include: '#row_types'
-        # ,
+         include: "#record_types"
+        ,
+         include: '#row_types'
+        ,
           name: 'meta.class-constraints'
           match: concat /\(/,
             list('classConstraints',/{classConstraint}/,/,/),

test/Main.purs

@@ -1,4 +1,6 @@
 -- start
+
+
 {- Test file to visually assess syntax highlighting. -}
 module Main.App where
 module Main.App
@@ -39,6 +41,8 @@ foreign import data R :: { prop :: String }
 -- line comments with no space between first char
 --| some
 
+
+
 -- comments with operators after
 --# some
 --! some
@@ -362,7 +366,7 @@ infixFun = 1 `add` 2
 
 
 -- function declaration, do, where
-toStr :: forall a. Functor a => a -> Effect Unit --comment
+toStr :: forall a. Functor a => { a :: a } -> Effect Unit --comment
 toStr x = do
   log $ show num
   log $ show $ 1 `add` 2
@@ -373,6 +377,16 @@ toStr x = do
   str = "Str"
 
 
+-- double_colon_inlined_signature
+gotConfig :: AVar { a :: Unit } <- AVar.empty
+
+
+SomeType :: ( a :: Int )
+
+
+AVar :: Type → Type
+
+
 addIf true = singleton
 addIf false = const []
 
@@ -437,6 +451,7 @@ multiString = """
 
 """
 
+
 multiStringOneLine = """ "WOW" text """