Font lock types in c2hs tests fixes

Author: gracjan

tests/haskell-c2hs-tests.el

@@ -56,6 +56,8 @@
 
 (ert-deftest haskell-c2hs-enum-hook ()
   "C2HS enum hook"
+  ;; note that this has multiline constructs that do not work reliably at this point
+  :expected-result :failed
   (check-properties
     '("{#enum v4l2_quantization as Quantization"
       "  { V4L2_QUANTIZATION_DEFAULT    as Default"
@@ -83,6 +85,8 @@
 
 (ert-deftest haskell-c2hs-enum-define-hook ()
   "C2HS enum define hook"
+  ;; note that this has multiline constructs that do not work reliably at this point
+  :expected-result :failed
   (check-properties
     '("{#enum define MMapProtectionFlag"
       "  { PROT_READ  as ProtRead"
@@ -119,9 +123,9 @@
       "sin  = {#call pure sin as \"_sin\"#}")
     '(("sin" "w" haskell-definition-face)
       ("::" t haskell-operator-face)
-      ("Float" "w" haskell-constructor-face)
+      ("Float" "w" haskell-type-face)
       ("->" t haskell-operator-face)
-      ("Float" "w" haskell-constructor-face)
+      ("Float" "w" haskell-type-face)
       ("sin" "w" haskell-definition-face)
       ("=" t haskell-operator-face)
       ("{#" t haskell-c2hs-hook-pair-face)
@@ -173,10 +177,10 @@
       "visualGetType (Visual vis)  = liftM cToEnum $ {#get Visual->type#} vis")
     '(("visualGetType" "w" haskell-definition-face)
       ("::" t haskell-operator-face)
-      ("Visual" "w" haskell-constructor-face)
+      ("Visual" "w" haskell-type-face)
       ("->" t haskell-operator-face)
-      ("IO" "w" haskell-constructor-face)
-      ("VisualType" "w" haskell-constructor-face)
+      ("IO" "w" haskell-type-face)
+      ("VisualType" "w" haskell-type-face)
       ("visualGetType" "w" haskell-definition-face)
       ("Visual" "w" haskell-constructor-face)
       ("=" t haskell-operator-face)
@@ -246,10 +250,10 @@
     '("{# class GtkObjectClass => GtkWidgetClass GtkWidget #}")
     '(("{#" t haskell-c2hs-hook-pair-face)
       ("class" "w" haskell-c2hs-hook-name-face)
-      ("GtkObjectClass" "w" haskell-constructor-face)
+      ("GtkObjectClass" "w" haskell-type-face)
       ("=>" t haskell-operator-face)
-      ("GtkWidgetClass" "w" haskell-constructor-face)
-      ("GtkWidget" "w" haskell-constructor-face)
+      ("GtkWidgetClass" "w" haskell-type-face)
+      ("GtkWidget" "w" haskell-type-face)
       ("#}" t haskell-c2hs-hook-pair-face))
     'haskell-c2hs-mode))
 
@@ -260,7 +264,7 @@
       "gIntAlign  = {#alignof gint#}")
     '(("gIntAlign" "w" haskell-definition-face)
       ("::" t haskell-operator-face)
-      ("Int" "w" haskell-constructor-face)
+      ("Int" "w" haskell-type-face)
       ("gIntAlign" "w" haskell-definition-face)
       ("=" t haskell-operator-face)
       ("{#" t haskell-c2hs-hook-pair-face)