Unverified Commit 21f61857 authored by Naïm Favier's avatar Naïm Favier Committed by GitHub
Browse files

Merge pull request #206527 from ncfavier/tree-sitter-unionOfDisjoint

parents 0d436e1b 7adad939
Loading
Loading
Loading
Loading
+1 −13
Original line number Diff line number Diff line
@@ -375,19 +375,7 @@ let
          knownTreeSitterOrgGrammarRepos);

    in
    mergeAttrsUnique otherGrammars treeSitterOrgaGrammars;

  # TODO: move to lib
  mergeAttrsUnique = left: right:
    let intersect = lib.intersectLists (lib.attrNames left) (lib.attrNames right); in
    assert
    lib.assertMsg (intersect == [ ])
      (lib.concatStringsSep "\n" [
        "mergeAttrsUnique: keys in attrset overlapping:"
        "left: ${lib.generators.toPretty {} (lib.getAttrs intersect left)}"
        "right: ${lib.generators.toPretty {} (lib.getAttrs intersect right)}"
      ]);
    left // right;
    lib.attrsets.unionOfDisjoint otherGrammars treeSitterOrgaGrammars;