From a3e99a01afe9b7e703ec90807476fac1949f08a8 Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Fri, 28 Sep 2018 19:18:36 -0700 Subject: [PATCH] bugfixes and failing tests --- Haskell.sublime-syntax | 9 +++++---- syntax_test_haskell.hs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Haskell.sublime-syntax b/Haskell.sublime-syntax index 482f8e1..dd8060d 100644 --- a/Haskell.sublime-syntax +++ b/Haskell.sublime-syntax @@ -99,7 +99,7 @@ contexts: scope: constant.numeric.haskell - match: '\b([0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\b' scope: constant.numeric.haskell - - match: '^\s*(#)\s*\w+' + - match: '^(#)\s*\w+' comment: In addition to Haskell's "native" syntax, GHC permits the C preprocessor to be run on a source file. scope: meta.preprocessor.c captures: @@ -227,13 +227,14 @@ contexts: module_exports: - match: '\(' push: + - meta_scope: meta.declaration.exports.haskell - include: comments - match: '\b({{type_id}})(\(.[^\)]*\)|)' captures: 1: storage.type.haskell - - match: '{{op_id}}' - scope: keyword.operator.haskell - - meta_scope: meta.declaration.exports.haskell + - match: '\(({{op_id}})\)' + captures: + 1: keyword.operator.haskell - match: '\)' pop: true module_name: diff --git a/syntax_test_haskell.hs b/syntax_test_haskell.hs index af6b631..2655603 100644 --- a/syntax_test_haskell.hs +++ b/syntax_test_haskell.hs @@ -8,9 +8,9 @@ module Main ( Fooable(..), DeriveMoreThanOne, main, - addEmUp, (-->), (+:), + addEmUp, ) where import Prelude hiding (Traversable(traverse, sequenceA))