initial attempt at not matching comments in macros

Fixes #506.
jeff-hykin · Nov 6, 2020 · 9c4d17e · 9c4d17e
1 parent ddc1a81
commit 9c4d17e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -123,4 +123,4 @@
  "dependencies": {
  "textmate-bailout": "^1.1.0"
  }
-}
+}
diff --git a/source/languages/cpp/lib/preprocessor.rb b/source/languages/cpp/lib/preprocessor.rb
@@ -249,7 +249,8 @@ def wordBounds(regex_pattern)
 #
  grammar[:single_line_macro] = Pattern.new(
  should_fully_match: ['#define EXTERN_C extern "C"'],
- match: /^/.then(std_space).then(/#define/).then(/.*/).lookBehindToAvoid(/[\\]/).then(@end_of_line),
+ should_not_partial_match: ['#define test /* partial comment'],
+ match: /^/.then(std_space).then(/#define/).oneOrMoreOf(oneOf([/[^\/]+/, /\/(?:[^*]|$)/])).lookBehindToAvoid(/[\\]/).then(@end_of_line),
  includes: [
  :macro,
  :comments,

diff --git a/syntaxes/cpp.embedded.macro.tmLanguage.json b/syntaxes/cpp.embedded.macro.tmLanguage.json