|
|
@@ -48,6 +48,95 @@ describe( 'CodeBlockEditing', () => {
|
|
|
expect( CodeBlockEditing.requires ).to.have.members( [ ShiftEnter ] );
|
|
|
} );
|
|
|
|
|
|
+ describe( 'config', () => {
|
|
|
+ describe( 'languages', () => {
|
|
|
+ describe( 'default value', () => {
|
|
|
+ it( 'should be set', () => {
|
|
|
+ expect( editor.config.get( 'codeBlock.languages' ) ).to.deep.equal( [
|
|
|
+ { class: 'plaintext', label: 'Plain text' },
|
|
|
+ { class: 'c', label: 'C' },
|
|
|
+ { class: 'cs', label: 'C#' },
|
|
|
+ { class: 'cpp', label: 'C++' },
|
|
|
+ { class: 'css', label: 'CSS' },
|
|
|
+ { class: 'diff', label: 'Diff' },
|
|
|
+ { class: 'xml', label: 'HTML/XML' },
|
|
|
+ { class: 'java', label: 'Java' },
|
|
|
+ { class: 'javascript', label: 'JavaScript' },
|
|
|
+ { class: 'php', label: 'PHP' },
|
|
|
+ { class: 'python', label: 'Python' },
|
|
|
+ { class: 'ruby', label: 'Ruby' },
|
|
|
+ { class: 'typescript', label: 'TypeScript' }
|
|
|
+ ] );
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should be recognized when loading data', () => {
|
|
|
+ return ClassicTestEditor.create(
|
|
|
+ '<pre><code class="foo">bar</code></pre>' +
|
|
|
+ '<pre><code class="bar">baz</code></pre>',
|
|
|
+ {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { class: 'foo', label: 'Foo' },
|
|
|
+ { class: 'bar', label: 'Bar' },
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal(
|
|
|
+ '<codeBlock language="foo">[]bar</codeBlock>' +
|
|
|
+ '<codeBlock language="bar">baz</codeBlock>'
|
|
|
+ );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should use the first if the code in data has no language', () => {
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( '<pre><code>bar</code></pre>', {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { class: 'foo', label: 'Foo' },
|
|
|
+ { class: 'bar', label: 'Bar' }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should use the first if the code in data has an invalid language', () => {
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( '<pre><code class="baz">bar</code></pre>', {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { class: 'foo', label: 'Foo' },
|
|
|
+ { class: 'bar', label: 'Bar' }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
it( 'adds a codeBlock command', () => {
|
|
|
expect( editor.commands.get( 'codeBlock' ) ).to.be.instanceOf( CodeBlockCommand );
|
|
|
} );
|
|
|
@@ -62,13 +151,13 @@ describe( 'CodeBlockEditing', () => {
|
|
|
expect( model.schema.checkChild( [ '$root', 'codeBlock' ], 'codeBlock' ) ).to.equal( false );
|
|
|
} );
|
|
|
|
|
|
- it( 'disallows all attributes for codeBlock', () => {
|
|
|
- setModelData( model, '<codeBlock>f[o]o</codeBlock>' );
|
|
|
+ it( 'disallows all attributes (except "language") for codeBlock', () => {
|
|
|
+ setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'alignment', { value: 'right' } );
|
|
|
editor.execute( 'bold' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock>f[o]o</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should force shiftEnter command when pressing enter inside a codeBlock', () => {
|
|
|
@@ -109,32 +198,35 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
describe( 'editing pipeline m -> v', () => {
|
|
|
it( 'should convert empty codeBlock to empty pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock></codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
|
|
|
|
|
|
- expect( getViewData( view ) ).to.equal( '<pre><code>[]</code></pre>' );
|
|
|
+ expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="plaintext">[]</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert non-empty codeBlock to pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock>Foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo</codeBlock>' );
|
|
|
|
|
|
- expect( getViewData( view ) ).to.equal( '<pre><code>{}Foo</code></pre>' );
|
|
|
+ expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="plaintext">{}Foo</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #1', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'Foo<softBreak></softBreak>' +
|
|
|
'Bar<softBreak></softBreak>' +
|
|
|
'Biz' +
|
|
|
'</codeBlock>'
|
|
|
);
|
|
|
|
|
|
- expect( getViewData( view ) ).to.equal( '<pre><code>{}Foo<br></br>Bar<br></br>Biz</code></pre>' );
|
|
|
+ expect( getViewData( view ) ).to.equal(
|
|
|
+ '<pre data-language="Plain text">' +
|
|
|
+ '<code class="plaintext">{}Foo<br></br>Bar<br></br>Biz</code>' +
|
|
|
+ '</pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'Foo' +
|
|
|
@@ -143,26 +235,29 @@ describe( 'CodeBlockEditing', () => {
|
|
|
'</codeBlock>'
|
|
|
);
|
|
|
|
|
|
- expect( getViewData( view ) ).to.equal( '<pre><code>[]<br></br><br></br>Foo<br></br><br></br></code></pre>' );
|
|
|
+ expect( getViewData( view ) ).to.equal(
|
|
|
+ '<pre data-language="Plain text">' +
|
|
|
+ '<code class="plaintext">[]<br></br><br></br>Foo<br></br><br></br></code>' +
|
|
|
+ '</pre>' );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
describe( 'data pipeline m -> v conversion ', () => {
|
|
|
it( 'should convert empty codeBlock to empty pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock></codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
|
|
|
|
|
|
- expect( editor.getData( { trim: 'none' } ) ).to.equal( '<pre><code> </code></pre>' );
|
|
|
+ expect( editor.getData( { trim: 'none' } ) ).to.equal( '<pre><code class="plaintext"> </code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert non-empty codeBlock to pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock>Foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo</codeBlock>' );
|
|
|
|
|
|
- expect( editor.getData() ).to.equal( '<pre><code>Foo</code></pre>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<pre><code class="plaintext">Foo</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #1', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'Foo<softBreak></softBreak>' +
|
|
|
'Bar<softBreak></softBreak>' +
|
|
|
'Biz' +
|
|
|
@@ -170,12 +265,12 @@ describe( 'CodeBlockEditing', () => {
|
|
|
'<paragraph>A<softBreak></softBreak>B</paragraph>'
|
|
|
);
|
|
|
|
|
|
- expect( editor.getData() ).to.equal( '<pre><code>Foo\nBar\nBiz</code></pre><p>A<br>B</p>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<pre><code class="plaintext">Foo\nBar\nBiz</code></pre><p>A<br>B</p>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'Foo' +
|
|
|
@@ -184,15 +279,18 @@ describe( 'CodeBlockEditing', () => {
|
|
|
'</codeBlock>'
|
|
|
);
|
|
|
|
|
|
- expect( editor.getData() ).to.equal( '<pre><code>\n\nFoo\n\n</code></pre>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<pre><code class="plaintext">\n\nFoo\n\n</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with html content', () => {
|
|
|
- setModelData( model, '<codeBlock>[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => writer.insertText( '<div><p>Foo</p></div>', model.document.selection.getFirstPosition() ) );
|
|
|
|
|
|
- expect( editor.getData() ).to.equal( '<pre><code><div><p>Foo</p></div></code></pre>' );
|
|
|
+ expect( editor.getData() ).to.equal(
|
|
|
+ '<pre>' +
|
|
|
+ '<code class="plaintext"><div><p>Foo</p></div></code>' +
|
|
|
+ '</pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should be overridable', () => {
|
|
|
@@ -212,7 +310,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
api.writer.insert( position, api.writer.createText( '\n' ) );
|
|
|
}, { priority: 'highest' } );
|
|
|
|
|
|
- setModelData( model, '<codeBlock>Foo<softBreak></softBreak>Bar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo<softBreak></softBreak>Bar</codeBlock>' );
|
|
|
|
|
|
expect( editor.getData() ).to.equal( '<code>Foo\nBar</code>' );
|
|
|
} );
|
|
|
@@ -234,14 +332,14 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should convert pre > code to code block', () => {
|
|
|
editor.setData( '<pre><code></code></pre>' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock>[]</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert pre > code with multi-line text to code block #1', () => {
|
|
|
editor.setData( '<pre><code>foo\nbar</code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock>[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'foo' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'bar' +
|
|
|
@@ -253,7 +351,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code>\n\nfoo\n\n</code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock>[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'foo' +
|
|
|
@@ -267,7 +365,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code><p>Foo</p>\n<p>Bar</p></code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock>[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'<p>Foo</p>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<p>Bar</p>' +
|
|
|
@@ -278,13 +376,13 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should convert pre > code tag with HTML and nested pre > code tag', () => {
|
|
|
editor.setData( '<pre><code><p>Foo</p><pre>Bar</pre><p>Biz</p></code></pre>' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock>[]<p>Foo</p><pre>Bar</pre><p>Biz</p></codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]<p>Foo</p><pre>Bar</pre><p>Biz</p></codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert pre > code tag with escaped html content', () => {
|
|
|
editor.setData( '<pre><code><div><p>Foo</p></div></code></pre>' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock>[]<div><p>Foo</p></div></codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]<div><p>Foo</p></div></codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should be overridable', () => {
|
|
|
@@ -323,7 +421,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'should intercept input when selection anchored in the code block', () => {
|
|
|
- setModelData( model, '<codeBlock>f[o]o</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
|
|
|
const dataTransferMock = {
|
|
|
getData: sinon.stub().withArgs( 'text/plain' ).returns( 'bar\nbaz\n' )
|
|
|
@@ -334,7 +432,15 @@ describe( 'CodeBlockEditing', () => {
|
|
|
stop: sinon.spy()
|
|
|
} );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock>fbar\nbaz\n[]o</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal(
|
|
|
+ '<codeBlock language="css">' +
|
|
|
+ 'fbar' +
|
|
|
+ '<softBreak></softBreak>' +
|
|
|
+ 'baz' +
|
|
|
+ '<softBreak></softBreak>' +
|
|
|
+ '[]o' +
|
|
|
+ '</codeBlock>' );
|
|
|
+
|
|
|
sinon.assert.calledOnce( dataTransferMock.getData );
|
|
|
} );
|
|
|
} );
|