From c48c1f321c0d858bc8bcd026922aa76754cfafc3 Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Thu, 11 Jun 2015 21:36:14 +0200
Subject: [PATCH 1/6] Fix edge cases of if/when hl. Fix generic proc hl.

---
 Syntaxes/Nim.YAML-tmLanguage |  46 +++++++++++++++-
 Syntaxes/Nim.tmLanguage      | 101 ++++++++++++++++++++++++++++++++++-
 2 files changed, 144 insertions(+), 3 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index 85aadec..d66d375 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -60,14 +60,15 @@ patterns:
 - comment: A nim procedure or method declaration
   name: meta.proc.nim
   patterns:
-  - begin: (?<![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+(\`([^\s\`]+)\`|([\w\x{80}-\x{10FFFF}]+))(\*)?(\(.*\))?(\:[^={]+)?
+  - begin: (?<![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?(\[[^\]]+?\])?(\(.*\))?(\:[^={]+)?
     end: (\=)
     beginCaptures:
       '1': {name: storage.type.proc.nim}
       '2': {name: entity.name.function.nim}
       '5': {name: keyword.secondary.operator.kw-public.nim}
       '6': {name: variable.parameter.nim}
-      '7': {name: storage.type.generic.nim}
+      '7': {name: variable.parameter.nim}
+      '8': {name: storage.type.generic.nim}
 
     endCaptures:
       '1': {name: keyword.secondary.operator.nim}
@@ -147,6 +148,7 @@ patterns:
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
+    - include: '#eat_numbers'
     - include: '#eat_strings'
 
 - comment: Primary branching keyword 'case'
@@ -167,6 +169,7 @@ patterns:
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
+    - include: '#eat_numbers'
     - include: '#eat_strings'
 
 - comment: Keywords that affect program control flow or scope.
@@ -558,6 +561,45 @@ patterns:
 
 
 repository:
+  eat_numbers:
+    patterns:
+    - include: '#eat_float_literal'
+    - include: '#eat_hex_literal'
+    - include: '#eat_oct_literal'
+    - include: '#eat_dig_literal'
+    - include: '#eat_int_literal'
+
+  eat_float_literal:
+    patterns:
+    - comment: A float literal
+      #name: constant.numeric.float.decimal.nim
+      match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?   #' highlight-flaw-fixer-comment
+
+  eat_hex_literal:
+    patterns:
+    - comment: A hexadecimal literal
+      #name: constant.numeric.integer.hexadecimal.nim
+      match: (?<![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+
+  eat_oct_literal:
+    patterns:
+    - comment: A base-8 integer literal
+      #name: constant.numeric.integer.octal.nim
+      match: (?<![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+
+  eat_dig_literal:
+    patterns:
+    - comment: A base-2 integer literal
+      #name: constant.numeric.integer.binary.nim
+      match: (?<![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+
+  eat_int_literal:
+    patterns:
+    - comment: A base-10 integer literal
+      #name: constant.numeric.integer.decimal.nim
+      match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+
+
   eat_strings:
     patterns:
     - include: '#eat_double_string'
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index 00dab59..81cc9ef 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -171,7 +171,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+(\`([^\s\`]+)\`|([\w\x{80}-\x{10FFFF}]+))(\*)?(\(.*\))?(\:[^={]+)?</string>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?(\[[^\]]+?\])?(\(.*\))?(\:[^={]+)?</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -195,6 +195,11 @@
 							<string>variable.parameter.nim</string>
 						</dict>
 						<key>7</key>
+						<dict>
+							<key>name</key>
+							<string>variable.parameter.nim</string>
+						</dict>
+						<key>8</key>
 						<dict>
 							<key>name</key>
 							<string>storage.type.generic.nim</string>
@@ -401,6 +406,10 @@
 			<string>control.variable.parameter.nim</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#eat_numbers</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#eat_strings</string>
@@ -460,6 +469,10 @@
 			<string>control.variable.parameter.nim</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#eat_numbers</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#eat_strings</string>
@@ -1720,6 +1733,18 @@
 	</array>
 	<key>repository</key>
 	<dict>
+		<key>eat_dig_literal</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>comment</key>
+					<string>A base-2 integer literal</string>
+					<key>match</key>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+				</dict>
+			</array>
+		</dict>
 		<key>eat_double_string</key>
 		<dict>
 			<key>patterns</key>
@@ -1801,6 +1826,80 @@
 				</dict>
 			</array>
 		</dict>
+		<key>eat_float_literal</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>comment</key>
+					<string>A float literal</string>
+					<key>match</key>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?</string>
+				</dict>
+			</array>
+		</dict>
+		<key>eat_hex_literal</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>comment</key>
+					<string>A hexadecimal literal</string>
+					<key>match</key>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+				</dict>
+			</array>
+		</dict>
+		<key>eat_int_literal</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>comment</key>
+					<string>A base-10 integer literal</string>
+					<key>match</key>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+				</dict>
+			</array>
+		</dict>
+		<key>eat_numbers</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#eat_float_literal</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#eat_hex_literal</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#eat_oct_literal</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#eat_dig_literal</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#eat_int_literal</string>
+				</dict>
+			</array>
+		</dict>
+		<key>eat_oct_literal</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>comment</key>
+					<string>A base-8 integer literal</string>
+					<key>match</key>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+				</dict>
+			</array>
+		</dict>
 		<key>eat_single_string</key>
 		<dict>
 			<key>patterns</key>

From 2c4ee09b921c66e2376e38cc1194669a86db1297 Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Sun, 14 Jun 2015 03:13:57 +0200
Subject: [PATCH 2/6] Fix highlighting bugs, new and old.

---
 Syntaxes/Nim.YAML-tmLanguage | 121 +++-------------
 Syntaxes/Nim.tmLanguage      | 272 +++--------------------------------
 2 files changed, 42 insertions(+), 351 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index d66d375..b0b5876 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -60,15 +60,12 @@ patterns:
 - comment: A nim procedure or method declaration
   name: meta.proc.nim
   patterns:
-  - begin: (?<![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?(\[[^\]]+?\])?(\(.*\))?(\:[^={]+)?
+  - begin: (?<![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?
     end: (\=)
     beginCaptures:
       '1': {name: storage.type.proc.nim}
       '2': {name: entity.name.function.nim}
       '5': {name: keyword.secondary.operator.kw-public.nim}
-      '6': {name: variable.parameter.nim}
-      '7': {name: variable.parameter.nim}
-      '8': {name: storage.type.generic.nim}
 
     endCaptures:
       '1': {name: keyword.secondary.operator.nim}
@@ -103,6 +100,7 @@ patterns:
 - comment: Pragmas
   begin: \{\.
   end: \.?\}
+  name: pragma
   patterns:
   - begin: \"
     end: \"
@@ -148,53 +146,52 @@ patterns:
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
-    - include: '#eat_numbers'
-    - include: '#eat_strings'
+  - {include: source.nim}
 
 - comment: Primary branching keyword 'case'
   name: control.variable.parameter.nim
   begin: \s+(case)\b
-  end: ($)
+  end: (?=of)
   captures:
     '1': {name: keyword.primary.control.nim}
   endCaptures:
     '1': {name: control.variable.parameter.nim}
+  patterns:
+  - {include: source.nim}
 
 - comment: Secondary branching keywords and their conditions
   name: control.variable.parameter.nim
-  begin: \s+(of|else|elif)\b    # (.*?)\b
+  begin: \s+(of|else|elif)\b
   end: (:)
   captures:
     '1': {name: keyword.secondary.control.nim}
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
-    - include: '#eat_numbers'
-    - include: '#eat_strings'
+  - {include: source.nim}
+
 
 - comment: Keywords that affect program control flow or scope.
-  name: keyword.primary.control.nim
-  #match: (?<![\w\x{80}-\x{10FFFF}])(block|break|case|continue|do|elif|else|end|except|finally|if|raise|return|try|when|while|yield)(?![\w\x{80}-\x{10FFFF}])
-  match: (?<![\w\x{80}-\x{10FFFF}])(block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])
+  name: keyword.primary.control
+  match: (?<![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])
 
 - comment: Keyword boolean operators for expressions.
   name: keyword.operator.boolean.nim
   match: ((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))
 
-
 - comment: Assign operator.
-  name: variable.primary.assign.hot.nim
+  name: variable.primary.assign.hot
   match: ((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\<\>\-\+\=~])
   captures:
-    '1': { name: keyword.secondary.nim }
-    '4': { name: variable.primary.assign.hot.nim }
-    '5': { name: variable.primary.assign.hotter.nim }
-    '6': { name: keyword.secondary.operator.kw-public.nim }
-    '7': { name: storage.type.generic.nim }
-    '8': { name: operator.primary.assign.hottest.nim }
+    '1': { name: keyword.secondary }
+    '4': { name: variable.primary.assign.hot }
+    '5': { name: variable.primary.assign.hotter }
+    '6': { name: keyword.secondary.operator.kw-public }
+    '7': { name: storage.type.generic }
+    '8': { name: keyword.primary.assign.hottest }
 
 - comment: Other keywords.
-  name: keyword.other.nim
+  name: keyword.other.secondary.nim
   match: ((?<![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))
 
 - comment: Generic operators for expressions.
@@ -559,87 +556,7 @@ patterns:
       name: keyword.secondary.operator.nim
     - {include: text.html.markdown.multimarkdown}
 
-
 repository:
-  eat_numbers:
-    patterns:
-    - include: '#eat_float_literal'
-    - include: '#eat_hex_literal'
-    - include: '#eat_oct_literal'
-    - include: '#eat_dig_literal'
-    - include: '#eat_int_literal'
-
-  eat_float_literal:
-    patterns:
-    - comment: A float literal
-      #name: constant.numeric.float.decimal.nim
-      match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?   #' highlight-flaw-fixer-comment
-
-  eat_hex_literal:
-    patterns:
-    - comment: A hexadecimal literal
-      #name: constant.numeric.integer.hexadecimal.nim
-      match: (?<![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
-
-  eat_oct_literal:
-    patterns:
-    - comment: A base-8 integer literal
-      #name: constant.numeric.integer.octal.nim
-      match: (?<![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
-
-  eat_dig_literal:
-    patterns:
-    - comment: A base-2 integer literal
-      #name: constant.numeric.integer.binary.nim
-      match: (?<![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
-
-  eat_int_literal:
-    patterns:
-    - comment: A base-10 integer literal
-      #name: constant.numeric.integer.decimal.nim
-      match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
-
-
-  eat_strings:
-    patterns:
-    - include: '#eat_double_string'
-    - include: '#eat_single_string'
-
-  eat_double_string:
-    patterns:
-    - begin: \"
-      end: \"
-      patterns:
-      - include: '#eat_escaped_char'
-
-  eat_single_string:
-    patterns:
-    - begin: \'
-      end: \'
-      patterns:
-      - name: invalid.illegal.character.nim
-        match: \\n
-      - include: '#eat_escaped_char'
-      - name: invalid.illegal.character.nim
-        match: ([^\']{2,}?)   #' highlight-flaw-fixer-comment
-
-  eat_escaped_char:
-    patterns:
-    - match: \\[nN]
-    - match: \\[cC]|\\[rR]
-    - match: \\[lL]
-    - match: \\[fF]
-    - match: \\[tT]
-    - match: \\[vV]
-    - match: \\\"
-    - match: \\'
-    - match: \\[0-9]+
-    - match: \\[aA]
-    - match: \\[bB]
-    - match: \\[eE]
-    - match: \\[xX]\h\h
-    - match: \\\\
-
   escaped_char:
     patterns:
     - name: constant.character.escape.newline.nim
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index 81cc9ef..5f1890a 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -171,7 +171,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?(\[[^\]]+?\])?(\(.*\))?(\:[^={]+)?</string>
+					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(proc|method|template|macro|iterator|converter)\s+((\`[^\s\`]+\`)|([\w\x{80}-\x{10FFFF}]+))(\*)?</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -189,21 +189,6 @@
 							<key>name</key>
 							<string>keyword.secondary.operator.kw-public.nim</string>
 						</dict>
-						<key>6</key>
-						<dict>
-							<key>name</key>
-							<string>variable.parameter.nim</string>
-						</dict>
-						<key>7</key>
-						<dict>
-							<key>name</key>
-							<string>variable.parameter.nim</string>
-						</dict>
-						<key>8</key>
-						<dict>
-							<key>name</key>
-							<string>storage.type.generic.nim</string>
-						</dict>
 					</dict>
 					<key>end</key>
 					<string>(\=)</string>
@@ -303,6 +288,8 @@
 			<string>Pragmas</string>
 			<key>end</key>
 			<string>\.?\}</string>
+			<key>name</key>
+			<string>pragma</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -408,11 +395,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#eat_numbers</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_strings</string>
+					<string>source.nim</string>
 				</dict>
 			</array>
 		</dict>
@@ -430,7 +413,7 @@
 			<key>comment</key>
 			<string>Primary branching keyword 'case'</string>
 			<key>end</key>
-			<string>($)</string>
+			<string>(?=of)</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -441,6 +424,13 @@
 			</dict>
 			<key>name</key>
 			<string>control.variable.parameter.nim</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>source.nim</string>
+				</dict>
+			</array>
 		</dict>
 		<dict>
 			<key>begin</key>
@@ -471,11 +461,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#eat_numbers</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_strings</string>
+					<string>source.nim</string>
 				</dict>
 			</array>
 		</dict>
@@ -483,9 +469,9 @@
 			<key>comment</key>
 			<string>Keywords that affect program control flow or scope.</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])</string>
+			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])</string>
 			<key>name</key>
-			<string>keyword.primary.control.nim</string>
+			<string>keyword.primary.control</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -501,32 +487,32 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.nim</string>
+					<string>keyword.secondary</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>variable.primary.assign.hot.nim</string>
+					<string>variable.primary.assign.hot</string>
 				</dict>
 				<key>5</key>
 				<dict>
 					<key>name</key>
-					<string>variable.primary.assign.hotter.nim</string>
+					<string>variable.primary.assign.hotter</string>
 				</dict>
 				<key>6</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.operator.kw-public.nim</string>
+					<string>keyword.secondary.operator.kw-public</string>
 				</dict>
 				<key>7</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.generic.nim</string>
+					<string>storage.type.generic</string>
 				</dict>
 				<key>8</key>
 				<dict>
 					<key>name</key>
-					<string>operator.primary.assign.hottest.nim</string>
+					<string>keyword.primary.assign.hottest</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -534,7 +520,7 @@
 			<key>match</key>
 			<string>((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\&lt;\&gt;\-\+\=~])</string>
 			<key>name</key>
-			<string>variable.primary.assign.hot.nim</string>
+			<string>variable.primary.assign.hot</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -542,7 +528,7 @@
 			<key>match</key>
 			<string>((?&lt;![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))</string>
 			<key>name</key>
-			<string>keyword.other.nim</string>
+			<string>keyword.other.secondary.nim</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -1733,218 +1719,6 @@
 	</array>
 	<key>repository</key>
 	<dict>
-		<key>eat_dig_literal</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>A base-2 integer literal</string>
-					<key>match</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_double_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\"</string>
-					<key>end</key>
-					<string>\"</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#eat_escaped_char</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_escaped_char</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\[nN]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[cC]|\\[rR]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[lL]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[fF]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[tT]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[vV]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\\"</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\'</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[0-9]+</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[aA]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[bB]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[eE]</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\[xX]\h\h</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\\\</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_float_literal</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>A float literal</string>
-					<key>match</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_hex_literal</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>A hexadecimal literal</string>
-					<key>match</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_int_literal</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>A base-10 integer literal</string>
-					<key>match</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_numbers</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#eat_float_literal</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_hex_literal</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_oct_literal</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_dig_literal</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_int_literal</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_oct_literal</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>A base-8 integer literal</string>
-					<key>match</key>
-					<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_single_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\'</string>
-					<key>end</key>
-					<string>\'</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>\\n</string>
-							<key>name</key>
-							<string>invalid.illegal.character.nim</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#eat_escaped_char</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>([^\']{2,}?)</string>
-							<key>name</key>
-							<string>invalid.illegal.character.nim</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>eat_strings</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#eat_double_string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#eat_single_string</string>
-				</dict>
-			</array>
-		</dict>
 		<key>escaped_char</key>
 		<dict>
 			<key>patterns</key>

From a81f744ef30dae6539bbf67c43411e52e1583196 Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Sun, 14 Jun 2015 03:20:46 +0200
Subject: [PATCH 3/6] Add .nim suffix to some scopes missing it.

---
 Syntaxes/Nim.YAML-tmLanguage | 16 ++++++++--------
 Syntaxes/Nim.tmLanguage      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index b0b5876..cc63b53 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -172,7 +172,7 @@ patterns:
 
 
 - comment: Keywords that affect program control flow or scope.
-  name: keyword.primary.control
+  name: keyword.primary.control.nim
   match: (?<![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])
 
 - comment: Keyword boolean operators for expressions.
@@ -180,15 +180,15 @@ patterns:
   match: ((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))
 
 - comment: Assign operator.
-  name: variable.primary.assign.hot
+  name: variable.primary.assign.hot.nim
   match: ((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\<\>\-\+\=~])
   captures:
-    '1': { name: keyword.secondary }
-    '4': { name: variable.primary.assign.hot }
-    '5': { name: variable.primary.assign.hotter }
-    '6': { name: keyword.secondary.operator.kw-public }
-    '7': { name: storage.type.generic }
-    '8': { name: keyword.primary.assign.hottest }
+    '1': { name: keyword.secondary.nim }
+    '4': { name: variable.primary.assign.hot.nim }
+    '5': { name: variable.primary.assign.hotter.nim }
+    '6': { name: keyword.secondary.operator.kw-public.nim }
+    '7': { name: storage.type.generic.nim }
+    '8': { name: keyword.primary.assign.hottest.nim }
 
 - comment: Other keywords.
   name: keyword.other.secondary.nim
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index 5f1890a..ffa2ad4 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -471,7 +471,7 @@
 			<key>match</key>
 			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])</string>
 			<key>name</key>
-			<string>keyword.primary.control</string>
+			<string>keyword.primary.control.nim</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -487,32 +487,32 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary</string>
+					<string>keyword.secondary.nim</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>variable.primary.assign.hot</string>
+					<string>variable.primary.assign.hot.nim</string>
 				</dict>
 				<key>5</key>
 				<dict>
 					<key>name</key>
-					<string>variable.primary.assign.hotter</string>
+					<string>variable.primary.assign.hotter.nim</string>
 				</dict>
 				<key>6</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.operator.kw-public</string>
+					<string>keyword.secondary.operator.kw-public.nim</string>
 				</dict>
 				<key>7</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.generic</string>
+					<string>storage.type.generic.nim</string>
 				</dict>
 				<key>8</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.primary.assign.hottest</string>
+					<string>keyword.primary.assign.hottest.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -520,7 +520,7 @@
 			<key>match</key>
 			<string>((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\&lt;\&gt;\-\+\=~])</string>
 			<key>name</key>
-			<string>variable.primary.assign.hot</string>
+			<string>variable.primary.assign.hot.nim</string>
 		</dict>
 		<dict>
 			<key>comment</key>

From ac3046e39c5f631e7d1d95c9a51ef6318c0d023f Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Wed, 17 Jun 2015 21:53:51 +0200
Subject: [PATCH 4/6] Remove assign specific highlight. No good.

---
 Syntaxes/Nim.YAML-tmLanguage | 22 +++++++++---------
 Syntaxes/Nim.tmLanguage      | 43 +-----------------------------------
 2 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index cc63b53..341321b 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -93,7 +93,7 @@ patterns:
             begin: \"
             end: \"
           - name: entity.other.attribute-name.pattern.nim
-            match: ([\w\x{80}-\x{10FFFF}]+)
+            match: ([\[\]\w\x{80}-\x{10FFFF}]+)
         - {include: source.nim}
       - {include: source.nim}
 
@@ -179,16 +179,16 @@ patterns:
   name: keyword.operator.boolean.nim
   match: ((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))
 
-- comment: Assign operator.
-  name: variable.primary.assign.hot.nim
-  match: ((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\<\>\-\+\=~])
-  captures:
-    '1': { name: keyword.secondary.nim }
-    '4': { name: variable.primary.assign.hot.nim }
-    '5': { name: variable.primary.assign.hotter.nim }
-    '6': { name: keyword.secondary.operator.kw-public.nim }
-    '7': { name: storage.type.generic.nim }
-    '8': { name: keyword.primary.assign.hottest.nim }
+# - comment: Assign operator.
+#   name: variable.primary.assign.hot.nim
+#   match: ((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\<\>\-\+\=~])
+#   captures:
+#     '1': { name: keyword.secondary.nim }
+#     '4': { name: variable.primary.assign.hot.nim }
+#     '5': { name: variable.primary.assign.hotter.nim }
+#     '6': { name: keyword.secondary.operator.kw-public.nim }
+#     '7': { name: storage.type.generic.nim }
+#     '8': { name: keyword.primary.assign.hottest.nim }
 
 - comment: Other keywords.
   name: keyword.other.secondary.nim
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index ffa2ad4..5b88bdf 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -261,7 +261,7 @@
 										</dict>
 										<dict>
 											<key>match</key>
-											<string>([\w\x{80}-\x{10FFFF}]+)</string>
+											<string>([\[\]\w\x{80}-\x{10FFFF}]+)</string>
 											<key>name</key>
 											<string>entity.other.attribute-name.pattern.nim</string>
 										</dict>
@@ -481,47 +481,6 @@
 			<key>name</key>
 			<string>keyword.operator.boolean.nim</string>
 		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.secondary.nim</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>variable.primary.assign.hot.nim</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>variable.primary.assign.hotter.nim</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.secondary.operator.kw-public.nim</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.generic.nim</string>
-				</dict>
-				<key>8</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.primary.assign.hottest.nim</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>Assign operator.</string>
-			<key>match</key>
-			<string>((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\&lt;\&gt;\-\+\=~])</string>
-			<key>name</key>
-			<string>variable.primary.assign.hot.nim</string>
-		</dict>
 		<dict>
 			<key>comment</key>
 			<string>Other keywords.</string>

From c17f9a82a0fb73006cb311e6bbbd2236c262054c Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Wed, 24 Jun 2015 14:49:32 +0200
Subject: [PATCH 5/6] Reduction: Only fixes + prim/secondary kw-classing

---
 Syntaxes/Nim.YAML-tmLanguage | 144 ++++++++++++++++-------------------
 Syntaxes/Nim.tmLanguage      | 128 +++++++++++++++----------------
 2 files changed, 126 insertions(+), 146 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index 341321b..9f8d716 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -31,12 +31,12 @@ patterns:
   - begin: \{\.(emit:) ?(\"\"\")
     end: (\"\"\")\.?
     captures:
-      '1': {name: keyword.secondary.other.nim}
+      '1': {name: keyword.other.nim}
       '2': {name: comment.syntax.nim}
     endCaptures:
       '1': {name: comment.syntax.nim}
     patterns:
-    - name: keyword.secondary.operator.nim
+    - name: keyword.operator.nim
       begin: \`
       end: \`
     - {include: source.c}
@@ -47,12 +47,12 @@ patterns:
   - begin: (asm )(\"\"\")
     end: \"\"\"
     captures:
-      '1': {name: keyword.secondary.other.nim}
+      '1': {name: keyword.other.nim}
       '2': {name: comment.syntax.nim}
     endCaptures:
       '0': {name: comment.syntax.nim}
     patterns:
-    - name: keyword.secondary.operator.nim
+    - name: keyword.operator.nim
       begin: \`
       end: \`
     - {include: source.asm}
@@ -65,10 +65,10 @@ patterns:
     beginCaptures:
       '1': {name: storage.type.proc.nim}
       '2': {name: entity.name.function.nim}
-      '5': {name: keyword.secondary.operator.kw-public.nim}
+      '5': {name: keyword.operator.secondary.kw-public.nim}
 
     endCaptures:
-      '1': {name: keyword.secondary.operator.nim}
+      '1': {name: keyword.operator.nim}
     patterns:
       - comment: Generic
         match: \[[\w\x{80}-\x{10FFFF}]+\]
@@ -137,34 +137,31 @@ patterns:
   name: constant.language.nim
   match: (?<![\w\x{80}-\x{10FFFF}])(true|false|inf|nil)(?![\w\x{80}-\x{10FFFF}])
 
-- comment: Primary branching keywords and their conditions
-  name: control.variable.parameter.nim
-  begin: \s+(when|if)\b     # removed for|while|
+- comment: Primary branching keywords
+  begin: (?:^|\s+|=)(when|if)\b
   end: (:)
   captures:
-    '1': {name: keyword.primary.control.nim}
+    '1': {name: keyword.control.primary.nim}
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
   - {include: source.nim}
 
 - comment: Primary branching keyword 'case'
-  name: control.variable.parameter.nim
-  begin: \s+(case)\b
-  end: (?=of)
+  begin: (?:^|\s+|=)(case)\b
+  end: (?=\bof\b)
   captures:
-    '1': {name: keyword.primary.control.nim}
+    '1': {name: keyword.control.primary.nim}
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
   - {include: source.nim}
 
 - comment: Secondary branching keywords and their conditions
-  name: control.variable.parameter.nim
-  begin: \s+(of|else|elif)\b
+  begin: (?:^|\s+)(of|else|elif)\b
   end: (:)
   captures:
-    '1': {name: keyword.secondary.control.nim}
+    '1': {name: keyword.control.secondary.nim}
   endCaptures:
     '1': {name: control.variable.parameter.nim}
   patterns:
@@ -172,26 +169,15 @@ patterns:
 
 
 - comment: Keywords that affect program control flow or scope.
-  name: keyword.primary.control.nim
+  name: keyword.control.nim
   match: (?<![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])
 
 - comment: Keyword boolean operators for expressions.
   name: keyword.operator.boolean.nim
   match: ((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))
 
-# - comment: Assign operator.
-#   name: variable.primary.assign.hot.nim
-#   match: ((^|[\(\)\:\;])\s*(const|let|type|var)?\s+)([\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?([\w\x{80}-\x{10FFFF}\[\]]+)([*]?)\s*(:\s*[\w\x{80}-\x{10FFFF}\.\[\]\(\)\s]*?)?(=)(?![\<\>\-\+\=~])
-#   captures:
-#     '1': { name: keyword.secondary.nim }
-#     '4': { name: variable.primary.assign.hot.nim }
-#     '5': { name: variable.primary.assign.hotter.nim }
-#     '6': { name: keyword.secondary.operator.kw-public.nim }
-#     '7': { name: storage.type.generic.nim }
-#     '8': { name: keyword.primary.assign.hottest.nim }
-
 - comment: Other keywords.
-  name: keyword.other.secondary.nim
+  name: keyword.other.nim
   match: ((?<![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))
 
 - comment: Generic operators for expressions.
@@ -203,20 +189,20 @@ patterns:
   end: \:()
   name: meta.forloop.nim
   captures:
-    '1': { name: keyword.primary.control.nim }
+    '1': { name: keyword.control.nim }
   patterns:
   - match: \ [\w\x{80}-\x{10FFFF},]+\s+(in)\s+
     captures:
-      '1': { name: keyword.primary.control.nim }
+      '1': { name: keyword.control.nim }
   - {include: source.nim}
 
 - comment: Import syntax
   match: ((import)\s+[\/\w]+,?)
   captures:
-    '2': { name: keyword.secondary.control.nim }
+    '2': { name: keyword.control.nim }
 - match: (from)\s+[\/\w]+\s+(?=import)
   captures:
-    '1': { name: keyword.secondary.control.nim }
+    '1': { name: keyword.control.nim }
 
 - comment: Destructure syntax
   begin: (var|let)\s*\(
@@ -251,7 +237,7 @@ patterns:
 - comment: (Raw) Triple Quoted String
   name: string.quoted.triple.nim
   begin: r?\"\"\"
-  end: \"\"\"[^\"]   #" highlight-flaw-fixer-comment
+  end: \"\"\"[^\"]
 
 - comment: Raw Double Quoted String
   name: string.quoted.double.raw.nim
@@ -279,7 +265,7 @@ patterns:
       match: ([^\']{2,}?)   #' highlight-flaw-fixer-comment
 
 - comment: Call syntax
-  begin: ([\w\x{80}-\x{10FFFF}\`]+)\s*(?=\(|\[.+?\]\s*\()   #` highlight-flaw-fixer-comment
+  begin: ([\w\x{80}-\x{10FFFF}\`]+)\s*(?=\(|\[.+?\]\s*\()
   end: \)
   captures:
     '1': { name: support.function.any-method.nim }
@@ -292,7 +278,7 @@ patterns:
     '1': { name: support.function.any-method.nim }
   patterns:
     - {include: source.nim}
-- match: ([\w\x{80}-\x{10FFFF}]+)(?=\s+[\"\'\`])   #" highlight-flaw-fixer-comment
+- match: ([\w\x{80}-\x{10FFFF}]+)(?=\s+[\"\'\`])
   captures:
     '1': { name: support.function.any-method.nim }
   patterns:
@@ -317,27 +303,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.primary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: source.nim}
 
 - name: source.html.embedded.nim
@@ -353,27 +339,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: text.xml}
 
 - name: source.xml.embedded.nim
@@ -389,27 +375,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: text.xml}
 
 - name: source.js.embedded.nim
@@ -425,27 +411,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: source.js}
 
 - name: source.css.embedded.nim
@@ -461,27 +447,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: source.css}
 
 - name: source.glsl.embedded.nim
@@ -497,27 +483,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: source.glsl}
 
 - name: source.markdown.embedded.nim
@@ -533,27 +519,27 @@ patterns:
     - begin: (?<!\$)(\$)\(
       end: \)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)\{
       end: \}
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.operator.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.operator.nim}
       patterns:
       - {include: source.nim}
     - begin: (?<!\$)(\$)(for|while|case|of|when|if|else|elif)( )
       end: (\{|\n)
       captures:
-        '1': {name: keyword.secondary.operator.nim}
-        '2': {name: keyword.secondary.control.nim}
+        '1': {name: keyword.operator.nim}
+        '2': {name: keyword.control.nim}
       endCaptures:
         '1': {name: plain}
       patterns:
       - {include: source.nim}
     - match: (?<!\$)(\$[a-zA-Z0-9_]+)
-      name: keyword.secondary.operator.nim
+      name: keyword.operator.nim
     - {include: text.html.markdown.multimarkdown}
 
 repository:
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index 5b88bdf..0ffdced 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -75,7 +75,7 @@
 						<key>1</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.secondary.other.nim</string>
+							<string>keyword.other.nim</string>
 						</dict>
 						<key>2</key>
 						<dict>
@@ -101,7 +101,7 @@
 							<key>end</key>
 							<string>\`</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -126,7 +126,7 @@
 						<key>1</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.secondary.other.nim</string>
+							<string>keyword.other.nim</string>
 						</dict>
 						<key>2</key>
 						<dict>
@@ -152,7 +152,7 @@
 							<key>end</key>
 							<string>\`</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -187,7 +187,7 @@
 						<key>5</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.secondary.operator.kw-public.nim</string>
+							<string>keyword.operator.secondary.kw-public.nim</string>
 						</dict>
 					</dict>
 					<key>end</key>
@@ -197,7 +197,7 @@
 						<key>1</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 					</dict>
 					<key>patterns</key>
@@ -368,13 +368,13 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>\s+(when|if)\b</string>
+			<string>(?:^|\s+|=)(when|if)\b</string>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.primary.control.nim</string>
+					<string>keyword.control.primary.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -389,8 +389,6 @@
 					<string>control.variable.parameter.nim</string>
 				</dict>
 			</dict>
-			<key>name</key>
-			<string>control.variable.parameter.nim</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -401,19 +399,19 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>\s+(case)\b</string>
+			<string>(?:^|\s+|=)(case)\b</string>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.primary.control.nim</string>
+					<string>keyword.control.primary.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
 			<string>Primary branching keyword 'case'</string>
 			<key>end</key>
-			<string>(?=of)</string>
+			<string>(?=\bof\b)</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -422,8 +420,6 @@
 					<string>control.variable.parameter.nim</string>
 				</dict>
 			</dict>
-			<key>name</key>
-			<string>control.variable.parameter.nim</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -434,13 +430,13 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>\s+(of|else|elif)\b</string>
+			<string>(?:^|\s+)(of|else|elif)\b</string>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.control.nim</string>
+					<string>keyword.control.secondary.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -455,8 +451,6 @@
 					<string>control.variable.parameter.nim</string>
 				</dict>
 			</dict>
-			<key>name</key>
-			<string>control.variable.parameter.nim</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -471,7 +465,7 @@
 			<key>match</key>
 			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])</string>
 			<key>name</key>
-			<string>keyword.primary.control.nim</string>
+			<string>keyword.control.nim</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -487,7 +481,7 @@
 			<key>match</key>
 			<string>((?&lt;![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))</string>
 			<key>name</key>
-			<string>keyword.other.secondary.nim</string>
+			<string>keyword.other.nim</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -505,7 +499,7 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.primary.control.nim</string>
+					<string>keyword.control.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -522,7 +516,7 @@
 						<key>1</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.primary.control.nim</string>
+							<string>keyword.control.nim</string>
 						</dict>
 					</dict>
 					<key>match</key>
@@ -540,7 +534,7 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.control.nim</string>
+					<string>keyword.control.nim</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -554,7 +548,7 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>keyword.secondary.control.nim</string>
+					<string>keyword.control.nim</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -820,7 +814,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -841,12 +835,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -867,12 +861,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.primary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -897,7 +891,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -948,7 +942,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -969,12 +963,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -995,12 +989,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1025,7 +1019,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -1076,7 +1070,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1097,12 +1091,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1123,12 +1117,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1153,7 +1147,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -1204,7 +1198,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1225,12 +1219,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1251,12 +1245,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1281,7 +1275,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -1332,7 +1326,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1353,12 +1347,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1379,12 +1373,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1409,7 +1403,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -1460,7 +1454,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1481,12 +1475,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1507,12 +1501,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1537,7 +1531,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>
@@ -1588,7 +1582,7 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1609,12 +1603,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1635,12 +1629,12 @@
 								<key>1</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.operator.nim</string>
+									<string>keyword.operator.nim</string>
 								</dict>
 								<key>2</key>
 								<dict>
 									<key>name</key>
-									<string>keyword.secondary.control.nim</string>
+									<string>keyword.control.nim</string>
 								</dict>
 							</dict>
 							<key>end</key>
@@ -1665,7 +1659,7 @@
 							<key>match</key>
 							<string>(?&lt;!\$)(\$[a-zA-Z0-9_]+)</string>
 							<key>name</key>
-							<string>keyword.secondary.operator.nim</string>
+							<string>keyword.operator.nim</string>
 						</dict>
 						<dict>
 							<key>include</key>

From e343e965fd642bd182947803a9674e5932b2d9e1 Mon Sep 17 00:00:00 2001
From: Oscar Campbell <oscar@campbell.nu>
Date: Wed, 24 Jun 2015 22:31:18 +0200
Subject: [PATCH 6/6] Make num type suffix match lenient to safen diffs

---
 Syntaxes/Nim.YAML-tmLanguage | 10 +++++-----
 Syntaxes/Nim.tmLanguage      | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Syntaxes/Nim.YAML-tmLanguage b/Syntaxes/Nim.YAML-tmLanguage
index 9f8d716..7c37484 100644
--- a/Syntaxes/Nim.YAML-tmLanguage
+++ b/Syntaxes/Nim.YAML-tmLanguage
@@ -115,23 +115,23 @@ patterns:
 
 - comment: A float literal
   name: constant.numeric.float.decimal.nim
-  match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?   #' highlight-flaw-fixer-comment
+  match: (\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF]\d)|[fFdD])?   #' highlight-flaw-fixer-comment
 
 - comment: A hexadecimal literal
   name: constant.numeric.integer.hexadecimal.nim
-  match: (?<![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+  match: (0[xX]\h[_\h]*)('?(([iIuUfF]\d)|[uUfFdD]))?   #' highlight-flaw-fixer-comment
 
 - comment: A base-8 integer literal
   name: constant.numeric.integer.octal.nim
-  match: (?<![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+  match: (0[ocC][0-7][_0-7]*)('?(([iIuUfF]\d)|[uUfFdD]))?   #' highlight-flaw-fixer-comment
 
 - comment: A base-2 integer literal
   name: constant.numeric.integer.binary.nim
-  match: (?<![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+  match: (0(b|B)[01][_01]*)('?(([iIuUfF]\d)|[uUfFdD]))?   #' highlight-flaw-fixer-comment
 
 - comment: A base-10 integer literal
   name: constant.numeric.integer.decimal.nim
-  match: (?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?   #' highlight-flaw-fixer-comment
+  match: (\d[_\d]*)('?(([iIuUfF]\d)|[uUfFdD]))?   #' highlight-flaw-fixer-comment
 
 - comment: Language Constants.
   name: constant.language.nim
diff --git a/Syntaxes/Nim.tmLanguage b/Syntaxes/Nim.tmLanguage
index 0ffdced..5e784dd 100644
--- a/Syntaxes/Nim.tmLanguage
+++ b/Syntaxes/Nim.tmLanguage
@@ -322,7 +322,7 @@
 			<key>comment</key>
 			<string>A float literal</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF](32|64|128))|[fFdD])?</string>
+			<string>(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))('?([fF]\d)|[fFdD])?</string>
 			<key>name</key>
 			<string>constant.numeric.float.decimal.nim</string>
 		</dict>
@@ -330,7 +330,7 @@
 			<key>comment</key>
 			<string>A hexadecimal literal</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[xX]\h[_\h]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+			<string>(0[xX]\h[_\h]*)('?(([iIuUfF]\d)|[uUfFdD]))?</string>
 			<key>name</key>
 			<string>constant.numeric.integer.hexadecimal.nim</string>
 		</dict>
@@ -338,7 +338,7 @@
 			<key>comment</key>
 			<string>A base-8 integer literal</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+			<string>(0[ocC][0-7][_0-7]*)('?(([iIuUfF]\d)|[uUfFdD]))?</string>
 			<key>name</key>
 			<string>constant.numeric.integer.octal.nim</string>
 		</dict>
@@ -346,7 +346,7 @@
 			<key>comment</key>
 			<string>A base-2 integer literal</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+			<string>(0(b|B)[01][_01]*)('?(([iIuUfF]\d)|[uUfFdD]))?</string>
 			<key>name</key>
 			<string>constant.numeric.integer.binary.nim</string>
 		</dict>
@@ -354,7 +354,7 @@
 			<key>comment</key>
 			<string>A base-10 integer literal</string>
 			<key>match</key>
-			<string>(?&lt;![\w\x{80}-\x{10FFFF}])(\d[_\d]*)('?(([iIuUfF](8|16|32|64))|[uUfFdD]))?</string>
+			<string>(\d[_\d]*)('?(([iIuUfF]\d)|[uUfFdD]))?</string>
 			<key>name</key>
 			<string>constant.numeric.integer.decimal.nim</string>
 		</dict>
@@ -378,7 +378,7 @@
 				</dict>
 			</dict>
 			<key>comment</key>
-			<string>Primary branching keywords and their conditions</string>
+			<string>Primary branching keywords</string>
 			<key>end</key>
 			<string>(:)</string>
 			<key>endCaptures</key>