Set 'keyword.' scope for codetags; limit set to NOTE|XXX|HACK|FIXME|BUG|TODO

Yury Selivanov · Yury Selivanov · commit c7447fea09f5 · 2015-10-17T01:36:22.000-04:00
diff --git a/grammars/MagicPython.YAML-tmLanguage b/grammars/MagicPython.YAML-tmLanguage
@@ -73,9 +73,9 @@ repository:
       '1': {name: punctuation.definition.comment.python}
     end: ($)
     patterns:
-      - match: (?:\b(BUG|FIXME|TODO|XXX|NB)\b)
+      - match: (?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)
         captures:
-          '1': {name: comment.line.note.notation.python}
+          '1': {name: keyword.comment.line.note.notation.python}
 
   statement:
     patterns:
@@ -169,9 +169,9 @@ repository:
         captures:
           '1': {name: keyword.control.flow.python}
 
-      - match: (?:\b(BUG|FIXME|TODO|XXX|NB)\b)
+      - match: (?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)
         captures:
-          '1': {name: string.quoted.docstring.note.python}
+          '1': {name: keyword.string.quoted.docstring.note.python}
 
 
   statement-keyword:
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -32,10 +32,10 @@ repository:
     end: "($)"
     patterns: [
       {
-        match: "(?:\\b(BUG|FIXME|TODO|XXX|NB)\\b)"
+        match: "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
         captures:
           "1":
-            name: "comment.line.note.notation.python"
+            name: "keyword.comment.line.note.notation.python"
       }
     ]
   statement:
@@ -195,10 +195,10 @@ repository:
             name: "keyword.control.flow.python"
       }
       {
-        match: "(?:\\b(BUG|FIXME|TODO|XXX|NB)\\b)"
+        match: "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
         captures:
           "1":
-            name: "string.quoted.docstring.note.python"
+            name: "keyword.string.quoted.docstring.note.python"
       }
     ]
   "statement-keyword":
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -56,13 +56,13 @@
         <array>
           <dict>
             <key>match</key>
-            <string>(?:\b(BUG|FIXME|TODO|XXX|NB)\b)</string>
+            <string>(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)</string>
             <key>captures</key>
             <dict>
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>comment.line.note.notation.python</string>
+                <string>keyword.comment.line.note.notation.python</string>
               </dict>
             </dict>
           </dict>
@@ -335,13 +335,13 @@
           </dict>
           <dict>
             <key>match</key>
-            <string>(?:\b(BUG|FIXME|TODO|XXX|NB)\b)</string>
+            <string>(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)</string>
             <key>captures</key>
             <dict>
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>string.quoted.docstring.note.python</string>
+                <string>keyword.string.quoted.docstring.note.python</string>
               </dict>
             </dict>
           </dict>
diff --git a/test/comments/comment1.py b/test/comments/comment1.py
@@ -1,29 +1,31 @@
 # XXX foo
 # FIXME: bug
 # NB: XXXx xXXX but XXX!
-# also NB highlight XXX and FIXME.
+# ALSO HACK and NOTE and TODO highlight XXX and FIXME.
 
 
 
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
               : comment.line.number-sign.python, source.python
-XXX           : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+XXX           : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
  foo          : comment.line.number-sign.python, source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
               : comment.line.number-sign.python, source.python
-FIXME         : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+FIXME         : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
 : bug         : comment.line.number-sign.python, source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
-              : comment.line.number-sign.python, source.python
-NB            : comment.line.note.notation.python, comment.line.number-sign.python, source.python
-: XXXx xXXX but  : comment.line.number-sign.python, source.python
-XXX           : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+ NB: XXXx xXXX but  : comment.line.number-sign.python, source.python
+XXX           : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
 !             : comment.line.number-sign.python, source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
- also         : comment.line.number-sign.python, source.python
-NB            : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+ ALSO         : comment.line.number-sign.python, source.python
+HACK          : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
+ and          : comment.line.number-sign.python, source.python
+NOTE          : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
+ and          : comment.line.number-sign.python, source.python
+TODO          : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
  highlight    : comment.line.number-sign.python, source.python
-XXX           : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+XXX           : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
  and          : comment.line.number-sign.python, source.python
-FIXME         : comment.line.note.notation.python, comment.line.number-sign.python, source.python
+FIXME         : comment.line.number-sign.python, keyword.comment.line.note.notation.python, source.python
 .             : comment.line.number-sign.python, source.python
diff --git a/test/docstrings/note1.py b/test/docstrings/note1.py
@@ -4,9 +4,10 @@ def foo():
     ''' foo FIXME baz '''
 
 
+
 '''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
  foo bar      : source.python, string.quoted.docstring.python
-XXX           : source.python, string.quoted.docstring.note.python, string.quoted.docstring.python
+XXX           : keyword.string.quoted.docstring.note.python, source.python, string.quoted.docstring.python
  baz          : source.python, string.quoted.docstring.python
 '''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
               : source.python
@@ -19,6 +20,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 '''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
  foo          : source.python, string.quoted.docstring.python
-FIXME         : source.python, string.quoted.docstring.note.python, string.quoted.docstring.python
+FIXME         : keyword.string.quoted.docstring.note.python, source.python, string.quoted.docstring.python
  baz          : source.python, string.quoted.docstring.python
 '''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ repository:`
`32`	`32`	`end: "($)"`
`33`	`33`	`patterns: [`
`34`	`34`	`{`
`35`		`- match: "(?:\\b(BUG\|FIXME\|TODO\|XXX\|NB)\\b)"`
	`35`	`+ match: "(?:\\b(NOTE\|XXX\|HACK\|FIXME\|BUG\|TODO)\\b)"`
`36`	`36`	`captures:`
`37`	`37`	`"1":`
`38`		`- name: "comment.line.note.notation.python"`
	`38`	`+ name: "keyword.comment.line.note.notation.python"`
`39`	`39`	`}`
`40`	`40`	`]`
`41`	`41`	`statement:`
`@@ -195,10 +195,10 @@ repository:`
`195`	`195`	`name: "keyword.control.flow.python"`
`196`	`196`	`}`
`197`	`197`	`{`
`198`		`- match: "(?:\\b(BUG\|FIXME\|TODO\|XXX\|NB)\\b)"`
	`198`	`+ match: "(?:\\b(NOTE\|XXX\|HACK\|FIXME\|BUG\|TODO)\\b)"`
`199`	`199`	`captures:`
`200`	`200`	`"1":`
`201`		`- name: "string.quoted.docstring.note.python"`
	`201`	`+ name: "keyword.string.quoted.docstring.note.python"`
`202`	`202`	`}`
`203`	`203`	`]`
`204`	`204`	`"statement-keyword":`