Merge pull request #1252 from gracjan/pr-use-default-face-in-qq

Use default face in quasi quotes

Author: gracjan

haskell-font-lock.el

@@ -439,8 +439,12 @@ like ::, class, instance, data, newtype, type."
       (while (setq next (next-single-property-change pos 'face))
         (put-text-property
          (+ start (1- pos)) (1- (+ start next)) 'face
-         (get-text-property pos 'face) org-buffer)
-        (setq pos next)))
+         (or (get-text-property pos 'face) 'default) org-buffer)
+        (setq pos next))
+      (unless (equal pos (point-max))
+        (put-text-property
+         (+ start (1- pos)) (1- (+ start (point-max))) 'face
+         'default org-buffer)))
     (add-text-properties
      start end
      '(font-lock-fontified t fontified t font-lock-multiline t))

tests/haskell-font-lock-tests.el

@@ -371,19 +371,18 @@
   (check-properties
    '("sql = [sql| SELECT title FROM books; |]")
    '(("SELECT" t font-lock-keyword-face)
-     ("title" t nil)
+     ("title" t default)
      ("FROM" t font-lock-keyword-face)
-     ("books" t nil))))
+     ("books" t default))))
 
 (ert-deftest haskell-syntactic-test-quasiquoter-sql-2 ()
   "Embedded SQL statements"
-  :expected-result :failed
   ;; for now we have this problem that connstructor faces are used,
   ;; org-mode knows how to get around this problem
   (check-properties
    '("sql = [sql| SELECT Title FROM Books; |]")
-   '(("Title" t nil)
-     ("Books" t nil))))
+   '(("Title" t default)
+     ("Books" t default))))
 
 
 (ert-deftest haskell-syntactic-test-special-not-redefined ()