Implemented PR feedback

Author: matthewlipski

packages/core/src/blocks/defaultBlocks.test.ts

@@ -0,0 +1,56 @@
+import { Editor, Extension, getSchema, Mark, Node } from "@tiptap/core";
+import { describe, expect, it } from "vite-plus/test";
+import { CommentMark } from "../comments/mark.js";
+import { defaultStyleSpecs } from "./defaultBlocks.js";
+
+const extensions = [
+  Node.create({ name: "doc", topNode: true, content: "text*" }),
+  Node.create({ name: "text", group: "inline" }),
+  ...Object.values(defaultStyleSpecs).map((style) => style.implementation.mark),
+];
+
+describe("inline code mark exclusions", () => {
+  it.each([false, true])(
+    "builds exclusions from enabled marks (comments enabled: %s)",
+    (withComments) => {
+      const editor = new Editor({
+        element: null,
+        extensions: [
+          ...extensions,
+          Extension.create({
+            name: "customMarks",
+            addExtensions() {
+              return [
+                Mark.create({ name: "customStyle" }),
+                ...(withComments ? [CommentMark] : []),
+              ];
+            },
+          }),
+        ],
+      });
+
+      try {
+        const { marks } = editor.schema;
+        const code = marks.code;
+        expect(code.spec.excludes).not.toBe("_");
+        for (const mark of Object.values(marks)) {
+          expect(code.excludes(mark)).toBe(mark.name !== "comment");
+        }
+
+        if (withComments) {
+          const codeMark = code.create();
+          const commentMark = marks.comment.create({ threadId: "thread" });
+          expect(codeMark.addToSet([commentMark])).toHaveLength(2);
+          expect(commentMark.addToSet([codeMark])).toHaveLength(2);
+        }
+      } finally {
+        editor.destroy();
+      }
+    },
+  );
+
+  it("supports schema creation without an editor", () => {
+    const { marks } = getSchema(extensions);
+    expect(marks.code.excludes(marks.bold)).toBe(true);
+  });
+});

packages/core/src/blocks/defaultBlocks.ts

@@ -1,5 +1,4 @@
-import { InputRule, markInputRule } from "@tiptap/core";
-import type { MarkType } from "@tiptap/pm/model";
+import { flattenExtensions, InputRule, markInputRule } from "@tiptap/core";
 import Bold from "@tiptap/extension-bold";
 import Code from "@tiptap/extension-code";
 import Italic from "@tiptap/extension-italic";
@@ -140,22 +139,20 @@ export const defaultStyleSpecs = {
   strike: createStyleSpecFromTipTapMark(Strike, "boolean"),
   code: createStyleSpecFromTipTapMark(
     Code.extend({
-      onBeforeCreate() {
-        // By default, code marks are configured to not overlap with any other
-        // marks with `exclude: "_"`. However, comment marks should still be
-        // allowed to overlap code marks. There is unfortunately no way to make
-        // the `exclude` option contain all possible marks except comments, so
-        // we instead remove the comment mark from it in `onBeforeCreate`.
-        const commentType = this.editor.schema.marks.comment;
-        const codeType = this.type as MarkType & {
-          excluded?: readonly MarkType[];
-        };
-
-        if (commentType && codeType.excluded?.includes(commentType)) {
-          codeType.excluded = codeType.excluded.filter(
-            (markType) => markType !== commentType,
-          );
+      excludes() {
+        // Exclude all enabled marks except comments when building the schema.
+        // The extension manager is not available yet during schema creation.
+        if (!this.editor) {
+          return "_";
         }
+
+        return flattenExtensions(this.editor.options.extensions)
+          .filter(
+            (extension) =>
+              extension.type === "mark" && extension.name !== "comment",
+          )
+          .map((extension) => extension.name)
+          .join(" ");
       },
       addInputRules() {
         return [