exclude embedded scopes from assertions; exclude 1 specific WIP test

Author: claytonrcarter

lib/main.js

@@ -15,7 +15,7 @@ exports.activate = function() {
     content (node) { return node.descendantsOfType('content') }
   })
 
-  // inject TODO comments into PHP comments
+  // inject phpDoc comments into PHP comments
   atom.grammars.addInjectionPoint('source.php', {
     type: 'comment',
     language (comment) {

spec/tree-sitter-spec.js

@@ -1,8 +1,5 @@
 const dedent = require("dedent");
 
-const getScopesAtPosition = (editor, position) =>
-  editor.scopeDescriptorForBufferPosition(position).scopes;
-
 // https://github.com/atom/atom/blob/b3d3a52d9e4eb41f33df7b91ad1f8a2657a04487/spec/tree-sitter-language-mode-spec.js#L47-L55
 function expectTokensToEqual (editor, expectedTokenLines, startingRow = 1) {
   const lastRow = editor.getLastScreenRow()
@@ -51,7 +48,12 @@ ${dedent(content)}
 
   beforeEach(function () {
     this.addMatchers({
-      toHaveScopesAtPosition(posn, token, expected) {
+      toHaveScopesAtPosition(
+          posn,
+          token,
+          expected,
+          includeEmbeddedScopes = false
+      ) {
         if (expected === undefined) {
           expected = token;
         }
@@ -62,7 +64,14 @@ ${dedent(content)}
         // token is not used at this time; it's just a way to keep note where we are
         // in the line
 
-        let actual = getScopesAtPosition(this.actual, posn);
+        let actual = this.actual
+          .scopeDescriptorForBufferPosition(posn).scopes
+          .filter(
+            scope => includeEmbeddedScopes ||
+              ![
+                'text.html.php',
+                'meta.embedded.block.php',
+              ].includes(scope))
 
         let notExpected = actual.filter((scope) => !expected.includes(scope));
         let notReceived = expected.filter((scope) => !actual.includes(scope));
@@ -119,7 +128,8 @@ ${caret}
     });
   });
 
-  describe("html embedding", () => {
+  // FIXME temporarily disabled
+  xdescribe("html embedding", () => {
     it("handles php wrapped in html", () => {
       editor.setText(dedent `
         <div>