BUG: two header after one another is incorrect in symbol list

aziz · Feb 22, 2015 · 92c7331 · 92c7331
1 parent fffcf5e
commit 92c7331
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 15 deletions.
diff --git a/Note.tmLanguage b/Note.tmLanguage
@@ -1427,9 +1427,9 @@
     <key>heading1</key>
     <dict>
       <key>begin</key>
-      <string>\G(#{1})(?!#)\s*(?=\S)</string>
+      <string>\G(#{1})(?!#)[ \t]*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)\n?$</string>
       <key>captures</key>
       <dict>
         <key>1</key>
@@ -1455,7 +1455,7 @@
       <key>begin</key>
       <string>\G(#{2})(?!#)\s*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)$\n?</string>
       <key>captures</key>
       <dict>
         <key>1</key>
@@ -1481,7 +1481,7 @@
       <key>begin</key>
       <string>\G(#{3})(?!#)\s*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)$\n?</string>
       <key>captures</key>
       <dict>
         <key>1</key>
@@ -1507,7 +1507,7 @@
       <key>begin</key>
       <string>\G(#{4})(?!#)\s*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)$\n?</string>
       <key>captures</key>
       <dict>
         <key>1</key>
@@ -1533,7 +1533,7 @@
       <key>begin</key>
       <string>\G(#{5})(?!#)\s*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)$\n?</string>
       <key>captures</key>
       <dict>
         <key>1</key>
@@ -1559,7 +1559,7 @@
       <key>begin</key>
       <string>\G(#{6})(?!#)\s*(?=\S)</string>
       <key>end</key>
-      <string>\s*(#*)$\n?</string>
+      <string>[ \t]*(#*)$\n?</string>
       <key>captures</key>
       <dict>
         <key>1</key>

diff --git a/Symbol List - Heading.tmPreferences → Symbol List - Heading1.tmPreferences b/Symbol List - Heading.tmPreferences → Symbol List - Heading1.tmPreferences
@@ -5,7 +5,7 @@
   <key>name</key>
   <string>Symbol List</string>
   <key>scope</key>
-  <string>text.html.markdown.note markup.heading</string>
+  <string>text.html.markdown.note markup.heading.1 entity.name</string>
   <key>settings</key>
   <dict>
     <key>showInSymbolList</key>
@@ -17,19 +17,12 @@
       s/:[^ ]+://g; # remove tags
       s/\s*#+\s*$//g;
       s/^\s*#(#*)\s*/$1/g;
-      s/^#{5}/                                   /g;
-      s/^#{4}/                            /g;
-      s/^#{3}/                     /g;
-      s/^#{2}/              /g;
-      s/^#{1}/       /g;
       s/^(-+)\s*$/       $1/
     </string>
     <key>symbolIndexTransformation</key>
     <string>
       s/\s*#+\s*$//g;
     </string>
   </dict>
-  <key>uuid</key>
-  <string>0957d739-b2ba-43fe-85d5-fee7e35ff136</string>
 </dict>
 </plist>
diff --git a/Symbol List - Heading2.tmPreferences b/Symbol List - Heading2.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Symbol List</string>
+  <key>scope</key>
+  <string>text.html.markdown.note markup.heading.2 entity.name</string>
+  <key>settings</key>
+  <dict>
+    <key>showInSymbolList</key>
+    <integer>1</integer>
+    <key>showInIndexedSymbolList</key>
+    <integer>1</integer>
+    <key>symbolTransformation</key>
+    <string>
+      s/:[^ ]+://g; # remove tags
+      s/\s*#+\s*$//g;
+      s/^\s*#(#*)\s*/$1/g;
+      s/^/    /g;
+    </string>
+    <key>symbolIndexTransformation</key>
+    <string>
+      s/\s*#+\s*$//g;
+    </string>
+  </dict>
+</dict>
+</plist>
diff --git a/Symbol List - Heading3.tmPreferences b/Symbol List - Heading3.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Symbol List</string>
+  <key>scope</key>
+  <string>text.html.markdown.note markup.heading.3 entity.name</string>
+  <key>settings</key>
+  <dict>
+    <key>showInSymbolList</key>
+    <integer>1</integer>
+    <key>showInIndexedSymbolList</key>
+    <integer>1</integer>
+    <key>symbolTransformation</key>
+    <string>
+      s/:[^ ]+://g; # remove tags
+      s/\s*#+\s*$//g;
+      s/^\s*#(#*)\s*/$1/g;
+      s/^/        /g;
+    </string>
+    <key>symbolIndexTransformation</key>
+    <string>
+      s/\s*#+\s*$//g;
+    </string>
+  </dict>
+</dict>
+</plist>
diff --git a/Symbol List - Heading4.tmPreferences b/Symbol List - Heading4.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Symbol List</string>
+  <key>scope</key>
+  <string>text.html.markdown.note markup.heading.4 entity.name</string>
+  <key>settings</key>
+  <dict>
+    <key>showInSymbolList</key>
+    <integer>1</integer>
+    <key>showInIndexedSymbolList</key>
+    <integer>1</integer>
+    <key>symbolTransformation</key>
+    <string>
+      s/:[^ ]+://g; # remove tags
+      s/\s*#+\s*$//g;
+      s/^\s*#(#*)\s*/$1/g;
+      s/^/            /g;
+    </string>
+    <key>symbolIndexTransformation</key>
+    <string>
+      s/\s*#+\s*$//g;
+    </string>
+  </dict>
+</dict>
+</plist>
diff --git a/Symbol List - Heading5.tmPreferences b/Symbol List - Heading5.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Symbol List</string>
+  <key>scope</key>
+  <string>text.html.markdown.note markup.heading.5 entity.name</string>
+  <key>settings</key>
+  <dict>
+    <key>showInSymbolList</key>
+    <integer>1</integer>
+    <key>showInIndexedSymbolList</key>
+    <integer>1</integer>
+    <key>symbolTransformation</key>
+    <string>
+      s/:[^ ]+://g; # remove tags
+      s/\s*#+\s*$//g;
+      s/^\s*#(#*)\s*/$1/g;
+      s/^/                /g;
+    </string>
+    <key>symbolIndexTransformation</key>
+    <string>
+      s/\s*#+\s*$//g;
+    </string>
+  </dict>
+</dict>
+</plist>
diff --git a/Symbol List - Heading6.tmPreferences b/Symbol List - Heading6.tmPreferences
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>name</key>
+  <string>Symbol List</string>
+  <key>scope</key>
+  <string>text.html.markdown.note markup.heading.6 entity.name</string>
+  <key>settings</key>
+  <dict>
+    <key>showInSymbolList</key>
+    <integer>1</integer>
+    <key>showInIndexedSymbolList</key>
+    <integer>1</integer>
+    <key>symbolTransformation</key>
+    <string>
+      s/:[^ ]+://g; # remove tags
+      s/\s*#+\s*$//g;
+      s/^\s*#(#*)\s*/$1/g;
+      s/^/                    /g;
+    </string>
+    <key>symbolIndexTransformation</key>
+    <string>
+      s/\s*#+\s*$//g;
+    </string>
+  </dict>
+</dict>
+</plist>