|
|
@@ -77,87 +77,22 @@ describe( 'CodeBlockEditing', () => {
|
|
|
describe( 'default value', () => {
|
|
|
it( 'should be set', () => {
|
|
|
expect( editor.config.get( 'codeBlock.languages' ) ).to.deep.equal( [
|
|
|
- { class: 'language-plaintext', label: 'Plain text' },
|
|
|
- { class: 'language-c', label: 'C' },
|
|
|
- { class: 'language-cs', label: 'C#' },
|
|
|
- { class: 'language-cpp', label: 'C++' },
|
|
|
- { class: 'language-css', label: 'CSS' },
|
|
|
- { class: 'language-diff', label: 'Diff' },
|
|
|
- { class: 'language-xml', label: 'HTML/XML' },
|
|
|
- { class: 'language-java', label: 'Java' },
|
|
|
- { class: 'language-javascript', label: 'JavaScript' },
|
|
|
- { class: 'language-php', label: 'PHP' },
|
|
|
- { class: 'language-python', label: 'Python' },
|
|
|
- { class: 'language-ruby', label: 'Ruby' },
|
|
|
- { class: 'language-typescript', label: 'TypeScript' }
|
|
|
+ { language: 'plaintext', label: 'Plain text' },
|
|
|
+ { language: 'c', label: 'C' },
|
|
|
+ { language: 'cs', label: 'C#' },
|
|
|
+ { language: 'cpp', label: 'C++' },
|
|
|
+ { language: 'css', label: 'CSS' },
|
|
|
+ { language: 'diff', label: 'Diff' },
|
|
|
+ { language: 'xml', label: 'HTML/XML' },
|
|
|
+ { language: 'java', label: 'Java' },
|
|
|
+ { language: 'javascript', label: 'JavaScript' },
|
|
|
+ { language: 'php', label: 'PHP' },
|
|
|
+ { language: 'python', label: 'Python' },
|
|
|
+ { language: 'ruby', label: 'Ruby' },
|
|
|
+ { language: 'typescript', label: 'TypeScript' }
|
|
|
] );
|
|
|
} );
|
|
|
} );
|
|
|
-
|
|
|
- it( 'should be recognized when loading data', () => {
|
|
|
- return ClassicTestEditor.create(
|
|
|
- '<pre><code class="language-foo">bar</code></pre>' +
|
|
|
- '<pre><code class="language-bar">baz</code></pre>',
|
|
|
- {
|
|
|
- plugins: [ CodeBlockEditing ],
|
|
|
- codeBlock: {
|
|
|
- languages: [
|
|
|
- { class: 'language-foo', label: 'Foo' },
|
|
|
- { class: 'language-bar', label: 'Bar' },
|
|
|
- ]
|
|
|
- }
|
|
|
- } )
|
|
|
- .then( editor => {
|
|
|
- model = editor.model;
|
|
|
-
|
|
|
- expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-foo">[]bar</codeBlock>' +
|
|
|
- '<codeBlock language="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: 'language-foo', label: 'Foo' },
|
|
|
- { class: 'language-bar', label: 'Bar' }
|
|
|
- ]
|
|
|
- }
|
|
|
- } )
|
|
|
- .then( editor => {
|
|
|
- model = editor.model;
|
|
|
-
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="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: 'language-foo', label: 'Foo' },
|
|
|
- { class: 'language-bar', label: 'Bar' }
|
|
|
- ]
|
|
|
- }
|
|
|
- } )
|
|
|
- .then( editor => {
|
|
|
- model = editor.model;
|
|
|
-
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-foo">[]bar</codeBlock>' );
|
|
|
-
|
|
|
- return editor.destroy();
|
|
|
- } );
|
|
|
- } );
|
|
|
} );
|
|
|
|
|
|
describe( 'indentSequence', () => {
|
|
|
@@ -196,12 +131,12 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'disallows all attributes (except "language") for codeBlock', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">f[o]o</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'alignment', { value: 'right' } );
|
|
|
editor.execute( 'bold' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">f[o]o</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
describe( 'tab key handling', () => {
|
|
|
@@ -222,7 +157,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'should execute indentCodeBlock command on tab key', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
|
|
|
|
|
|
editor.editing.view.document.fire( 'keydown', domEvtDataStub );
|
|
|
|
|
|
@@ -235,9 +170,9 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should execute outdentCodeBlock command on Shift+Tab keystroke', () => {
|
|
|
domEvtDataStub.keyCode += getCode( 'Shift' );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
|
|
|
|
|
|
- // '<codeBlock language="language-plaintext"> []foo</codeBlock>
|
|
|
+ // '<codeBlock language="plaintext"> []foo</codeBlock>
|
|
|
model.change( writer => {
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ) );
|
|
|
} );
|
|
|
@@ -263,7 +198,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should not indent or outdent if alt+tab is pressed', () => {
|
|
|
domEvtDataStub.keyCode += getCode( 'alt' );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
|
|
|
|
|
|
editor.editing.view.document.fire( 'keydown', domEvtDataStub );
|
|
|
|
|
|
@@ -308,46 +243,46 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
describe( 'indentation retention', () => {
|
|
|
it( 'should work when indentation is with spaces', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css"> foo[]</codeBlock>
|
|
|
+ // <codeBlock language="css"> foo[]</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> foo<softBreak></softBreak> []</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> foo<softBreak></softBreak> []</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css"> foo[]</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css"> foo[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should work when indentation is with tabs', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css"> foo[]</codeBlock>
|
|
|
+ // <codeBlock language="css"> foo[]</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> foo<softBreak></softBreak> []</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> foo<softBreak></softBreak> []</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css"> foo[]</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css"> foo[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should retain only the last line', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>bar[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>bar[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css"> foo<softBreak></softBreak> bar[]</codeBlock>
|
|
|
+ // <codeBlock language="css"> foo<softBreak></softBreak> bar[]</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 4 );
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
@@ -355,37 +290,37 @@ describe( 'CodeBlockEditing', () => {
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> foo<softBreak></softBreak> bar<softBreak></softBreak> []</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> foo<softBreak></softBreak> bar<softBreak></softBreak> []</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> foo<softBreak></softBreak> bar[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> foo<softBreak></softBreak> bar[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should retain when the selection is non–collapsed', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">f[o]o</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css"> f[o]o</codeBlock>
|
|
|
+ // <codeBlock language="css"> f[o]o</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> f<softBreak></softBreak> []o</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> f<softBreak></softBreak> []o</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css"> f[o]o</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css"> f[o]o</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should consider only leading white-spaces', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css"> foo []</codeBlock>
|
|
|
+ // <codeBlock language="css"> foo []</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 3 );
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
@@ -393,25 +328,25 @@ describe( 'CodeBlockEditing', () => {
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> foo <softBreak></softBreak> []</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> foo <softBreak></softBreak> []</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css"> foo []</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css"> foo []</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not work when there is some non-whitespace character', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css">foo []</codeBlock>
|
|
|
+ // <codeBlock language="css">foo []</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 3 );
|
|
|
} );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo <softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css">foo <softBreak></softBreak>[]</codeBlock>' );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
@@ -420,17 +355,17 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should leave the block when pressed twice at the end', () => {
|
|
|
const spy = sinon.spy( editor.editing.view, 'scrollToTheSelection' );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo</codeBlock>' +
|
|
|
+ '<codeBlock language="css">foo</codeBlock>' +
|
|
|
'<paragraph>[]</paragraph>'
|
|
|
);
|
|
|
|
|
|
@@ -438,70 +373,70 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">foo[]</codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="css">foo[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when the selection is not collapsed', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">f[oo<softBreak></softBreak>]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">f[oo<softBreak></softBreak>]</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">f<softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css">f<softBreak></softBreak>[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when pressed twice when in the middle of the code', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">fo[]o</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">fo[]o</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">fo<softBreak></softBreak>[]o</codeBlock>' );
|
|
|
+ '<codeBlock language="css">fo<softBreak></softBreak>[]o</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">fo<softBreak></softBreak><softBreak></softBreak>[]o</codeBlock>' );
|
|
|
+ '<codeBlock language="css">fo<softBreak></softBreak><softBreak></softBreak>[]o</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when pressed twice at the beginning of the code', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[]foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[]foo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak>[]foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak>[]foo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak><softBreak></softBreak>[]foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak><softBreak></softBreak>[]foo</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when pressed shift+enter twice at the end of the code', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent( { isSoft: true } ) );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo<softBreak></softBreak><softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css">foo<softBreak></softBreak><softBreak></softBreak>[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should clean up the last line if has white–space characters only', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => {
|
|
|
- // <codeBlock language="language-css">foo<softBreak></softBreak> []</codeBlock>
|
|
|
+ // <codeBlock language="css">foo<softBreak></softBreak> []</codeBlock>
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 4 );
|
|
|
} );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo</codeBlock><paragraph>[]</paragraph>' );
|
|
|
+ '<codeBlock language="css">foo</codeBlock><paragraph>[]</paragraph>' );
|
|
|
} );
|
|
|
} );
|
|
|
|
|
|
@@ -509,62 +444,62 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should leave the block when pressed at the beginning in a new line', () => {
|
|
|
const spy = sinon.spy( editor.editing.view, 'scrollToTheSelection' );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
'<paragraph>[]</paragraph>' +
|
|
|
- '<codeBlock language="language-css">foo</codeBlock>'
|
|
|
+ '<codeBlock language="css">foo</codeBlock>'
|
|
|
);
|
|
|
|
|
|
sinon.assert.calledOnce( spy );
|
|
|
|
|
|
editor.execute( 'undo' );
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when the selection is not collapsed (#1)', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[f]<softBreak></softBreak>oo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[f]<softBreak></softBreak>oo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak>[]<softBreak></softBreak>oo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak>[]<softBreak></softBreak>oo</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when the selection is not collapsed (#2)', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[<softBreak></softBreak>oo]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[<softBreak></softBreak>oo]</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak>[]</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak>[]</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when pressed shift+enter at the beginning of the code', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent( { isSoft: true } ) );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak>[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak>[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when there is some text after the selection', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[]foo<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[]foo<softBreak></softBreak>foo</codeBlock>' );
|
|
|
|
|
|
viewDoc.fire( 'enter', getEvent() );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"><softBreak></softBreak>[]foo<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"><softBreak></softBreak>[]foo<softBreak></softBreak>foo</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not leave the block when there is some text before the selection', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[]<softBreak></softBreak>foo</codeBlock>' );
|
|
|
|
|
|
- // <codeBlock language="language-css"> []<softBreak></softBreak>foo</codeBlock>
|
|
|
+ // <codeBlock language="css"> []<softBreak></softBreak>foo</codeBlock>
|
|
|
model.change( writer => {
|
|
|
writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 0 );
|
|
|
} );
|
|
|
@@ -573,7 +508,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
// Extra spaces before "[]" come from the indentation retention mechanism.
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css"> <softBreak></softBreak> []<softBreak></softBreak>foo</codeBlock>' );
|
|
|
+ '<codeBlock language="css"> <softBreak></softBreak> []<softBreak></softBreak>foo</codeBlock>' );
|
|
|
} );
|
|
|
} );
|
|
|
} );
|
|
|
@@ -638,20 +573,20 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
describe( 'editing pipeline m -> v', () => {
|
|
|
it( 'should convert empty codeBlock to empty pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext"></codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="language-plaintext">[]</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert non-empty codeBlock to pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">Foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo</codeBlock>' );
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="language-plaintext">{}Foo</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #1', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-plaintext">' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'Foo<softBreak></softBreak>' +
|
|
|
'Bar<softBreak></softBreak>' +
|
|
|
'Biz' +
|
|
|
@@ -666,7 +601,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-plaintext">' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'Foo' +
|
|
|
@@ -696,7 +631,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
const view = editor.editing.view;
|
|
|
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-plaintext">foo</codeBlock>'
|
|
|
+ '<codeBlock language="plaintext">foo</codeBlock>'
|
|
|
);
|
|
|
|
|
|
expect( getViewData( view ) ).to.equal(
|
|
|
@@ -709,24 +644,55 @@ describe( 'CodeBlockEditing', () => {
|
|
|
return editor.destroy();
|
|
|
} );
|
|
|
} );
|
|
|
+
|
|
|
+ it( 'should not set the class on the <code> if it was configured so', () => {
|
|
|
+ const element = document.createElement( 'div' );
|
|
|
+ document.body.appendChild( element );
|
|
|
+
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( element, {
|
|
|
+ plugins: [ CodeBlockEditing, AlignmentEditing, BoldEditing, Enter, Paragraph ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'cpp', label: 'C++', class: '' },
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( newEditor => {
|
|
|
+ const editor = newEditor;
|
|
|
+ const model = editor.model;
|
|
|
+ const view = editor.editing.view;
|
|
|
+
|
|
|
+ setModelData( model, '<codeBlock language="cpp">foo</codeBlock>' );
|
|
|
+
|
|
|
+ expect( getViewData( view ) ).to.equal(
|
|
|
+ '<pre data-language="C++">' +
|
|
|
+ '<code>{}foo</code>' +
|
|
|
+ '</pre>' );
|
|
|
+
|
|
|
+ element.remove();
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
describe( 'data pipeline m -> v conversion ', () => {
|
|
|
it( 'should convert empty codeBlock to empty pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext"></codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
|
|
|
|
|
|
expect( editor.getData( { trim: 'none' } ) ).to.equal( '<pre><code class="language-plaintext"> </code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert non-empty codeBlock to pre tag', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">Foo</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo</codeBlock>' );
|
|
|
|
|
|
expect( editor.getData() ).to.equal( '<pre><code class="language-plaintext">Foo</code></pre>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #1', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-plaintext">' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'Foo<softBreak></softBreak>' +
|
|
|
'Bar<softBreak></softBreak>' +
|
|
|
'Biz' +
|
|
|
@@ -739,7 +705,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-plaintext">' +
|
|
|
+ '<codeBlock language="plaintext">' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'Foo' +
|
|
|
@@ -752,7 +718,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'should convert codeBlock with html content', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">[]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">[]</codeBlock>' );
|
|
|
|
|
|
model.change( writer => writer.insertText( '<div><p>Foo</p></div>', model.document.selection.getFirstPosition() ) );
|
|
|
|
|
|
@@ -779,10 +745,36 @@ describe( 'CodeBlockEditing', () => {
|
|
|
api.writer.insert( position, api.writer.createText( '\n' ) );
|
|
|
}, { priority: 'highest' } );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-plaintext">Foo<softBreak></softBreak>Bar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="plaintext">Foo<softBreak></softBreak>Bar</codeBlock>' );
|
|
|
|
|
|
expect( editor.getData() ).to.equal( '<code>Foo\nBar</code>' );
|
|
|
} );
|
|
|
+
|
|
|
+ it( 'should not set the class on the <code> if it was configured so', () => {
|
|
|
+ const element = document.createElement( 'div' );
|
|
|
+ document.body.appendChild( element );
|
|
|
+
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( element, {
|
|
|
+ plugins: [ CodeBlockEditing, AlignmentEditing, BoldEditing, Enter, Paragraph ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'cpp', label: 'C++', class: '' },
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( newEditor => {
|
|
|
+ const editor = newEditor;
|
|
|
+ const model = editor.model;
|
|
|
+
|
|
|
+ setModelData( model, '<codeBlock language="cpp">foo</codeBlock>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<pre><code>foo</code></pre>' );
|
|
|
+
|
|
|
+ element.remove();
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
describe( 'data pipeline v -> m conversion ', () => {
|
|
|
@@ -801,14 +793,14 @@ describe( 'CodeBlockEditing', () => {
|
|
|
it( 'should convert pre > code to code block', () => {
|
|
|
editor.setData( '<pre><code></code></pre>' );
|
|
|
|
|
|
- expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">[]</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 language="language-plaintext">[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'foo' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'bar' +
|
|
|
@@ -820,7 +812,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code>\n\nfoo\n\n</code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-plaintext">[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'foo' +
|
|
|
@@ -834,7 +826,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code><p>Foo</p>\n<p>Bar</p></code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-plaintext">[]' +
|
|
|
+ '<codeBlock language="plaintext">[]' +
|
|
|
'<p>Foo</p>' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'<p>Bar</p>' +
|
|
|
@@ -846,13 +838,13 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code><p>Foo</p><pre>Bar</pre><p>Biz</p></code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-plaintext">[]<p>Foo</p><pre>Bar</pre><p>Biz</p></codeBlock>' );
|
|
|
+ '<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 language="language-plaintext">[]<div><p>Foo</p></div></codeBlock>' );
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]<div><p>Foo</p></div></codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should be overridable', () => {
|
|
|
@@ -878,7 +870,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
// Note: The empty <paragraph> should not be here. It's a conversion/auto–paragraphing bug.
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
'<paragraph>[]foo</paragraph>' +
|
|
|
- '<codeBlock language="language-plaintext">x</codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">x</codeBlock>' +
|
|
|
'<paragraph>bar</paragraph>' +
|
|
|
'<paragraph></paragraph>' );
|
|
|
} );
|
|
|
@@ -887,7 +879,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
editor.setData( '<pre><code>foo</code></pre><pre><code>bar</code></pre>' );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-plaintext">[]foo</codeBlock><codeBlock language="language-plaintext">bar</codeBlock>' );
|
|
|
+ '<codeBlock language="plaintext">[]foo</codeBlock><codeBlock language="plaintext">bar</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should upcast two code blocks in a row (#2)', () => {
|
|
|
@@ -896,9 +888,9 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
// Note: The empty <paragraph> in between should not be here. It's a conversion/auto–paragraphing bug.
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-plaintext">[]foo</codeBlock>' +
|
|
|
+ '<codeBlock language="plaintext">[]foo</codeBlock>' +
|
|
|
'<paragraph> </paragraph>' +
|
|
|
- '<codeBlock language="language-plaintext">bar</codeBlock>' );
|
|
|
+ '<codeBlock language="plaintext">bar</codeBlock>' );
|
|
|
} );
|
|
|
|
|
|
it( 'should not convert when modelCursor and its ancestors disallow to insert codeBlock', () => {
|
|
|
@@ -913,6 +905,104 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
expect( getModelData( model, { rootName: 'title', withoutSelection: true } ) ).to.equal( '' );
|
|
|
} );
|
|
|
+
|
|
|
+ describe( 'config.codeBlock.languages', () => {
|
|
|
+ it( 'should be respected when upcasting', () => {
|
|
|
+ return ClassicTestEditor.create(
|
|
|
+ '<pre><code class="language-foo">bar</code></pre>' +
|
|
|
+ '<pre><code class="language-bar">baz</code></pre>' +
|
|
|
+ '<pre><code class="qux">qux</code></pre>',
|
|
|
+ {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'foo', label: 'Foo' },
|
|
|
+ { language: 'bar', label: 'Bar' },
|
|
|
+ { language: 'qux', label: 'Qux', class: 'qux' },
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal(
|
|
|
+ '<codeBlock language="foo">[]bar</codeBlock>' +
|
|
|
+ '<codeBlock language="bar">baz</codeBlock>' +
|
|
|
+ '<codeBlock language="qux">qux</codeBlock>'
|
|
|
+ );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should be respected when upcasting and a language has an empty class configured', () => {
|
|
|
+ return ClassicTestEditor.create(
|
|
|
+ '<pre><code class="language-foo">bar</code></pre>' +
|
|
|
+ '<pre><code class="language-bar">baz</code></pre>' +
|
|
|
+ '<pre><code>qux</code></pre>',
|
|
|
+ {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'foo', label: 'Foo' },
|
|
|
+ { language: 'bar', label: 'Bar' },
|
|
|
+ { language: 'qux', label: 'Qux', class: '' },
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal(
|
|
|
+ '<codeBlock language="foo">[]bar</codeBlock>' +
|
|
|
+ '<codeBlock language="bar">baz</codeBlock>' +
|
|
|
+ '<codeBlock language="qux">qux</codeBlock>'
|
|
|
+ );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should upcast using the first language if the code in data has no language', () => {
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( '<pre><code>bar</code></pre>', {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'foo', label: 'Foo' },
|
|
|
+ { language: 'bar', label: 'Bar' }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should upast using the first language if the code in data has an invalid language', () => {
|
|
|
+ return ClassicTestEditor
|
|
|
+ .create( '<pre><code class="baz">bar</code></pre>', {
|
|
|
+ plugins: [ CodeBlockEditing ],
|
|
|
+ codeBlock: {
|
|
|
+ languages: [
|
|
|
+ { language: 'foo', label: 'Foo' },
|
|
|
+ { language: 'bar', label: 'Bar' }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ } )
|
|
|
+ .then( editor => {
|
|
|
+ model = editor.model;
|
|
|
+
|
|
|
+ expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
|
|
|
+
|
|
|
+ return editor.destroy();
|
|
|
+ } );
|
|
|
+ } );
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
describe( 'clipboard integration', () => {
|
|
|
@@ -933,7 +1023,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'should intercept input when selection anchored in the code block', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">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' )
|
|
|
@@ -945,7 +1035,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
expect( getModelData( model ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">' +
|
|
|
+ '<codeBlock language="css">' +
|
|
|
'fbar' +
|
|
|
'<softBreak></softBreak>' +
|
|
|
'baz' +
|
|
|
@@ -958,40 +1048,40 @@ describe( 'CodeBlockEditing', () => {
|
|
|
|
|
|
describe( 'getSelectedContent()', () => {
|
|
|
it( 'should not engage when there is nothing selected', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">fo[]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">fo[]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal( '' );
|
|
|
} );
|
|
|
|
|
|
it( 'should wrap a partial multi-line selection into a code block (#1)', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">fo[o<softBreak></softBreak>b]ar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">fo[o<softBreak></softBreak>b]ar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">o<softBreak></softBreak>b</codeBlock>'
|
|
|
+ '<codeBlock language="css">o<softBreak></softBreak>b</codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'should wrap a partial multi-line selection into a code block (#2)', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">fo[o<softBreak></softBreak>]bar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">fo[o<softBreak></softBreak>]bar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">o<softBreak></softBreak></codeBlock>'
|
|
|
+ '<codeBlock language="css">o<softBreak></softBreak></codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'should wrap a partial multi-line selection into a code block (#3)', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[foo<softBreak></softBreak>bar]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[foo<softBreak></softBreak>bar]</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo<softBreak></softBreak>bar</codeBlock>'
|
|
|
+ '<codeBlock language="css">foo<softBreak></softBreak>bar</codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'should wrap a complete single-line selection into a code block', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">[foo]</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[foo]</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">foo</codeBlock>'
|
|
|
+ '<codeBlock language="css">foo</codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
@@ -1000,7 +1090,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
allowAttributes: 'code'
|
|
|
} );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-css">[fo]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">[fo]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
'<$text code="true">fo</$text>'
|
|
|
@@ -1012,7 +1102,7 @@ describe( 'CodeBlockEditing', () => {
|
|
|
allowAttributes: 'code'
|
|
|
} );
|
|
|
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
'<$text code="true">a</$text>'
|
|
|
@@ -1020,35 +1110,35 @@ describe( 'CodeBlockEditing', () => {
|
|
|
} );
|
|
|
|
|
|
it( 'should now wrap a partial single-line selection into an inline code when the attribute is disallowed', () => {
|
|
|
- setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
|
|
|
+ setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal( 'a' );
|
|
|
} );
|
|
|
|
|
|
it( 'should preserve a code block in a cross-selection (#1)', () => {
|
|
|
setModelData( model,
|
|
|
- '<paragraph>[x</paragraph><codeBlock language="language-css">fo]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
+ '<paragraph>[x</paragraph><codeBlock language="css">fo]o<softBreak></softBreak>bar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<paragraph>x</paragraph><codeBlock language="language-css">fo</codeBlock>'
|
|
|
+ '<paragraph>x</paragraph><codeBlock language="css">fo</codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'should preserve a code block in a cross-selection (#2)', () => {
|
|
|
setModelData( model,
|
|
|
- '<paragraph>[x</paragraph><codeBlock language="language-css">foo<softBreak></softBreak>b]ar</codeBlock>' );
|
|
|
+ '<paragraph>[x</paragraph><codeBlock language="css">foo<softBreak></softBreak>b]ar</codeBlock>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<paragraph>x</paragraph><codeBlock language="language-css">foo<softBreak></softBreak>b</codeBlock>'
|
|
|
+ '<paragraph>x</paragraph><codeBlock language="css">foo<softBreak></softBreak>b</codeBlock>'
|
|
|
);
|
|
|
} );
|
|
|
|
|
|
it( 'should preserve a code block in a cross-selection (#3)', () => {
|
|
|
setModelData( model,
|
|
|
- '<codeBlock language="language-css">foo<softBreak></softBreak>b[ar</codeBlock><paragraph>x]</paragraph>' );
|
|
|
+ '<codeBlock language="css">foo<softBreak></softBreak>b[ar</codeBlock><paragraph>x]</paragraph>' );
|
|
|
|
|
|
expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
|
|
|
- '<codeBlock language="language-css">ar</codeBlock><paragraph>x</paragraph>'
|
|
|
+ '<codeBlock language="css">ar</codeBlock><paragraph>x</paragraph>'
|
|
|
);
|
|
|
} );
|
|
|
} );
|