[Haskell] Tweak Cabal Symbol List

Use `meta.toc-list` to add section headers to local symbol lists and make both the section kind and name available for Goto Symbol.
sublimehq · Jan 2, 2021 · f06be56 · f06be56
1 parent 0aedb3a
commit f06be56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/Haskell/Cabal Symbol List - Sections.tmPreferences b/Haskell/Cabal Symbol List - Sections.tmPreferences
diff --git a/...ll/Cabal Symbol List - Keys.tmPreferences → Haskell/Cabal Symbol List.tmPreferences b/...ll/Cabal Symbol List - Keys.tmPreferences → Haskell/Cabal Symbol List.tmPreferences
diff --git a/Haskell/Cabal.sublime-syntax b/Haskell/Cabal.sublime-syntax
@@ -276,10 +276,11 @@ contexts:
 ###[ KEYWORDS AND OPERATORS ]##################################################
 
   keywords:
-    - match: ^({{section_tags}})(?:\s+([^\s,]+))?\s*$
+    - match: ^(({{section_tags}})(?:\s+([^\s,]+))?)\s*$
       captures:
-        1: keyword.declaration.section.cabal
-        2: entity.name.section.cabal
+        1: meta.toc-list.sections.cabal
+        2: keyword.declaration.section.cabal
+        3: entity.name.section.cabal
     - match: (if|else)\b
       scope: keyword.control.conditional.cabal
 

diff --git a/Haskell/syntax_test_cabal.cabal b/Haskell/syntax_test_cabal.cabal
@@ -216,11 +216,12 @@ build-depends:  pandoc,
 --                                    ^ punctuation.separator.sequence.cabal
 
 executable
--- <- keyword.declaration.section.cabal
--- ^^^^^^^ keyword.declaration.section.cabal
+-- <- meta.toc-list.sections.cabal keyword.declaration.section.cabal
+-- ^^^^^^^ meta.toc-list.sections.cabal keyword.declaration.section.cabal
 
 executable pandoc
--- <- keyword.declaration.section.cabal
+-- <- meta.toc-list.sections.cabal keyword.declaration.section.cabal
+-- ^^^^^^^^^^^^^^^ meta.toc-list.sections.cabal
 -- ^^^^^^^ keyword.declaration.section.cabal
 --         ^^^^^^ entity.name.section.cabal