From f06be561bd654e5846c2e6d567972540461fd27e Mon Sep 17 00:00:00 2001
From: DeathAxe <deathaxe82@googlemail.com>
Date: Sat, 2 Jan 2021 22:16:05 +0100
Subject: [PATCH] [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.
---
 Haskell/Cabal Symbol List - Sections.tmPreferences | 14 --------------
 ...Preferences => Cabal Symbol List.tmPreferences} |  0
 Haskell/Cabal.sublime-syntax                       |  7 ++++---
 Haskell/syntax_test_cabal.cabal                    |  7 ++++---
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 Haskell/Cabal Symbol List - Sections.tmPreferences
 rename Haskell/{Cabal Symbol List - Keys.tmPreferences => Cabal Symbol List.tmPreferences} (100%)

diff --git a/Haskell/Cabal Symbol List - Sections.tmPreferences b/Haskell/Cabal Symbol List - Sections.tmPreferences
deleted file mode 100644
index bc4d146bcd4..00000000000
--- a/Haskell/Cabal Symbol List - Sections.tmPreferences	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="1.0">
-<dict>
-	<key>scope</key>
-	<string>source.cabal entity.name.section</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>1</string>
-		<key>symbolTransformation</key>
-		<string>/.+/[ $0 ]/g</string>
-	</dict>
-</dict>
-</plist>
diff --git a/Haskell/Cabal Symbol List - Keys.tmPreferences b/Haskell/Cabal Symbol List.tmPreferences
similarity index 100%
rename from Haskell/Cabal Symbol List - Keys.tmPreferences
rename to Haskell/Cabal Symbol List.tmPreferences
diff --git a/Haskell/Cabal.sublime-syntax b/Haskell/Cabal.sublime-syntax
index 777a56ccab8..2a4e49edd61 100644
--- 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
index 546551569f0..2c5b6834996 100644
--- 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