[Git Config] Some scope tweaks (sublimehq#4171)

* [Git Config] Simplify section scopes

This commit simplifies `meta.section` scopes by.

1. removing `meta.section.body` from key-value pairs, which also covered
   section headers illegally
2. strip `.header` sub scope.

As a result, only lines with `[section "subsection"]` are scoped
meta.section.git.config, which is also true for INI and TOML.

* [Git Config] Tweak key scopes

This commit applies `meta.mapping.key string.unquoted` to keys.

* [Git Config] Scope whole line meta.section

This commit ensures to also scope leading whitespace meta.section,
so possibly applied background color covers full width of a view.

* [Git Config] Fix brackets punctuation scope

This commit uses punctuation.section.brackets
according to scope naming guidelines.

* [Git Formats] Fix symbol list

---------

Co-authored-by: deathaxe <[email protected]>

Author: deathaxe

Git Formats/Git Config - Fold.tmPreferences

@@ -9,9 +9,9 @@
         <array>
             <dict>
                 <key>begin</key>
-                <string>meta.section meta.brackets punctuation.definition.brackets.end</string>
+                <string>meta.section meta.brackets punctuation.section.brackets.end</string>
                 <key>end</key>
-                <string>meta.section meta.brackets punctuation.definition.brackets.begin</string>
+                <string>meta.section meta.brackets punctuation.section.brackets.begin</string>
                 <key>excludeTrailingNewlines</key>
                 <true/>
             </dict>

Git Formats/Git Config - Symbol List.tmPreferences

@@ -4,7 +4,7 @@
 	<key>name</key>
 	<string>Symbol List</string>
 	<key>scope</key>
-	<string>meta.section.header.git.config meta.brackets.git.config</string>
+	<string>meta.section.git.config meta.brackets.git.config</string>
 	<key>settings</key>
 	<dict>
 		<key>showInSymbolList</key>

Git Formats/Git Config.sublime-syntax

@@ -17,7 +17,7 @@ hidden_file_extensions:
 first_line_match: ^\[core\]  # .git/config files always start with [core]
 
 variables:
-  variable_name: '[a-zA-Z][\w-]*'
+  key_name: '[a-zA-Z][\w-]*'
   zero_to_255: 25[0-5]|2[0-4][0-9]|1\d\d|[1-9][0-9]|[0-9]
 
 contexts:
@@ -33,20 +33,20 @@ contexts:
     # Note that this does not match [color] (without the subsection). This is
     # because [color] doesn't actually take color values.
     - match: ^\s*(?=\[\s*color\s+\")
-      push: [key-color-pair, section-header]
+      push: [key-color-pair, section-header-meta, section-header]
     # section-other matches all sections except [color "subsection"].
     - match: ^\s*(?=\[)
-      push: [key-value-pair, section-header]
+      push: [key-value-pair, section-header-meta, section-header]
 
 ###[ SECTION HEADERS ]#########################################################
 
   section-header:
     - match: \[
-      scope: punctuation.definition.brackets.begin.git.config
-      set: [section-header-meta, section-header-end, section-name]
+      scope: punctuation.section.brackets.begin.git.config
+      set: [section-header-end, section-name]
 
   section-header-meta:
-    - meta_scope: meta.section.header.git.config
+    - meta_scope: meta.section.git.config
     - match: $\n?
       pop: 1
     - match: \S
@@ -55,7 +55,7 @@ contexts:
   section-header-end:
     - meta_scope: meta.brackets.git.config
     - match: \]
-      scope: punctuation.definition.brackets.end.git.config
+      scope: punctuation.section.brackets.end.git.config
       pop: 1
     - include: illegal-line-end-pop
     - match: \S
@@ -115,11 +115,10 @@ contexts:
   # changed = red
   # untracked = bold green
   key-color-pair:
-    - meta_scope: meta.section.body.git.config
-    - match: ^(\s*)({{variable_name}})(\s*(\=)\s*)
+    - match: ^(\s*)({{key_name}})(\s*(=)\s*)
       captures:
         1: meta.mapping.git.config
-        2: meta.mapping.key.git.config variable.other.readwrite.git.config
+        2: meta.mapping.key.git.config string.unquoted.git.config
         3: meta.mapping.git.config
         4: punctuation.separator.key-value.git.config
       push:
@@ -130,11 +129,10 @@ contexts:
 
   # key = val
   key-value-pair:
-    - meta_scope: meta.section.body.git.config
-    - match: ^(\s*)({{variable_name}})(\s*(\=)\s*)
+    - match: ^(\s*)({{key_name}})(\s*(=)\s*)
       captures:
         1: meta.mapping.git.config
-        2: meta.mapping.key.git.config variable.other.readwrite.git.config
+        2: meta.mapping.key.git.config string.unquoted.git.config
         3: meta.mapping.git.config
         4: punctuation.separator.key-value.git.config
       push: