Fix for symbolic data-con in fixity declaration

sheaf · sheaf · commit d5f6b81e1df3 · 2020-09-25T20:50:41.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
   ([#170](https://github.com/JustusAdam/language-haskell/issues/170)).
 - Proper highlighting of lambda case, including fixing the highlighting of subsequent braces (which were wrongly highlighted as record syntax).
 - Recognize indented `\begin{code}` boundary in literate haskell files.
+- Fix highlighting of symbolic data constructors within fixity declarations (e.g. `infixl 9 :$`).
 
 ## 3.3.0 - 25.06.2020
 
diff --git a/syntaxes/haskell.YAML-tmLanguage b/syntaxes/haskell.YAML-tmLanguage
@@ -378,11 +378,13 @@ patterns:
   - include: '#keyword'
   - match: '^\s*(infix[lr]?)\s+(.*)'
     captures:
-      '1': {name: "keyword.other.$1.haskell"}
+      '1': {name: "keyword.other.fixity.$1.haskell"}
       '2':
         patterns:
           - include: '#comment_like'
           - include: '#integer_literals'
+          - match: ':[\p{S}\p{P}&&[^(),;\[\]`{}_"'']]*'
+            name: constant.other.operator.infix.haskell
           - include: "#infix_op"
     name: meta.fixity-declaration.haskell
   - include: '#start_type_signature'
@@ -392,7 +394,7 @@ patterns:
   - include: '#fun_decl'
   - include: '#qualifier'
   - match: ':[\p{S}\p{P}&&[^(),;\[\]`{}_"'']]*'
-    name: constant.other.operator.haskell
+    name: constant.other.operator.infix.haskell
   - include: '#data_constructor'
   - include: '#prefix_op'
   - include: '#infix_op'
@@ -648,7 +650,7 @@ repository:
           - include: '#record_wildcard'
           - match: >-
               (\()\s*(:[\p{S}\p{P}&&[^(),;\[\]`{}_"']]*)\s*(\))
-            name: constant.other.operator.haskell
+            name: constant.other.operator.prefix.haskell
           - include: '#export_constructs'
           - include: '#comma'
   export_constructs:
@@ -666,7 +668,7 @@ repository:
         endCaptures:
           '1': {name: constant.other.haskell}
           '2': {name: punctuation.paren.haskell}
-          '3': {name: constant.other.operator.haskell}
+          '3': {name: constant.other.operator.prefix.haskell}
           '4': {name: punctuation.paren.haskell}
         patterns:
           - include: '#comment_like'
@@ -1074,13 +1076,13 @@ repository:
           '4':
             patterns:
               - include: '#type_signature'
-          '6': {name: constant.other.operator.haskell}
+          '6': {name: constant.other.operator.infix.haskell}
           '7': {name: punctuation.backtick.haskell}
-          '8': {name: constant.other.haskell}
+          '8': {name: constant.other.infix.haskell}
           '9': {name: punctuation.backtick.haskell}
           '10': {name: constant.other.haskell}
           '11': {name: punctuation.paren.haskell}
-          '12': {name: constant.other.operator.haskell}
+          '12': {name: constant.other.operator.prefix.haskell}
           '13': {name: punctuation.paren.haskell}
         patterns:
           - include: '#comment_like'
@@ -1102,7 +1104,7 @@ repository:
         beginCaptures:
           '2': {name: constant.other.haskell}
           '3': {name: punctuation.paren.haskell}
-          '4': {name: constant.other.operator.haskell}
+          '4': {name: constant.other.operator.prefix.haskell}
           '5': {name: punctuation.paren.haskell}
         end: |
           (?x)
@@ -1134,7 +1136,7 @@ repository:
         beginCaptures:
           '1': {name: constant.other.haskell}
           '2': {name: punctuation.paren.haskell}
-          '3': {name: constant.other.operator.haskell}
+          '3': {name: constant.other.operator.prefix.haskell}
           '4': {name: punctuation.paren.haskell}
         end: '(?=;|\}|$)'
         patterns:
diff --git a/test/tests/Exports.hs b/test/tests/Exports.hs
@@ -7,24 +7,24 @@ module M
   , S((:<..<), .. )
 --  ^ storage.type.haskell
 --       ^^ - variable.other.member.wildcard.haskell
---     ^^^^^ constant.other.operator.haskell
+--     ^^^^^ constant.other.operator.prefix.haskell
 --             ^^ variable.other.member.wildcard.haskell
   , (:->)((:>))
 --   ^^^ storage.type.operator.haskell
---         ^^ constant.other.operator.haskell
+--         ^^ constant.other.operator.prefix.haskell
   , (:<>)(C,a,D,E)
 --   ^^^ storage.type.operator.haskell
   , A((<>), (:>>))
 --  ^ storage.type.haskell
---           ^^^ constant.other.operator.haskell
+--           ^^^ constant.other.operator.prefix.haskell
   , f
 --  ^  entity.name.function.haskell
   , pattern P
 --  ^^^^^^^ keyword.other.pattern.haskell
 --          ^ constant.other.haskell
   , pattern (:|)
 --  ^^^^^^^ keyword.other.pattern.haskell
---           ^^ constant.other.operator.haskell
+--           ^^ constant.other.operator.prefix.haskell
   , pattern -- Q,)
 --  ^^^^^^^ keyword.other.pattern.haskell
       Q
diff --git a/test/tests/Fixity.hs b/test/tests/Fixity.hs
@@ -2,23 +2,23 @@
 
 
     infixl 3 :+
---  ^^^^^^ keyword.other.infixl.haskell
+--  ^^^^^^ keyword.other.fixity.infixl.haskell
 --         ^ constant.numeric.integral.decimal.haskell
---           ^^ keyword.operator.infix.haskell
+--           ^^ constant.other.operator.infix.haskell
 
     infixr 7 ---:
---  ^^^^^^ keyword.other.infixr.haskell
+--  ^^^^^^ keyword.other.fixity.infixr.haskell
 --         ^ constant.numeric.integral.decimal.haskell
 --           ^^^^ keyword.operator.infix.haskell
 
     infix 1 `Cons`
---  ^^^^^ keyword.other.infix.haskell
+--  ^^^^^ keyword.other.fixity.infix.haskell
 --        ^ constant.numeric.integral.decimal.haskell
 --           ^^^^ constant.other.haskell
 --          ^^^^^^ keyword.operator.function.infix.haskell
 
     infix 2 <|> -- comment
---  ^^^^^ keyword.other.infix.haskell
+--  ^^^^^ keyword.other.fixity.infix.haskell
 --        ^ constant.numeric.integral.decimal.haskell
 --          ^^^ keyword.operator.infix.haskell
 --              ^^^^^^^^^^ comment.line.double-dash.haskell
diff --git a/test/tests/GADTRecord.hs b/test/tests/GADTRecord.hs
@@ -17,7 +17,7 @@
 
     data (!!!) :: Type where
       (:<>) :: { fld1 :: A, (&) :: B } -> (!!!)
---     ^^^ constant.other.operator.haskell
+--     ^^^ constant.other.operator.prefix.haskell
 --               ^^^^        ^ variable.other.member.definition.haskell
 --             ^                     ^ punctuation.brace.haskell
 --                       ^         ^ storage.type.haskell     
diff --git a/test/tests/GADTs.hs b/test/tests/GADTs.hs
@@ -19,7 +19,7 @@
 --                   ^   ^ ^ storage.type.haskell
 
       (:&) :: G A B C
---     ^^ constant.other.operator.haskell
+--     ^^ constant.other.operator.prefix.haskell
 --         ^^ keyword.operator.double-colon.haskell
 --            ^ ^ ^ ^ storage.type.haskell
 
diff --git a/test/tests/Imports.hs b/test/tests/Imports.hs
@@ -7,24 +7,24 @@ import M
   , S((:<..<), .. )
 --  ^ storage.type.haskell
 --       ^^ - variable.other.member.wildcard.haskell
---     ^^^^^ constant.other.operator.haskell
+--     ^^^^^ constant.other.operator.prefix.haskell
 --             ^^ variable.other.member.wildcard.haskell
   , (:->)((:>))
 --   ^^^ storage.type.operator.haskell
---         ^^ constant.other.operator.haskell
+--         ^^ constant.other.operator.prefix.haskell
   , (:<>)(C,a,D,E)
 --   ^^^ storage.type.operator.haskell
   , A((<>), (:>>))
 --  ^ storage.type.haskell
---           ^^^ constant.other.operator.haskell
+--           ^^^ constant.other.operator.prefix.haskell
   , f
 --  ^  entity.name.function.haskell
   , pattern P
 --  ^^^^^^^ keyword.other.pattern.haskell
 --          ^ constant.other.haskell
   , pattern (:| )
 --  ^^^^^^^ keyword.other.pattern.haskell
---           ^^ constant.other.operator.haskell
+--           ^^ constant.other.operator.prefix.haskell
   , pattern -- Q,)
 --  ^^^^^^^ keyword.other.pattern.haskell
       Q
diff --git a/test/tests/InfixDataDecl.hs b/test/tests/InfixDataDecl.hs
@@ -5,7 +5,7 @@
 --  ^^^^ keyword.other.data.haskell
 --             ^ keyword.operator.eq.haskell
 --               ^                 ^ punctuation.paren.haskell
---                                    ^ constant.other.haskell
+--                                    ^ constant.other.infix.haskell
 --                                   ^ ^ punctuation.backtick.haskell
 --                                       ^ keyword.operator.promotion.haskell
 --       ^         ^                        ^    ^  ^ storage.type.haskell
@@ -17,7 +17,7 @@
 --  ^^^^ keyword.other.data.haskell
 --             ^ keyword.operator.eq.haskell
 --               ^ keyword.operator.promotion.haskell
---                             ^ constant.other.haskell
+--                             ^ constant.other.infix.haskell
 --                            ^ ^ punctuation.backtick.haskell
 --                  ^     ^       ^ storage.type.haskell
 --         ^ ^         ^            ^ variable.other.generic-type.haskell
@@ -26,5 +26,6 @@
 --  ^^^^ keyword.other.data.haskell
 --             ^ keyword.operator.eq.haskell
 --               ^^^^ entity.name.namespace.haskell
+--                      ^ constant.other.infix.haskell
 --                     ^ ^ punctuation.backtick.haskell
 --                   ^     ^^ storage.type.haskell
diff --git a/test/tests/SymbolicPatternSynonyms.hs b/test/tests/SymbolicPatternSynonyms.hs
@@ -5,6 +5,8 @@
 --  ^^^^^^^ keyword.other.pattern.haskell
 --           ^^^^^    ^^^^^^^ constant.other.operator.haskell
     pattern (:<..<)   s e = s :<..<   e
---           ^^^^^            ^^^^^ constant.other.operator.haskell
+--           ^^^^^ constant.other.operator.haskell
+--                            ^^^^^ constant.other.operator.infix.haskell
     pattern (:<=..<=) s e = s :<=..<= e
---           ^^^^^^^          ^^^^^^^ constant.other.operator.haskell
+--           ^^^^^^^ constant.other.operator.haskell
+--                            ^^^^^^^ constant.other.operator.infix.haskell
diff --git a/test/tickets/T0069.hs b/test/tickets/T0069.hs
@@ -5,7 +5,7 @@ module Main (
 --            ^^^^^ meta.declaration.exports.haskell entity.name.function.haskell
 --            ^^^^^ - invalid
    , Bar((:->), (:->>)), Baz, func5
---        ^^^    ^^^^ meta.declaration.exports.haskell constant.other.operator.haskell
+--        ^^^    ^^^^ meta.declaration.exports.haskell constant.other.operator.prefix.haskell
 --                       ^^^ meta.declaration.exports.haskell storage.type.haskell
 --                            ^^^^^ meta.declaration.exports.haskell entity.name.function.haskell
     ) where
diff --git a/test/tickets/T0090.hs b/test/tickets/T0090.hs
@@ -1,19 +1,19 @@
 -- SYNTAX TEST "source.haskell" "Fixity declarations"
 
 infixl 6 :+
--- <------ keyword.other.infixl.haskell
+-- <------ keyword.other.fixity.infixl.haskell
 --     ^ constant.numeric.integral.decimal.haskell
---       ^^ keyword.operator.infix.haskell
+--       ^^ constant.other.operator.infix.haskell
 infixr 7 //
 --     ^ constant.numeric.integral.decimal.haskell
--- <------ keyword.other.infixr.haskell
+-- <------ keyword.other.fixity.infixr.haskell
 --       ^^ keyword.operator.infix.haskell
     infix 2 `elem`
---  ^^^^^ keyword.other.infix.haskell
+--  ^^^^^ keyword.other.fixity.infix.haskell
 --        ^ constant.numeric.integral.decimal.haskell
 --          ^^^^^^ keyword.operator.function.infix.haskell
     infix 0 `Cons`
---  ^^^^^ keyword.other.infix.haskell
+--  ^^^^^ keyword.other.fixity.infix.haskell
 --        ^ constant.numeric.integral.decimal.haskell
 --          ^^^^^^ keyword.operator.function.infix.haskell
 --           ^^^^ constant.other.haskell
diff --git a/test/tickets/T0132.hs b/test/tickets/T0132.hs
@@ -8,7 +8,7 @@ data C a b = C a b
 data a `D` b = a `D` b
 -- <---- keyword.other.data.haskell
 --      ^ storage.type.infix.haskell
---                ^ constant.other.haskell
+--                ^ constant.other.infix.haskell
 
 data a `E` b where
 -- <---- keyword.other.data.haskell
@@ -17,24 +17,26 @@ data a `E` b where
 data (:>) a b = (:>) a b
 -- <---- keyword.other.data.haskell
 --    ^^ storage.type.operator.haskell
---               ^^ constant.other.operator.haskell
+--               ^^ constant.other.operator.prefix.haskell
 
 data a :< b = a :< b
 -- <---- keyword.other.data.haskell
 --     ^^ storage.type.operator.infix.haskell
---              ^^ constant.other.operator.haskell
+--              ^^ constant.other.operator.infix.haskell
 --     ^^       ^^ - keyword.operator.haskell
+--     ^^       ^^ - keyword.operator.infix.haskell
 
 data a := b = a := b
 -- <---- keyword.other.data.haskell
 --     ^^ storage.type.operator.infix.haskell
---              ^^ constant.other.operator.haskell
+--              ^^ constant.other.operator.infix.haskell
 --     ^^       ^^ - keyword.operator.haskell
+--     ^^       ^^ - keyword.operator.infix.haskell
 
 data (:<>) a b where
 -- <---- keyword.other.data.haskell
   (:<>) :: a -> b -> (:<>) a b
--- ^^^ constant.other.operator.haskell
+-- ^^^ constant.other.operator.prefix.haskell
 --                    ^^^ storage.type.operator.haskell
 
 data a :>< b where
diff --git a/test/tickets/T0161.hs b/test/tickets/T0161.hs
@@ -3,7 +3,7 @@
     data Foo a = (:>) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a  
 --  ^^^^ keyword.other.data.haskell 
 --             ^ keyword.operator.eq.haskell
---                ^^ constant.other.operator.haskell
+--                ^^ constant.other.operator.prefix.haskell
 --           ^        ^ ^ ^                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             ^ ^ ^ variable.other.generic-type.haskell
 
     data Foo a = (:>) `C` ( S, O ) deriving ( Show, Ord )
@@ -12,14 +12,14 @@
 --             ^ keyword.operator.eq.haskell
 --                ^^ storage.type.operator.haskell
 --                ^^ - constant.other.operator.haskell
---                     ^ constant.other.haskell
+--                     ^ constant.other.infix.haskell
 --                                 ^^^^^^^^ keyword.other.deriving.haskell
 --       ^^^                ^  ^              ^^^^  ^^^ storage.type.haskell
 
     data Foo a = (:>) Bar a deriving ( Show, Ord )
 --  ^^^^ keyword.other.data.haskell 
 --             ^ keyword.operator.eq.haskell
---                ^^ constant.other.operator.haskell
+--                ^^ constant.other.operator.prefix.haskell
 --           ^            ^ variable.other.generic-type.haskell
 --                          ^^^^^^^^ keyword.other.deriving.haskell
 --       ^^^          ^^^              ^^^^  ^^^ storage.type.haskell
