Merge pull request #110 from pchaigno/avoid-ambiguous-h

zargony · web-flow · commit 0069d1f6e2a1 · 2017-06-27T13:17:08.000+02:00
Avoid using the ambiguous \h shorthand character
diff --git a/grammars/rust.cson b/grammars/rust.cson
@@ -39,7 +39,7 @@
   }
   'escaped_character': {
     'name': 'constant.character.escape.rust'
-    'match': '\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
+    'match': '\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
   }
   'string_literal': {
     'comment': 'Double-quote string literal'
@@ -221,7 +221,7 @@
   {
     'comment': 'Single-quote string literal (character)'
     'name': 'string.quoted.single.rust'
-    'match': 'b?\'([^\'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))\''
+    'match': 'b?\'([^\'\\\\]|\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))\''
   }
   { 'include': '#string_literal' }
   { 'include': '#raw_string_literal' }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`	`'escaped_character': {`
`41`	`41`	`'name': 'constant.character.escape.rust'`
`42`		`- 'match': '\\\\(x\\h{2}\|[0-2][0-7]{0,2}\|3[0-6][0-7]?\|37[0-7]?\|[4-7][0-7]?\|.)'`
	`42`	`+ 'match': '\\\\(x[0-9A-Fa-f]{2}\|[0-2][0-7]{0,2}\|3[0-6][0-7]?\|37[0-7]?\|[4-7][0-7]?\|.)'`
`43`	`43`	`}`
`44`	`44`	`'string_literal': {`
`45`	`45`	`'comment': 'Double-quote string literal'`
`@@ -221,7 +221,7 @@`
`221`	`221`	`{`
`222`	`222`	`'comment': 'Single-quote string literal (character)'`
`223`	`223`	`'name': 'string.quoted.single.rust'`
`224`		`- 'match': 'b?\'([^\'\\\\]\|\\\\(x\\h{2}\|[0-2][0-7]{0,2}\|3[0-6][0-7]?\|37[0-7]?\|[4-7][0-7]?\|.))\''`
	`224`	`+ 'match': 'b?\'([^\'\\\\]\|\\\\(x[0-9A-Fa-f]{2}\|[0-2][0-7]{0,2}\|3[0-6][0-7]?\|37[0-7]?\|[4-7][0-7]?\|.))\''`
`225`	`225`	`}`
`226`	`226`	`{ 'include': '#string_literal' }`
`227`	`227`	`{ 'include': '#raw_string_literal' }`