Merge pull request #762 from damieng/master

DustinCampbell · web-flow · commit 3e8299f346b6 · 2016-09-23T14:37:59.000-07:00
Allow comments after preprocessor
diff --git a/syntaxes/csharp.json b/syntaxes/csharp.json
@@ -628,7 +628,7 @@
               "name": "entity.name.function.preprocessor.cs"
             }
           },
-          "match": "^\\s*#\\s*(if|else|elif|endif|define|undef|warning|error|line|pragma|region|endregion)\\b\\s*(.*)",
+          "match": "^\\s*#\\s*(if|else|elif|endif|define|undef|warning|error|line|pragma|region|endregion)\\b\\s*(.*?)(?=$|\\/\\/)",
           "name": "meta.preprocessor.cs"
         }
       ]

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@`
`628`	`628`	`"name": "entity.name.function.preprocessor.cs"`
`629`	`629`	`}`
`630`	`630`	`},`
`631`		`- "match": "^\\s#\\s(if\|else\|elif\|endif\|define\|undef\|warning\|error\|line\|pragma\|region\|endregion)\\b\\s(.)",`
	`631`	`+ "match": "^\\s#\\s(if\|else\|elif\|endif\|define\|undef\|warning\|error\|line\|pragma\|region\|endregion)\\b\\s(.?)(?=$\|\\/\\/)",`
`632`	`632`	`"name": "meta.preprocessor.cs"`
`633`	`633`	`}`
`634`	`634`	`]`