fix for #203

cpp/generate.rb

@@ -829,7 +829,11 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
                     # e.g. std::string ("hello");
                     :function_call_context,
                 ]
-            )
+            ),
+            :comments_context,
+            # initial context is here for things like noexcept()
+            # TODO: fix this pattern an make it more strict
+            :$initial_context
         ],
         needs_semicolon: false,
         body_includes: [ :type_casting_operators, :function_call, :$initial_context ],

package.json

@@ -3,7 +3,7 @@
     "displayName": "Better C++ Syntax",
     "description": "The bleeding edge of the VS Code C++ syntax",
     "icon": "icon.png",
-    "version": "1.9.5",
+    "version": "1.9.6",
     "scripts": {
         "build": "ruby cpp/generate.rb && ruby c/generate.rb",
         "pretest": "npm run build",

syntaxes/cpp.tmLanguage.json

@@ -2062,6 +2062,12 @@
                   "include": "#function_call_context"
                 }
               ]
+            },
+            {
+              "include": "#comments_context"
+            },
+            {
+              "include": "$base"
             }
           ]
         },

syntaxes/cpp.tmLanguage.yaml

@@ -1083,6 +1083,8 @@
         patterns:
         - include: "#function_parameter_context"
         - include: "#function_call_context"
+      - include: "#comments_context"
+      - include: "$base"
     - name: meta.body.function.definition.cpp
       begin: "(?<=\\{)"
       end: "(\\})"

test/fixtures/issues/203.cpp

@@ -0,0 +1,5 @@
+// another comment
+int fun() /* a comment */ // test
+{
+    return 1; /* a comment */ // test
+}

test/specs/issues/085.cpp.yaml

@@ -97,7 +97,14 @@
 - source: )
   scopes:
     - punctuation.section.parameters.end.bracket.round
-- source: ' // this one is not'
+- source: //
+  scopesBegin:
+    - comment.line.double-slash
+  scopes:
+    - punctuation.definition.comment
+- source: ' this one is not'
+  scopesEnd:
+    - comment.line.double-slash
 - source: '{'
   scopes:
     - punctuation.section.block.begin.bracket.curly.function.definition

test/specs/issues/203.cpp.yaml

@@ -0,0 +1,82 @@
+- source: //
+  scopesBegin:
+    - comment.line.double-slash
+  scopes:
+    - punctuation.definition.comment
+- source: ' another comment'
+  scopesEnd:
+    - comment.line.double-slash
+- source: int
+  scopesBegin:
+    - meta.function.definition
+  scopes:
+    - meta.qualified_type
+    - storage.type.primitive
+- source: fun
+  scopesBegin:
+    - meta.head.function.definition
+  scopes:
+    - entity.name.function.definition
+- source: (
+  scopes:
+    - punctuation.section.parameters.begin.bracket.round
+- source: )
+  scopes:
+    - punctuation.section.parameters.end.bracket.round
+- source: /*
+  scopesBegin:
+    - comment.block
+  scopes:
+    - punctuation.definition.comment.begin
+- source: ' a comment '
+- source: '*/'
+  scopes:
+    - punctuation.definition.comment.end
+  scopesEnd:
+    - comment.block
+- source: //
+  scopesBegin:
+    - comment.line.double-slash
+  scopes:
+    - punctuation.definition.comment
+- source: ' test'
+  scopesEnd:
+    - comment.line.double-slash
+- source: '{'
+  scopes:
+    - punctuation.section.block.begin.bracket.curly.function.definition
+  scopesEnd:
+    - meta.head.function.definition
+- source: return
+  scopesBegin:
+    - meta.body.function.definition
+  scopes:
+    - keyword.control.return
+- source: '1'
+  scopes:
+    - constant.numeric.decimal
+- source: ;
+  scopes:
+    - punctuation.terminator.statement
+- source: /*
+  scopesBegin:
+    - comment.block
+  scopes:
+    - punctuation.definition.comment.begin
+- source: ' a comment '
+- source: '*/'
+  scopes:
+    - punctuation.definition.comment.end
+  scopesEnd:
+    - comment.block
+- source: //
+  scopesBegin:
+    - comment.line.double-slash
+  scopes:
+    - punctuation.definition.comment
+- source: ' test'
+  scopesEnd:
+    - comment.line.double-slash
+- source: '}'
+  scopes:
+    - punctuation.section.block.end.bracket.curly.function.definition