MasterMatcher.findFactories(...) compares TokenHierarchy.get(document) with null but TokenHierarchy.get(document) is
never null anymore (just look at the call chain, it will always return a valid object with the current codebase).

This breaks braces matching for non-Lexer kits as TokenHierarchy.get(document) returns non-null but 
th.embeddedTokenSequences(offset, backward).isEmpty()==true and thus no factory is returned.

The check should probably be:
     if (th.isActive()) {
         List<TokenSequence<?>> sequences = th.embeddedTokenSequences(offset, backward);
     ...

This seems to fix the bug, ie. braces matching works again for my editor. I'm not entirely certain it is correct, but
.isActive() seems to be used by org.netbeans.modules.editor.impl.highlighting.HLFactory to check for a lexer kit.