Merge pull request Constellation#32 from claydotio/comments

ignore blocks of code - fixes Constellation#27
59naga · May 24, 2015 · 1452ee2 · 1452ee2
2 parents 9edabcc + eae104e
commit 1452ee2
Show file tree

Hide file tree

Showing 81 changed files with 6,138 additions and 39 deletions.
diff --git a/lib/command.js b/lib/command.js
diff --git a/lib/cover.js b/lib/cover.js
diff --git a/lib/hook.js b/lib/hook.js
diff --git a/lib/ibrik.js b/lib/ibrik.js
diff --git a/lib/instrumenter.js b/lib/instrumenter.js
diff --git a/lib/report.js b/lib/report.js
diff --git a/src/instrumenter.coffee b/src/instrumenter.coffee
@@ -45,7 +45,13 @@ class Instrumenter extends istanbul.Instrumenter
 
         try
             code = coffee.compile code, sourceMap: true
-            program = esprima.parse(code.js, loc: true)
+            program = esprima.parse(code.js, {
+                loc: true
+                range: true
+                raw: true
+                tokens: true
+                comment: true
+            })
             @fixupLoc program, code.sourceMap
             @instrumentASTSync program, filename, code
         catch e

diff --git a/test/cover.coffee b/test/cover.coffee
@@ -107,3 +107,5 @@ describe 'coverage', ->
     it 'complicated', (done) ->
         coverTest('test/fixture/third_party/StringScannerWithTest.coffee').then(done, done)
 
+    it 'ignore comment', (done) ->
+        coverTest('test/fixture/comment.coffee').then(done, done)
diff --git a/test/fixture/comment.coffee b/test/fixture/comment.coffee
@@ -0,0 +1,5 @@
+cond = no
+### istanbul ignore if ###
+if cond
+    console.log('ng')
+console.log('ok')
diff --git a/test/fixture/comment.coffee.json b/test/fixture/comment.coffee.json
@@ -0,0 +1,130 @@
+{
+    "test/fixture/comment.coffee":{
+        "path":"test/fixture/comment.coffee",
+        "s":{
+            "1":1,
+            "2":1,
+            "3":1,
+            "4":1,
+            "5":0,
+            "6":1
+        },
+        "b":{
+            "1":[
+                0,
+                1
+            ]
+        },
+        "f":{
+            "1":1
+        },
+        "fnMap":{
+            "1":{
+                "name":"(anonymous_1)",
+                "line":1,
+                "loc":{
+                    "start":{
+                        "line":1,
+                        "column":-15
+                    },
+                    "end":{
+                        "line":1,
+                        "column":-15
+                    }
+                }
+            }
+        },
+        "statementMap":{
+            "1":{
+                "start":{
+                    "line":1,
+                    "column":-15
+                },
+                "end":{
+                    "line":1,
+                    "column":-15
+                }
+            },
+            "2":{
+                "start":{
+                    "line":1,
+                    "column":-15
+                },
+                "end":{
+                    "line":1,
+                    "column":-15
+                }
+            },
+            "3":{
+                "start":{
+                    "line":1,
+                    "column":-15
+                },
+                "end":{
+                    "line":1,
+                    "column":-15
+                }
+            },
+            "4":{
+                "start":{
+                    "line":3,
+                    "column":0
+                },
+                "end":{
+                    "line":1,
+                    "column":-15
+                }
+            },
+            "5":{
+                "skip":true,
+                "start":{
+                    "line":4,
+                    "column":4
+                },
+                "end":{
+                    "line":3,
+                    "column":0
+                }
+            },
+            "6":{
+                "start":{
+                    "line":5,
+                    "column":0
+                },
+                "end":{
+                    "line":1,
+                    "column":-15
+                }
+            }
+        },
+        "branchMap":{
+            "1":{
+                "line":3,
+                "type":"if",
+                "locations":[
+                    {
+                        "skip":true,
+                        "start":{
+                            "line":3,
+                            "column":0
+                        },
+                        "end":{
+                            "line":3,
+                            "column":0
+                        }
+                    },
+                    {
+                        "start":{
+                            "line":3,
+                            "column":0
+                        },
+                        "end":{
+                            "line":3,
+                            "column":0
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}
diff --git a/tmp/test/fixture/comment.coffee/coverage.json b/tmp/test/fixture/comment.coffee/coverage.json
@@ -0,0 +1 @@
+{"/home/zoli/Downloads/ibrik/test/fixture/comment.coffee":{"path":"/home/zoli/Downloads/ibrik/test/fixture/comment.coffee","s":{"1":1,"2":1,"3":1,"4":1,"5":0,"6":1},"b":{"1":[0,1]},"f":{"1":1},"fnMap":{"1":{"name":"(anonymous_1)","line":1,"loc":{"start":{"line":1,"column":-15},"end":{"line":1,"column":-15}}}},"statementMap":{"1":{"start":{"line":1,"column":-15},"end":{"line":1,"column":-15}},"2":{"start":{"line":1,"column":-15},"end":{"line":1,"column":-15}},"3":{"start":{"line":1,"column":-15},"end":{"line":1,"column":-15}},"4":{"start":{"line":3,"column":0},"end":{"line":1,"column":-15}},"5":{"start":{"line":4,"column":4},"end":{"line":3,"column":0},"skip":true},"6":{"start":{"line":5,"column":0},"end":{"line":1,"column":-15}}},"branchMap":{"1":{"line":3,"type":"if","locations":[{"start":{"line":3,"column":0},"end":{"line":3,"column":0},"skip":true},{"start":{"line":3,"column":0},"end":{"line":3,"column":0}}]}}}}