fix(CodeBlock): handle pasting only from code-editors known to us

src/extensions/markdown/CodeBlock/CodeBlock.test.ts

@@ -105,25 +105,50 @@ describe('CodeBlock paste handling', () => {
         });
     });
 
-    it('should detect inline code from HTML <code> tag', () => {
+    it('should detect JetBrains paste as inline for single line', () => {
         const data = createMockDataTransfer({
-            [DataTransferType.Text]: 'x',
-            [DataTransferType.Html]: '<code>x</code>',
+            [DataTransferType.Text]: 'const x = 1',
+            [DataTransferType.Html]: '<pre>const x = 1</pre>',
+            [DataTransferType.Rtf]: '{\\rtf1\\fmodern JetBrains Mono}',
         });
         const result = getCodeData(data);
 
         expect(result).toEqual({
-            editor: 'code-editor',
-            value: 'x',
+            editor: 'jetbrains',
+            value: 'const x = 1',
             inline: true,
         });
     });
 
-    it('should return null when no code-related data', () => {
+    it('should detect JetBrains paste as block for multiline', () => {
+        const data = createMockDataTransfer({
+            [DataTransferType.Text]: 'const x = 1\nconst y = 2',
+            [DataTransferType.Html]: '<pre>const x = 1\nconst y = 2</pre>',
+            [DataTransferType.Rtf]: '{\\rtf1\\fmodern JetBrains Mono}',
+        });
+        const result = getCodeData(data);
+
+        expect(result).toEqual({
+            editor: 'jetbrains',
+            value: 'const x = 1\nconst y = 2',
+            inline: false,
+        });
+    });
+
+    it('should return null when no code-related data (let ProseMirror handle it)', () => {
         const data = createMockDataTransfer({
             [DataTransferType.Text]: 'some text',
             [DataTransferType.Html]: '<div>some text</div>',
         });
         expect(getCodeData(data)).toBeNull();
     });
+
+    it('should return null for HTML with code tags (let ProseMirror handle it)', () => {
+        const html = '<pre><code>const x = 1;</code></pre>';
+        const data = createMockDataTransfer({
+            [DataTransferType.Text]: 'const x = 1;',
+            [DataTransferType.Html]: html,
+        });
+        expect(getCodeData(data)).toBeNull();
+    });
 });

src/extensions/markdown/CodeBlock/handle-paste.ts

@@ -4,7 +4,7 @@ import dd from 'ts-dedent';
 
 import {getLoggerFromState} from '#core';
 import type {EditorProps} from '#pm/view';
-import {DataTransferType, isVSCode, tryParseVSCodeData} from 'src/utils/clipboard';
+import {DataTransferType, isJetBrains, isVSCode, tryParseVSCodeData} from 'src/utils/clipboard';
 
 import {codeBlockType} from './const';
 
@@ -96,9 +96,8 @@ export function getCodeData(data: DataTransfer): CodePasteData | null {
         return processVSCodePaste(data, text);
     }
 
-    const html = data.getData('text/html') || '';
-    if (html && (html.includes('<pre') || html.includes('<code'))) {
-        return processHtmlPaste(data, text);
+    if (isJetBrains(data)) {
+        return processJetBrainsPaste(text);
     }
 
     return null;
@@ -114,20 +113,14 @@ function processVSCodePaste(data: DataTransfer, text: string): CodePasteData {
     };
 }
 
-function processHtmlPaste(data: DataTransfer, text: string): CodePasteData {
-    const html = data.getData('text/html') || '';
-    const inline = isInlineCodeFromHtml(html, text);
+function processJetBrainsPaste(text: string): CodePasteData {
     return {
-        editor: 'code-editor',
-        value: inline ? text : dd(text),
-        inline,
+        editor: 'jetbrains',
+        value: dd(text),
+        inline: isInlineCode(text),
     };
 }
 
 export function isInlineCode(text: string): boolean {
     return !text.includes('\n');
 }
-
-function isInlineCodeFromHtml(html: string, text: string): boolean {
-    return html.includes('<code') && !html.includes('<pre') && isInlineCode(text);
-}

src/utils/clipboard.ts

@@ -29,6 +29,12 @@ export function isVSCode(data: DataTransfer): boolean {
     return data.types.includes(DataTransferType.VSCodeData);
 }
 
+export function isJetBrains(data: DataTransfer): boolean {
+    if (!data.types.includes(DataTransferType.Rtf)) return false;
+    const rtf = data.getData(DataTransferType.Rtf);
+    return rtf.indexOf('\\fmodern JetBrains') > 0;
+}
+
 export type VSCodeData = {
     version: number;
     isFromEmptySelection: boolean;