ソースを参照

Merge branch 't/ckeditor5/436' into i/5668

Aleksander Nowodzinski 6 年 前
コミット
85e088355e

+ 19 - 19
packages/ckeditor5-code-block/src/codeblock.js

@@ -64,7 +64,7 @@ export default class CodeBlock extends Plugin {
  * The code block language descriptor. See {@link module:code-block/codeblock~CodeBlockConfig#languages} to learn more.
  *
  *		{
- *			 class: 'javascript',
+ *			 class: 'language-javascript',
  *			 label: 'JavaScript'
  *		}
  *
@@ -88,11 +88,11 @@ export default class CodeBlock extends Plugin {
  *			.create( editorElement, {
  *				codeBlock: {
  *					languages: [
- * 						{ class: 'plaintext', label: 'Plain text' }, // The default language.
- *						{ class: 'php', label: 'PHP' },
- *						{ class: 'java', label: 'Java' },
- *						{ class: 'javascript', label: 'JavaScript' },
- *						{ class: 'python', label: 'Python' }
+ * 						{ class: 'language-plaintext', label: 'Plain text' }, // The default language.
+ *						{ class: 'language-php', label: 'PHP' },
+ *						{ class: 'language-java', label: 'Java' },
+ *						{ class: 'language-javascript', label: 'JavaScript' },
+ *						{ class: 'language-python', label: 'Python' }
  *					]
  *				}
  *		} )
@@ -102,19 +102,19 @@ export default class CodeBlock extends Plugin {
  * The default value is as follows:
  *
  *		languages: [
- *			{ class: 'plaintext', label: 'Plain text' }, // The default language.
- *			{ 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' },
+ *			{ class: 'language-plaintext', label: 'Plain text' }, // The default language.
+ *			{ 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' },
  *		]
  *
  * **Note**: The first language defined in the configuration is considered the default one. This means it will be

+ 2 - 6
packages/ckeditor5-code-block/src/codeblockcommand.js

@@ -46,7 +46,7 @@ export default class CodeBlockCommand extends Command {
 		const editor = this.editor;
 		const model = editor.model;
 		const selection = model.document.selection;
-		const firstLanguageInConfig = editor.config.get( 'codeBlock' ).languages[ 0 ];
+		const firstLanguageInConfig = editor.config.get( 'codeBlock.languages' ).shift();
 
 		const blocks = Array.from( selection.getSelectedBlocks() );
 		const value = ( options.forceValue === undefined ) ? !this.value : options.forceValue;
@@ -156,9 +156,5 @@ function canBeCodeBlock( schema, element ) {
 		return false;
 	}
 
-	if ( !schema.checkChild( element.parent, 'codeBlock' ) ) {
-		return false;
-	}
-
-	return true;
+	return schema.checkChild( element.parent, 'codeBlock' );
 }

+ 25 - 27
packages/ckeditor5-code-block/src/codeblockediting.js

@@ -11,6 +11,7 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ShiftEnter from '@ckeditor/ckeditor5-enter/src/shiftenter';
 import CodeBlockCommand from './codeblockcommand';
 import IndentCodeBlockCommand from './indentcodeblockcommand';
+import OutdentCodeBlockCommand from './outdentcodeblockcommand';
 import {
 	getLocalizedLanguageDefinitions,
 	getLeadingWhiteSpaces,
@@ -54,23 +55,23 @@ export default class CodeBlockEditing extends Plugin {
 
 		editor.config.define( 'codeBlock', {
 			languages: [
-				{ 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' },
+				{ 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' },
 			],
 
 			// A single tab.
-			indentSequence: '	'
+			indentSequence: '\t'
 		} );
 	}
 
@@ -90,8 +91,8 @@ export default class CodeBlockEditing extends Plugin {
 		editor.commands.add( 'codeBlock', new CodeBlockCommand( editor ) );
 
 		// Commands that change the indentation.
-		editor.commands.add( 'indentCodeBlock', new IndentCodeBlockCommand( editor, 'forward' ) );
-		editor.commands.add( 'outdentCodeBlock', new IndentCodeBlockCommand( editor, 'backward' ) );
+		editor.commands.add( 'indentCodeBlock', new IndentCodeBlockCommand( editor ) );
+		editor.commands.add( 'outdentCodeBlock', new OutdentCodeBlockCommand( editor ) );
 
 		const getCommandExecuter = commandName => {
 			return ( data, cancel ) => {
@@ -107,23 +108,20 @@ export default class CodeBlockEditing extends Plugin {
 		editor.keystrokes.set( 'Tab', getCommandExecuter( 'indentCodeBlock' ) );
 		editor.keystrokes.set( 'Shift+Tab', getCommandExecuter( 'outdentCodeBlock' ) );
 
-		// Schema.
 		schema.register( 'codeBlock', {
-			inheritAllFrom: '$block',
+			allowWhere: '$block',
+			isBlock: true,
 			allowAttributes: [ 'language' ]
 		} );
 
-		// Disallow codeBlock in codeBlock.
-		schema.addChildCheck( ( context, childDef ) => {
-			if ( context.endsWith( 'codeBlock' ) && childDef.name === 'codeBlock' ) {
-				return false;
-			}
+		schema.extend( '$text', {
+			allowIn: 'codeBlock'
 		} );
 
-		// Disallow all attributes in `codeBlock`.
-		schema.addAttributeCheck( ( context, attributeName ) => {
-			if ( context.endsWith( 'codeBlock' ) || context.endsWith( 'codeBlock $text' ) ) {
-				return attributeName === 'language';
+		// Disallow all attributes on $text inside `codeBlock`.
+		schema.addAttributeCheck( context => {
+			if ( context.endsWith( 'codeBlock $text' ) ) {
+				return false;
 			}
 		} );
 

+ 6 - 4
packages/ckeditor5-code-block/src/codeblockui.js

@@ -49,8 +49,10 @@ export default class CodeBlockUI extends Plugin {
 			splitButtonView.bind( 'isOn' ).to( command, 'value', value => !!value );
 
 			splitButtonView.on( 'execute', () => {
+				const defaultLanguageDefinition = localizedLanguageDefinitions[ 0 ];
+
 				editor.execute( 'codeBlock', {
-					language: localizedLanguageDefinitions[ 0 ].class,
+					language: defaultLanguageDefinition.class,
 				} );
 
 				editor.editing.view.focus();
@@ -58,7 +60,7 @@ export default class CodeBlockUI extends Plugin {
 
 			dropdownView.on( 'execute', evt => {
 				editor.execute( 'codeBlock', {
-					language: evt.source._codeBlockLanguage,
+					language: evt.source._codeBlockLanguageClass,
 					forceValue: true
 				} );
 
@@ -91,14 +93,14 @@ export default class CodeBlockUI extends Plugin {
 			const definition = {
 				type: 'button',
 				model: new Model( {
-					_codeBlockLanguage: languageDef.class,
+					_codeBlockLanguageClass: languageDef.class,
 					label: languageDef.label,
 					withText: true
 				} )
 			};
 
 			definition.model.bind( 'isOn' ).to( command, 'value', value => {
-				return value === definition.model._codeBlockLanguage;
+				return value === definition.model._codeBlockLanguageClass;
 			} );
 
 			itemDefinitions.add( definition );

+ 35 - 252
packages/ckeditor5-code-block/src/indentcodeblockcommand.js

@@ -8,29 +8,22 @@
  */
 
 import Command from '@ckeditor/ckeditor5-core/src/command';
-import first from '@ckeditor/ckeditor5-utils/src/first';
-import { getLeadingWhiteSpaces } from './utils';
+import {
+	getIndentOutdentPositions,
+	isModelSelectionInCodeBlock
+} from './utils';
 
 /**
- * The code block indentation command plugin.
+ * The code block indentation increase command plugin.
  *
  * @extends module:core/command~Command
  */
 export default class IndentCodeBlockCommand extends Command {
-	constructor( editor, indentDirection ) {
+	constructor( editor ) {
 		super( editor );
 
 		/**
-		 * Determines whether this command indents (`'forward'`) or outdents (`'backward'`).
-		 *
-		 * @readonly
-		 * @private
-		 * @member {String}
-		 */
-		this._indentDirection = indentDirection;
-
-		/**
-		 * A sequence of characters added (or removed) to the line when indenting (or outdenting).
+		 * A sequence of characters added to the line when the command is executed.
 		 *
 		 * @readonly
 		 * @private
@@ -47,8 +40,8 @@ export default class IndentCodeBlockCommand extends Command {
 	}
 
 	/**
-	 * Executes the command. When the command {@link #isEnabled is enabled}, the code line(s) the selection
-	 * is anchored to will be indented or outdented.
+	 * Executes the command. When the command {@link #isEnabled is enabled}, the indentation of the
+	 * code lines in the selection will be increased.
 	 *
 	 * @fires execute
 	 */
@@ -59,10 +52,30 @@ export default class IndentCodeBlockCommand extends Command {
 		model.change( writer => {
 			const positions = getIndentOutdentPositions( model );
 
-			if ( this._indentDirection === 'forward' ) {
-				this._indentPositions( writer, positions );
-			} else {
-				this._outdentPositions( writer, positions );
+			// Indent all positions, for instance assuming the indent sequence is 4x space ("    "):
+			//
+			//		<codeBlock>^foo</codeBlock>        ->       <codeBlock>    foo</codeBlock>
+			//
+			//		<codeBlock>foo^bar</codeBlock>     ->       <codeBlock>foo    bar</codeBlock>
+			//
+			// Also, when there is more than one position:
+			//
+			//		<codeBlock>
+			//			^foobar
+			//			<softBreak></softBreak>
+			//			^bazqux
+			//		</codeBlock>
+			//
+			//		->
+			//
+			//		<codeBlock>
+			//			    foobar
+			//			<softBreak></softBreak>
+			//			    bazqux
+			//		</codeBlock>
+			//
+			for ( const position of positions ) {
+				writer.insertText( this._indentSequence, position );
 			}
 		} );
 	}
@@ -78,238 +91,8 @@ export default class IndentCodeBlockCommand extends Command {
 			return false;
 		}
 
-		const selection = this.editor.model.document.selection;
-		const firstBlock = first( selection.getSelectedBlocks() );
-
-		if ( !firstBlock || !firstBlock.is( 'codeBlock' ) ) {
-			return false;
-		}
-
-		const model = this.editor.model;
-
 		// Indent (forward) command is always enabled when there's any code block in the selection
-		// because you can always indent code lines. Outdent (backward) command on the other hand,
-		// can execute only when there is an indent character sequence in some of the lines.
-		if ( this._indentDirection === 'backward' ) {
-			return getIndentOutdentPositions( model ).some( position => {
-				return getLastOutdentableSequenceRange( model, position, this._indentSequence );
-			} );
-		}
-
-		return true;
+		// because you can always indent code lines.
+		return isModelSelectionInCodeBlock( this.editor.model.document.selection );
 	}
-
-	/**
-	 * Indent all positions, for instance assuming the indent sequence is 4x space ("    "):
-	 *
-	 *		<codeBlock>^foo</codeBlock>        ->       <codeBlock>    foo</codeBlock>
-	 *
-	 *		<codeBlock>foo^bar</codeBlock>     ->       <codeBlock>foo    bar</codeBlock>
-	 *
-	 * Also, when there is more than one position:
-	 *
-	 *		<codeBlock>
-	 *			^foobar
-	 *			<softBreak></softBreak>
-	 *			^bazqux
-	 *		</codeBlock>
-	 *
-	 *		->
-	 *
-	 *		<codeBlock>
-	 *			    foobar
-	 *			<softBreak></softBreak>
-	 *			    bazqux
-	 *		</codeBlock>
-	 *
-	 * @private
-	 * @param {module:engine/model/writer~Writer} writer
-	 * @param {Array.<module:engine/model/position~Position>} positions
-	 */
-	_indentPositions( writer, positions ) {
-		for ( const position of positions ) {
-			writer.insertText( this._indentSequence, position );
-		}
-	}
-
-	/**
-	 * Outdent all positions, for instance assuming the indent sequence is 4x space ("    "):
-	 *
-	 *		<codeBlock>^foo</codeBlock>         ->       <codeBlock>foo</codeBlock>
-	 *
-	 *		<codeBlock>    ^bar</codeBlock>     ->       <codeBlock>bar</codeBlock>
-	 *
-	 * Also, when there is more than one position:
-	 *
-	 *		<codeBlock>
-	 *			    ^foobar
-	 *			<softBreak></softBreak>
-	 *			    ^bazqux
-	 *		</codeBlock>
-	 *
-	 *		->
-	 *
-	 *		<codeBlock>
-	 *			foobar
-	 *			<softBreak></softBreak>
-	 *			bazqux
-	 *		</codeBlock>
-	 *
-	 * @private
-	 * @param {module:engine/model/writer~Writer} writer
-	 * @param {Array.<module:engine/model/position~Position>} positions
-	 */
-	_outdentPositions( writer, positions ) {
-		for ( const position of positions ) {
-			const range = getLastOutdentableSequenceRange( this.editor.model, position, this._indentSequence );
-
-			if ( range ) {
-				writer.remove( range );
-			}
-		}
-	}
-}
-
-// Returns an array of all model positions within the selection that represent code block lines.
-//
-// If the selection is collapsed, it returns the exact selection anchor position:
-//
-//		<codeBlock>[]foo</codeBlock>        ->     <codeBlock>^foo</codeBlock>
-//		<codeBlock>foo[]bar</codeBlock>     ->     <codeBlock>foo^bar</codeBlock>
-//
-// Otherwise, it returns positions **before** each text node belonging to all code blocks contained by the selection:
-//
-//		<codeBlock>                                <codeBlock>
-//		    foo[bar                                   ^foobar
-//		    <softBreak></softBreak>         ->        <softBreak></softBreak>
-//		    baz]qux                                   ^bazqux
-//		</codeBlock>                               </codeBlock>
-//
-// it also works across other non–code blocks:
-//
-//		<codeBlock>                                <codeBlock>
-//		    foo[bar                                   ^foobar
-//		</codeBlock>                               </codeBlock>
-//		<paragraph>text</paragraph>         ->     <paragraph>text</paragraph>
-//		<codeBlock>                                <codeBlock>
-//		    baz]qux                                   ^bazqux
-//		</codeBlock>                               </codeBlock>
-//
-// **Note:** The positions are in the reverse order so they do not get outdated when iterating over them and
-// the writer inserts or removes things.
-//
-// **Note:** The position is situated after the leading white spaces in the text node:
-//
-// @param {<module:engine/model/model~Model>} model
-// @returns {Array.<module:engine/model/position~Position>}
-function getIndentOutdentPositions( model ) {
-	const selection = model.document.selection;
-	const positions = [];
-
-	// When the selection is collapsed, there's only one position we can indent or outdent.
-	if ( selection.isCollapsed ) {
-		positions.push( selection.anchor );
-	}
-
-	// When the selection is NOT collapsed, collect all positions starting before text nodes
-	// (code lines) in any <codeBlock> within the selection.
-	else {
-		// Walk backward so positions we're about to collect here do not get outdated when
-		// inserting or deleting using the writer.
-		const walker = selection.getFirstRange().getWalker( {
-			ignoreElementEnd: true,
-			direction: 'backward'
-		} );
-
-		for ( const { item } of walker ) {
-			if ( item.is( 'textProxy' ) && item.parent.is( 'codeBlock' ) ) {
-				const leadingWhiteSpaces = getLeadingWhiteSpaces( item.textNode );
-				const { parent, startOffset } = item.textNode;
-
-				// Make sure the position is after all leading whitespaces in the text node.
-				const position = model.createPositionAt( parent, startOffset + leadingWhiteSpaces.length );
-
-				positions.push( position );
-			}
-		}
-	}
-
-	return positions;
-}
-
-// For a position coming from `getIndentOutdentPositions()`, it returns the range representing
-// the last occurrence of the indent sequence among the leading whitespaces of the code line the
-// position represents.
-//
-// For instance, assuming the indent sequence is 4x space ("    "):
-//
-//		<codeBlock>foo^</codeBlock>                                 ->          null
-//		<codeBlock>foo^<softBreak></softBreak>bar</codeBlock>       ->          null
-//		<codeBlock>  ^foo</codeBlock>                               ->          null
-//		<codeBlock>        ^foo</codeBlock>                         ->          <codeBlock>    [    ]foo</codeBlock>
-//		<codeBlock>    ^foo    bar</codeBlock>                      ->          <codeBlock>[    ]foo    bar</codeBlock>
-//
-// @param {<module:engine/model/model~Model>} model
-// @param {<module:engine/model/position~Position>} position
-// @param {String} sequence
-// @returns {<module:engine/model/range~Range>|null}
-function getLastOutdentableSequenceRange( model, position, sequence ) {
-	// Positions start before each text node (code line). Get the node corresponding to the position.
-	const nodeAtPosition = getCodeLineTextNodeAtPosition( position );
-
-	if ( !nodeAtPosition ) {
-		return null;
-	}
-
-	const leadingWhiteSpaces = getLeadingWhiteSpaces( nodeAtPosition );
-	const lastIndexOfSequence = leadingWhiteSpaces.lastIndexOf( sequence );
-
-	// For instance, assuming the indent sequence is 4x space ("    "):
-	//
-	//		<codeBlock>    	^foo</codeBlock>           ->             null
-	//
-	if ( lastIndexOfSequence + sequence.length !== leadingWhiteSpaces.length ) {
-		return null;
-	}
-
-	// For instance, assuming the indent sequence is 4x space ("    "):
-	//
-	//		<codeBlock>  ^foo</codeBlock>           ->             null
-	//
-	if ( lastIndexOfSequence === -1 ) {
-		return null;
-	}
-
-	const { parent, startOffset } = nodeAtPosition;
-
-	// Create a range that contains the **last** indent sequence among the leading whitespaces
-	// of the line.
-	//
-	// For instance, assuming the indent sequence is 4x space ("    "):
-	//
-	//		<codeBlock>        ^foo</codeBlock>      ->     <codeBlock>    [    ]foo</codeBlock>
-	//
-	return model.createRange(
-		model.createPositionAt( parent, startOffset + lastIndexOfSequence ),
-		model.createPositionAt( parent, startOffset + lastIndexOfSequence + sequence.length )
-	);
-}
-
-function getCodeLineTextNodeAtPosition( position ) {
-	// Positions start before each text node (code line). Get the node corresponding to the position.
-	let nodeAtPosition = position.parent.getChild( position.index );
-
-	// <codeBlock>foo^</codeBlock>
-	// <codeBlock>foo^<softBreak></softBreak>bar</codeBlock>
-	if ( !nodeAtPosition || nodeAtPosition.is( 'softBreak' ) ) {
-		nodeAtPosition = position.nodeBefore;
-	}
-
-	// <codeBlock>^</codeBlock>
-	// <codeBlock>foo^<softBreak></softBreak>bar</codeBlock>
-	if ( !nodeAtPosition || nodeAtPosition.is( 'softBreak' ) ) {
-		return null;
-	}
-
-	return nodeAtPosition;
 }

+ 187 - 0
packages/ckeditor5-code-block/src/outdentcodeblockcommand.js

@@ -0,0 +1,187 @@
+/**
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @module code-block/outdentcodeblockcommand
+ */
+
+import Command from '@ckeditor/ckeditor5-core/src/command';
+import {
+	getLeadingWhiteSpaces,
+	getIndentOutdentPositions,
+	isModelSelectionInCodeBlock
+} from './utils';
+
+/**
+ * The code block indentation decrease command plugin.
+ *
+ * @extends module:core/command~Command
+ */
+export default class OutdentCodeBlockCommand extends Command {
+	constructor( editor ) {
+		super( editor );
+
+		/**
+		 * A sequence of characters or removed from the line when the command is executed.
+		 *
+		 * @readonly
+		 * @private
+		 * @member {String}
+		 */
+		this._indentSequence = editor.config.get( 'codeBlock.indentSequence' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	refresh() {
+		this.isEnabled = this._checkEnabled();
+	}
+
+	/**
+	 * Executes the command. When the command {@link #isEnabled is enabled}, the indentation of the
+	 * code lines in the selection will be decreased.
+	 *
+	 * @fires execute
+	 */
+	execute() {
+		const editor = this.editor;
+		const model = editor.model;
+
+		model.change( writer => {
+			const positions = getIndentOutdentPositions( model );
+
+			// Outdent all positions, for instance assuming the indent sequence is 4x space ("    "):
+			//
+			//		<codeBlock>^foo</codeBlock>         ->       <codeBlock>foo</codeBlock>
+			//
+			//		<codeBlock>    ^bar</codeBlock>     ->       <codeBlock>bar</codeBlock>
+			//
+			// Also, when there is more than one position:
+			//
+			//		<codeBlock>
+			//			    ^foobar
+			//			<softBreak></softBreak>
+			//			    ^bazqux
+			//		</codeBlock>
+			//
+			//		->
+			//
+			//		<codeBlock>
+			//			foobar
+			//			<softBreak></softBreak>
+			//			bazqux
+			//		</codeBlock>
+			for ( const position of positions ) {
+				const range = getLastOutdentableSequenceRange( this.editor.model, position, this._indentSequence );
+
+				if ( range ) {
+					writer.remove( range );
+				}
+			}
+		} );
+	}
+
+	/**
+	 * Checks whether the command can be enabled in the current context.
+	 *
+	 * @private
+	 * @returns {Boolean} Whether the command should be enabled.
+	 */
+	_checkEnabled() {
+		if ( !this._indentSequence ) {
+			return false;
+		}
+
+		const model = this.editor.model;
+
+		if ( !isModelSelectionInCodeBlock( model.document.selection ) ) {
+			return;
+		}
+
+		// Outdent command can execute only when there is an indent character sequence
+		// in some of the lines.
+		return getIndentOutdentPositions( model ).some( position => {
+			return getLastOutdentableSequenceRange( model, position, this._indentSequence );
+		} );
+	}
+}
+
+// For a position coming from `getIndentOutdentPositions()`, it returns the range representing
+// the last occurrence of the indent sequence among the leading whitespaces of the code line the
+// position represents.
+//
+// For instance, assuming the indent sequence is 4x space ("    "):
+//
+//		<codeBlock>foo^</codeBlock>                                 ->          null
+//		<codeBlock>foo^<softBreak></softBreak>bar</codeBlock>       ->          null
+//		<codeBlock>  ^foo</codeBlock>                               ->          null
+//		<codeBlock>        ^foo</codeBlock>                         ->          <codeBlock>    [    ]foo</codeBlock>
+//		<codeBlock>    ^foo    bar</codeBlock>                      ->          <codeBlock>[    ]foo    bar</codeBlock>
+//
+// @param {<module:engine/model/model~Model>} model
+// @param {<module:engine/model/position~Position>} position
+// @param {String} sequence
+// @returns {<module:engine/model/range~Range>|null}
+function getLastOutdentableSequenceRange( model, position, sequence ) {
+	// Positions start before each text node (code line). Get the node corresponding to the position.
+	const nodeAtPosition = getCodeLineTextNodeAtPosition( position );
+
+	if ( !nodeAtPosition ) {
+		return null;
+	}
+
+	const leadingWhiteSpaces = getLeadingWhiteSpaces( nodeAtPosition );
+	const lastIndexOfSequence = leadingWhiteSpaces.lastIndexOf( sequence );
+
+	// For instance, assuming the indent sequence is 4x space ("    "):
+	//
+	//		<codeBlock>    	^foo</codeBlock>           ->             null
+	//
+	if ( lastIndexOfSequence + sequence.length !== leadingWhiteSpaces.length ) {
+		return null;
+	}
+
+	// For instance, assuming the indent sequence is 4x space ("    "):
+	//
+	//		<codeBlock>  ^foo</codeBlock>           ->             null
+	//
+	if ( lastIndexOfSequence === -1 ) {
+		return null;
+	}
+
+	const { parent, startOffset } = nodeAtPosition;
+
+	// Create a range that contains the **last** indent sequence among the leading whitespaces
+	// of the line.
+	//
+	// For instance, assuming the indent sequence is 4x space ("    "):
+	//
+	//		<codeBlock>        ^foo</codeBlock>      ->     <codeBlock>    [    ]foo</codeBlock>
+	//
+	return model.createRange(
+		model.createPositionAt( parent, startOffset + lastIndexOfSequence ),
+		model.createPositionAt( parent, startOffset + lastIndexOfSequence + sequence.length )
+	);
+}
+
+function getCodeLineTextNodeAtPosition( position ) {
+	// Positions start before each text node (code line). Get the node corresponding to the position.
+	let nodeAtPosition = position.parent.getChild( position.index );
+
+	// <codeBlock>foo^</codeBlock>
+	// <codeBlock>foo^<softBreak></softBreak>bar</codeBlock>
+	if ( !nodeAtPosition || nodeAtPosition.is( 'softBreak' ) ) {
+		nodeAtPosition = position.nodeBefore;
+	}
+
+	// <codeBlock>^</codeBlock>
+	// <codeBlock>foo^<softBreak></softBreak>bar</codeBlock>
+	if ( !nodeAtPosition || nodeAtPosition.is( 'softBreak' ) ) {
+		return null;
+	}
+
+	return nodeAtPosition;
+}

+ 84 - 1
packages/ckeditor5-code-block/src/utils.js

@@ -7,6 +7,8 @@
  * @module code-block/utils
  */
 
+import first from '@ckeditor/ckeditor5-utils/src/first';
+
 /**
  * Returns code block languages as defined in `config.codeBlock.languages` but processed to consider
  * the editor localization, i.e. to display {@link module:code-block/codeblock~CodeBlockLanguageDefinition}
@@ -49,7 +51,7 @@ export function getLeadingWhiteSpaces( textNode ) {
  *
  * Input:
  *
- *		"foo()
+ *		"foo()\n
  *		bar()"
  *
  * Output:
@@ -78,3 +80,84 @@ export function rawSnippetTextToModelDocumentFragment( writer, text ) {
 
 	return fragment;
 }
+
+/**
+ * Returns an array of all model positions within the selection that represent code block lines.
+ *
+ * If the selection is collapsed, it returns the exact selection anchor position:
+ *
+ *		<codeBlock>[]foo</codeBlock>        ->     <codeBlock>^foo</codeBlock>
+ *		<codeBlock>foo[]bar</codeBlock>     ->     <codeBlock>foo^bar</codeBlock>
+ *
+ * Otherwise, it returns positions **before** each text node belonging to all code blocks contained by the selection:
+ *
+ *		<codeBlock>                                <codeBlock>
+ *		    foo[bar                                   ^foobar
+ *		    <softBreak></softBreak>         ->        <softBreak></softBreak>
+ *		    baz]qux                                   ^bazqux
+ *		</codeBlock>                               </codeBlock>
+ *
+ * it also works across other non–code blocks:
+ *
+ *		<codeBlock>                                <codeBlock>
+ *		    foo[bar                                   ^foobar
+ *		</codeBlock>                               </codeBlock>
+ *		<paragraph>text</paragraph>         ->     <paragraph>text</paragraph>
+ *		<codeBlock>                                <codeBlock>
+ *		    baz]qux                                   ^bazqux
+ *		</codeBlock>                               </codeBlock>
+ *
+ * **Note:** The positions are in the reverse order so they do not get outdated when iterating over them and
+ * the writer inserts or removes things.
+ *
+ * **Note:** The position is situated after the leading white spaces in the text node.
+ *
+ * @param {module:engine/model/model~Model} model
+ * @returns {Array.<module:engine/model/position~Position>}
+ */
+export function getIndentOutdentPositions( model ) {
+	const selection = model.document.selection;
+	const positions = [];
+
+	// When the selection is collapsed, there's only one position we can indent or outdent.
+	if ( selection.isCollapsed ) {
+		positions.push( selection.anchor );
+	}
+
+	// When the selection is NOT collapsed, collect all positions starting before text nodes
+	// (code lines) in any <codeBlock> within the selection.
+	else {
+		// Walk backward so positions we're about to collect here do not get outdated when
+		// inserting or deleting using the writer.
+		const walker = selection.getFirstRange().getWalker( {
+			ignoreElementEnd: true,
+			direction: 'backward'
+		} );
+
+		for ( const { item } of walker ) {
+			if ( item.is( 'textProxy' ) && item.parent.is( 'codeBlock' ) ) {
+				const leadingWhiteSpaces = getLeadingWhiteSpaces( item.textNode );
+				const { parent, startOffset } = item.textNode;
+
+				// Make sure the position is after all leading whitespaces in the text node.
+				const position = model.createPositionAt( parent, startOffset + leadingWhiteSpaces.length );
+
+				positions.push( position );
+			}
+		}
+	}
+
+	return positions;
+}
+
+/**
+ * Checks if any of the blocks within model selection is a code block.
+ *
+ * @param {module:engine/model/selection~Selection} selection
+ * @returns {Boolean}
+ */
+export function isModelSelectionInCodeBlock( selection ) {
+	const firstBlock = first( selection.getSelectedBlocks() );
+
+	return firstBlock && firstBlock.is( 'codeBlock' );
+}

+ 1 - 1
packages/ckeditor5-code-block/tests/codeblock.js

@@ -8,7 +8,7 @@ import CodeBlockEditing from '../src/codeblockediting';
 import CodeBlockUI from '../src/codeblockui';
 
 describe( 'CodeBlock', () => {
-	it( 'should require plugins', () => {
+	it( 'should require CodeBlockEditing and CodeBlockUI plugins', () => {
 		expect( CodeBlock.requires ).to.have.members( [ CodeBlockEditing, CodeBlockUI ] );
 	} );
 

+ 37 - 34
packages/ckeditor5-code-block/tests/codeblockcommand.js

@@ -34,25 +34,25 @@ describe( 'CodeBlockCommand', () => {
 	} );
 
 	describe( '#value', () => {
-		it( 'should be true when the first selected element is a codeBlock element #1', () => {
+		it( 'should be true when the first selected element is a codeBlock element (selection inside code block)', () => {
 			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
 
 			expect( command.value ).to.equal( 'foo' );
 		} );
 
-		it( 'should be true when the first selected element is a codeBlock element', () => {
+		it( 'should be true when the first selected element is a codeBlock element (other blocks in selection are not code block)', () => {
 			setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
 
 			expect( command.value ).to.equal( 'foo' );
 		} );
 
-		it( 'should be false when the first selected element is not a code block #1', () => {
+		it( 'should be false when the first selected element is not a code block (all blocks are not code block)', () => {
 			setModelData( model, '<paragraph>f[]oo</paragraph>' );
 
 			expect( command.value ).to.equal( false );
 		} );
 
-		it( 'should be false when the first selected element is not a code block #2', () => {
+		it( 'should be false when the first selected element is not a code block (selection ends in code block)', () => {
 			setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="foo">ba]r</codeBlock>' );
 
 			expect( command.value ).to.equal( false );
@@ -60,31 +60,31 @@ describe( 'CodeBlockCommand', () => {
 	} );
 
 	describe( '#isEnabled', () => {
-		it( 'should be true when the first selected block is a codeBlock #1', () => {
+		it( 'should be true when the first selected block is a codeBlock (selection inside code block)', () => {
 			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
 
 			expect( command.isEnabled ).to.equal( true );
 		} );
 
-		it( 'should be true when the first selected block is a codeBlock #2', () => {
+		it( 'should be true when the first selected block is a codeBlock (other blocks in selection are not code block)', () => {
 			setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
 
 			expect( command.isEnabled ).to.equal( true );
 		} );
 
-		it( 'should be true when the first selected block can be a codeBlock #1', () => {
+		it( 'should be true when the first selected block can be a codeBlock (collapsed selection)', () => {
 			setModelData( model, '<paragraph>f[]oo</paragraph>' );
 
 			expect( command.isEnabled ).to.equal( true );
 		} );
 
-		it( 'should be true when the first selected block can be a codeBlock #2', () => {
+		it( 'should be true when the first selected block can be a codeBlock (non-collapsed selection, ends in code block)', () => {
 			setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="foo">ba]r</codeBlock>' );
 
 			expect( command.isEnabled ).to.equal( true );
 		} );
 
-		it( 'should be false when selected element is a limit element #1', () => {
+		it( 'should be false when selected element is a limit element (selection on element)', () => {
 			model.schema.register( 'limit', {
 				inheritAllFrom: '$block',
 				isLimit: true
@@ -103,7 +103,7 @@ describe( 'CodeBlockCommand', () => {
 			expect( command.isEnabled ).to.equal( false );
 		} );
 
-		it( 'should be false when selected element is a limit element #2', () => {
+		it( 'should be false when selected element is a limit element (selection has mixed limit and non-limit elements)', () => {
 			model.schema.register( 'limit', {
 				inheritAllFrom: '$block',
 				isLimit: true
@@ -144,7 +144,7 @@ describe( 'CodeBlockCommand', () => {
 
 			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">[]</codeBlock>' );
 		} );
 
 		it( 'should change selected block to codeBlock', () => {
@@ -152,7 +152,7 @@ describe( 'CodeBlockCommand', () => {
 
 			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">fo[]o</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">fo[]o</codeBlock>' );
 		} );
 
 		it( 'should change multiple selected block to codeBlock', () => {
@@ -160,35 +160,37 @@ describe( 'CodeBlockCommand', () => {
 
 			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+			expect( getModelData( model ) ).to.equal(
+				'<codeBlock language="language-plaintext">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
 		} );
 
 		it( 'should merge selected blocks with selected codeBlocks', () => {
-			setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="plaintext">ba]r</codeBlock>' );
+			setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="language-plaintext">ba]r</codeBlock>' );
 
 			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+			expect( getModelData( model ) ).to.equal(
+				'<codeBlock language="language-plaintext">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
 		} );
 
 		it( 'should not merge codeBlock with siblings when siblings are not selected', () => {
 			setModelData( model,
-				'<codeBlock language="plaintext">foo</codeBlock>' +
+				'<codeBlock language="language-plaintext">foo</codeBlock>' +
 				'<paragraph>b[a]r</paragraph>' +
-				'<codeBlock language="plaintext">biz</codeBlock>'
+				'<codeBlock language="language-plaintext">biz</codeBlock>'
 			);
 
 			command.execute();
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="plaintext">foo</codeBlock>' +
-				'<codeBlock language="plaintext">b[a]r</codeBlock>' +
-				'<codeBlock language="plaintext">biz</codeBlock>'
+				'<codeBlock language="language-plaintext">foo</codeBlock>' +
+				'<codeBlock language="language-plaintext">b[a]r</codeBlock>' +
+				'<codeBlock language="language-plaintext">biz</codeBlock>'
 			);
 		} );
 
 		it( 'should change selected empty codeBlock to paragraph', () => {
-			setModelData( model, '<codeBlock language="plaintext">[]</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">[]</codeBlock>' );
 
 			command.execute();
 
@@ -196,7 +198,7 @@ describe( 'CodeBlockCommand', () => {
 		} );
 
 		it( 'should change selected codeBlock to paragraph', () => {
-			setModelData( model, '<codeBlock language="plaintext">f[o]o</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">f[o]o</codeBlock>' );
 
 			command.execute();
 
@@ -205,7 +207,7 @@ describe( 'CodeBlockCommand', () => {
 
 		it( 'should change selected multi-line codeBlock to paragraphs', () => {
 			setModelData( model,
-				'<codeBlock language="plaintext">foo<softBreak></softBreak>b[]ar<softBreak></softBreak>biz</codeBlock>'
+				'<codeBlock language="language-plaintext">foo<softBreak></softBreak>b[]ar<softBreak></softBreak>biz</codeBlock>'
 			);
 
 			command.execute();
@@ -220,17 +222,17 @@ describe( 'CodeBlockCommand', () => {
 		it( 'should filter out attributes from nodes changed to codeBlock', () => {
 			setModelData( model, '<paragraph alignment="right"><$text bold="true">f[o]o</$text></paragraph>' );
 
-			command.execute( 'codeBlock' );
+			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">f[o]o</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">f[o]o</codeBlock>' );
 		} );
 
 		it( 'should use forceValue parameter', () => {
-			setModelData( model, '<codeBlock language="plaintext">f[o]o</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">f[o]o</codeBlock>' );
 
 			command.execute( { forceValue: true } );
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">f[o]o</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">f[o]o</codeBlock>' );
 		} );
 
 		it( 'should allow setting the language of the new block', () => {
@@ -242,7 +244,7 @@ describe( 'CodeBlockCommand', () => {
 		} );
 
 		it( 'should allow changing the language of the existing block', () => {
-			setModelData( model, '<codeBlock language="plaintext">f[o]o</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">f[o]o</codeBlock>' );
 
 			command.execute( { language: 'css', forceValue: true } );
 
@@ -254,9 +256,10 @@ describe( 'CodeBlockCommand', () => {
 		it( 'should change a paragraph inside a blockQuote to codeBlock', () => {
 			setModelData( model, '<blockQuote><paragraph>f[o]o</paragraph></blockQuote>' );
 
-			command.execute( 'codeBlock' );
+			command.execute();
 
-			expect( getModelData( model ) ).to.equal( '<blockQuote><codeBlock language="plaintext">f[o]o</codeBlock></blockQuote>' );
+			expect( getModelData( model ) ).to.equal(
+				'<blockQuote><codeBlock language="language-plaintext">f[o]o</codeBlock></blockQuote>' );
 		} );
 
 		it( 'should change a paragraph inside a blockQuote to codeBlock when blockQuote is selected with siblings', () => {
@@ -266,12 +269,12 @@ describe( 'CodeBlockCommand', () => {
 				'<paragraph>bi]z</paragraph>'
 			);
 
-			command.execute( 'codeBlock' );
+			command.execute();
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="plaintext">f[oo</codeBlock>' +
-				'<blockQuote><codeBlock language="plaintext">bar</codeBlock></blockQuote>' +
-				'<codeBlock language="plaintext">bi]z</codeBlock>'
+				'<codeBlock language="language-plaintext">f[oo</codeBlock>' +
+				'<blockQuote><codeBlock language="language-plaintext">bar</codeBlock></blockQuote>' +
+				'<codeBlock language="language-plaintext">bi]z</codeBlock>'
 			);
 		} );
 	} );

+ 152 - 139
packages/ckeditor5-code-block/tests/codeblockediting.js

@@ -8,6 +8,7 @@
 import CodeBlockEditing from '../src/codeblockediting';
 import CodeBlockCommand from '../src/codeblockcommand';
 import IndentCodeBlockCommand from '../src/indentcodeblockcommand';
+import OutdentCodeBlockCommand from '../src/outdentcodeblockcommand';
 
 import AlignmentEditing from '@ckeditor/ckeditor5-alignment/src/alignmentediting';
 import BoldEditing from '@ckeditor/ckeditor5-basic-styles/src/bold/boldediting';
@@ -76,33 +77,33 @@ describe( 'CodeBlockEditing', () => {
 			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' }
+						{ 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' }
 					] );
 				} );
 			} );
 
 			it( 'should be recognized when loading data', () => {
 				return ClassicTestEditor.create(
-					'<pre><code class="foo">bar</code></pre>' +
-					'<pre><code class="bar">baz</code></pre>',
+					'<pre><code class="language-foo">bar</code></pre>' +
+					'<pre><code class="language-bar">baz</code></pre>',
 					{
 						plugins: [ CodeBlockEditing ],
 						codeBlock: {
 							languages: [
-								{ class: 'foo', label: 'Foo' },
-								{ class: 'bar', label: 'Bar' },
+								{ class: 'language-foo', label: 'Foo' },
+								{ class: 'language-bar', label: 'Bar' },
 							]
 						}
 					} )
@@ -110,8 +111,8 @@ describe( 'CodeBlockEditing', () => {
 						model = editor.model;
 
 						expect( getModelData( model ) ).to.equal(
-							'<codeBlock language="foo">[]bar</codeBlock>' +
-							'<codeBlock language="bar">baz</codeBlock>'
+							'<codeBlock language="language-foo">[]bar</codeBlock>' +
+							'<codeBlock language="language-bar">baz</codeBlock>'
 						);
 
 						return editor.destroy();
@@ -124,15 +125,15 @@ describe( 'CodeBlockEditing', () => {
 						plugins: [ CodeBlockEditing ],
 						codeBlock: {
 							languages: [
-								{ class: 'foo', label: 'Foo' },
-								{ class: 'bar', label: 'Bar' }
+								{ class: 'language-foo', label: 'Foo' },
+								{ class: 'language-bar', label: 'Bar' }
 							]
 						}
 					} )
 					.then( editor => {
 						model = editor.model;
 
-						expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
+						expect( getModelData( model ) ).to.equal( '<codeBlock language="language-foo">[]bar</codeBlock>' );
 
 						return editor.destroy();
 					} );
@@ -144,15 +145,15 @@ describe( 'CodeBlockEditing', () => {
 						plugins: [ CodeBlockEditing ],
 						codeBlock: {
 							languages: [
-								{ class: 'foo', label: 'Foo' },
-								{ class: 'bar', label: 'Bar' }
+								{ class: 'language-foo', label: 'Foo' },
+								{ class: 'language-bar', label: 'Bar' }
 							]
 						}
 					} )
 					.then( editor => {
 						model = editor.model;
 
-						expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">[]bar</codeBlock>' );
+						expect( getModelData( model ) ).to.equal( '<codeBlock language="language-foo">[]bar</codeBlock>' );
 
 						return editor.destroy();
 					} );
@@ -177,13 +178,17 @@ describe( 'CodeBlockEditing', () => {
 	} );
 
 	it( 'adds an "outdentCodeBlock" command', () => {
-		expect( editor.commands.get( 'outdentCodeBlock' ) ).to.be.instanceOf( IndentCodeBlockCommand );
+		expect( editor.commands.get( 'outdentCodeBlock' ) ).to.be.instanceOf( OutdentCodeBlockCommand );
 	} );
 
 	it( 'allows for codeBlock in the $root', () => {
 		expect( model.schema.checkChild( [ '$root' ], 'codeBlock' ) ).to.be.true;
 	} );
 
+	it( 'disallows for codeBlock in the other codeBlock', () => {
+		expect( model.schema.checkChild( [ '$root', 'codeBlock' ], 'codeBlock' ) ).to.be.false;
+	} );
+
 	it( 'allows only for $text in codeBlock', () => {
 		expect( model.schema.checkChild( [ '$root', 'codeBlock' ], '$text' ) ).to.equal( true );
 		expect( model.schema.checkChild( [ '$root', 'codeBlock' ], '$block' ) ).to.equal( false );
@@ -191,12 +196,12 @@ describe( 'CodeBlockEditing', () => {
 	} );
 
 	it( 'disallows all attributes (except "language") for codeBlock', () => {
-		setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
+		setModelData( model, '<codeBlock language="language-css">f[o]o</codeBlock>' );
 
 		editor.execute( 'alignment', { value: 'right' } );
 		editor.execute( 'bold' );
 
-		expect( getModelData( model ) ).to.equal( '<codeBlock language="css">f[o]o</codeBlock>' );
+		expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">f[o]o</codeBlock>' );
 	} );
 
 	describe( 'tab key handling', () => {
@@ -217,7 +222,7 @@ describe( 'CodeBlockEditing', () => {
 		} );
 
 		it( 'should execute indentCodeBlock command on tab key', () => {
-			setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
 
 			editor.editing.view.document.fire( 'keydown', domEvtDataStub );
 
@@ -230,9 +235,9 @@ describe( 'CodeBlockEditing', () => {
 		it( 'should execute outdentCodeBlock command on Shift+Tab keystroke', () => {
 			domEvtDataStub.keyCode += getCode( 'Shift' );
 
-			setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
 
-			// '<codeBlock language="plaintext">	[]foo</codeBlock>
+			// '<codeBlock language="language-plaintext">	[]foo</codeBlock>
 			model.change( writer => {
 				writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
 			} );
@@ -258,7 +263,7 @@ describe( 'CodeBlockEditing', () => {
 		it( 'should not indent or outdent if alt+tab is pressed', () => {
 			domEvtDataStub.keyCode += getCode( 'alt' );
 
-			setModelData( model, '<codeBlock language="plaintext">[]foo</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">[]foo</codeBlock>' );
 
 			editor.editing.view.document.fire( 'keydown', domEvtDataStub );
 
@@ -303,46 +308,46 @@ describe( 'CodeBlockEditing', () => {
 
 		describe( 'indentation retention', () => {
 			it( 'should work when indentation is with spaces', () => {
-				setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">  foo[]</codeBlock>
+					// <codeBlock language="language-css">  foo[]</codeBlock>
 					writer.insertText( '  ', model.document.getRoot().getChild( 0 ), 0 );
 				} );
 
 				viewDoc.fire( 'enter', getEvent() );
 
 				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="css">  foo<softBreak></softBreak>  []</codeBlock>' );
+					'<codeBlock language="language-css">  foo<softBreak></softBreak>  []</codeBlock>' );
 
 				editor.execute( 'undo' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="css">  foo[]</codeBlock>' );
+				expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">  foo[]</codeBlock>' );
 			} );
 
 			it( 'should work when indentation is with tabs', () => {
-				setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">	foo[]</codeBlock>
+					// <codeBlock language="language-css">	foo[]</codeBlock>
 					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 0 );
 				} );
 
 				viewDoc.fire( 'enter', getEvent() );
 
 				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="css">	foo<softBreak></softBreak>	[]</codeBlock>' );
+					'<codeBlock language="language-css">	foo<softBreak></softBreak>	[]</codeBlock>' );
 
 				editor.execute( 'undo' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="css">	foo[]</codeBlock>' );
+				expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">	foo[]</codeBlock>' );
 			} );
 
 			it( 'should retain only the last line', () => {
-				setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>bar[]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>bar[]</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">  foo<softBreak></softBreak>	bar[]</codeBlock>
+					// <codeBlock language="language-css">  foo<softBreak></softBreak>	bar[]</codeBlock>
 					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 4 );
 					writer.insertText( '  ', model.document.getRoot().getChild( 0 ), 0 );
 				} );
@@ -350,36 +355,37 @@ describe( 'CodeBlockEditing', () => {
 				viewDoc.fire( 'enter', getEvent() );
 
 				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="css">  foo<softBreak></softBreak>	bar<softBreak></softBreak>	[]</codeBlock>' );
+					'<codeBlock language="language-css">  foo<softBreak></softBreak>	bar<softBreak></softBreak>	[]</codeBlock>' );
 
 				editor.execute( 'undo' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="css">  foo<softBreak></softBreak>	bar[]</codeBlock>' );
+				expect( getModelData( model ) ).to.equal(
+					'<codeBlock language="language-css">  foo<softBreak></softBreak>	bar[]</codeBlock>' );
 			} );
 
 			it( 'should retain when the selection is non–collapsed', () => {
-				setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">f[o]o</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">    f[o]o</codeBlock>
+					// <codeBlock language="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="css">    f<softBreak></softBreak>    []o</codeBlock>' );
+					'<codeBlock language="language-css">    f<softBreak></softBreak>    []o</codeBlock>' );
 
 				editor.execute( 'undo' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="css">    f[o]o</codeBlock>' );
+				expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">    f[o]o</codeBlock>' );
 			} );
 
 			it( 'should consider only leading white-spaces', () => {
-				setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">  foo []</codeBlock>
+					// <codeBlock language="language-css">  foo []</codeBlock>
 					writer.insertText( ' ', model.document.getRoot().getChild( 0 ), 3 );
 					writer.insertText( '  ', model.document.getRoot().getChild( 0 ), 0 );
 				} );
@@ -387,25 +393,25 @@ describe( 'CodeBlockEditing', () => {
 				viewDoc.fire( 'enter', getEvent() );
 
 				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="css">  foo <softBreak></softBreak>  []</codeBlock>' );
+					'<codeBlock language="language-css">  foo <softBreak></softBreak>  []</codeBlock>' );
 
 				editor.execute( 'undo' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="css">  foo []</codeBlock>' );
+				expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">  foo []</codeBlock>' );
 			} );
 
 			it( 'should not work when there is some non-whitespace character', () => {
-				setModelData( model, '<codeBlock language="css">foo[]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
 
 				model.change( writer => {
-					// <codeBlock language="css">foo   []</codeBlock>
+					// <codeBlock language="language-css">foo   []</codeBlock>
 					writer.insertText( '   ', model.document.getRoot().getChild( 0 ), 3 );
 				} );
 
 				viewDoc.fire( 'enter', getEvent() );
 
 				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="css">foo   <softBreak></softBreak>[]</codeBlock>' );
+					'<codeBlock language="language-css">foo   <softBreak></softBreak>[]</codeBlock>' );
 			} );
 		} );
 
@@ -414,86 +420,88 @@ 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="css">foo[]</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">foo[]</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
-					expect( getModelData( model ) ).to.equal( '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
+					expect( getModelData( model ) ).to.equal(
+						'<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">foo</codeBlock>' +
+						'<codeBlock language="language-css">foo</codeBlock>' +
 						'<paragraph>[]</paragraph>'
 					);
 
 					sinon.assert.calledOnce( spy );
 
 					editor.execute( 'undo' );
-					expect( getModelData( model ) ).to.equal( '<codeBlock language="css">foo<softBreak></softBreak>[]</codeBlock>' );
+					expect( getModelData( model ) ).to.equal(
+						'<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
 
 					editor.execute( 'undo' );
-					expect( getModelData( model ) ).to.equal( '<codeBlock language="css">foo[]</codeBlock>' );
+					expect( getModelData( model ) ).to.equal( '<codeBlock language="language-css">foo[]</codeBlock>' );
 				} );
 
 				it( 'should not leave the block when the selection is not collapsed', () => {
-					setModelData( model, '<codeBlock language="css">f[oo<softBreak></softBreak>]</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">f[oo<softBreak></softBreak>]</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">f<softBreak></softBreak>[]</codeBlock>' );
+						'<codeBlock language="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="css">fo[]o</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">fo[]o</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">fo<softBreak></softBreak>[]o</codeBlock>' );
+						'<codeBlock language="language-css">fo<softBreak></softBreak>[]o</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">fo<softBreak></softBreak><softBreak></softBreak>[]o</codeBlock>' );
+						'<codeBlock language="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="css">[]foo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[]foo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak>[]foo</codeBlock>' );
+						'<codeBlock language="language-css"><softBreak></softBreak>[]foo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak><softBreak></softBreak>[]foo</codeBlock>' );
+						'<codeBlock language="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="css">foo<softBreak></softBreak>[]</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent( { isSoft: true } ) );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">foo<softBreak></softBreak><softBreak></softBreak>[]</codeBlock>' );
+						'<codeBlock language="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="css">foo<softBreak></softBreak>[]</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>[]</codeBlock>' );
 
 					model.change( writer => {
-						// <codeBlock language="css">foo<softBreak></softBreak>  []</codeBlock>
+						// <codeBlock language="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="css">foo</codeBlock><paragraph>[]</paragraph>' );
+						'<codeBlock language="language-css">foo</codeBlock><paragraph>[]</paragraph>' );
 				} );
 			} );
 
@@ -501,61 +509,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="css">[]<softBreak></softBreak>foo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
 						'<paragraph>[]</paragraph>' +
-						'<codeBlock language="css">foo</codeBlock>'
+						'<codeBlock language="language-css">foo</codeBlock>'
 					);
 
 					sinon.assert.calledOnce( spy );
 
 					editor.execute( 'undo' );
-					expect( getModelData( model ) ).to.equal( '<codeBlock language="css">[]<softBreak></softBreak>foo</codeBlock>' );
+					expect( getModelData( model ) ).to.equal(
+						'<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
 				} );
 
 				it( 'should not leave the block when the selection is not collapsed (#1)', () => {
-					setModelData( model, '<codeBlock language="css">[f]<softBreak></softBreak>oo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[f]<softBreak></softBreak>oo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak>[]<softBreak></softBreak>oo</codeBlock>' );
+						'<codeBlock language="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="css">[<softBreak></softBreak>oo]</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[<softBreak></softBreak>oo]</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak>[]</codeBlock>' );
+						'<codeBlock language="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="css">[]<softBreak></softBreak>foo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent( { isSoft: true } ) );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak>[]<softBreak></softBreak>foo</codeBlock>' );
+						'<codeBlock language="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="css">[]foo<softBreak></softBreak>foo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[]foo<softBreak></softBreak>foo</codeBlock>' );
 
 					viewDoc.fire( 'enter', getEvent() );
 
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css"><softBreak></softBreak>[]foo<softBreak></softBreak>foo</codeBlock>' );
+						'<codeBlock language="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="css">[]<softBreak></softBreak>foo</codeBlock>' );
+					setModelData( model, '<codeBlock language="language-css">[]<softBreak></softBreak>foo</codeBlock>' );
 
-					// <codeBlock language="css">    []<softBreak></softBreak>foo</codeBlock>
+					// <codeBlock language="language-css">    []<softBreak></softBreak>foo</codeBlock>
 					model.change( writer => {
 						writer.insertText( '    ', model.document.getRoot().getChild( 0 ), 0 );
 					} );
@@ -564,7 +573,7 @@ describe( 'CodeBlockEditing', () => {
 
 					// Extra spaces before "[]" come from the indentation retention mechanism.
 					expect( getModelData( model ) ).to.equal(
-						'<codeBlock language="css">    <softBreak></softBreak>    []<softBreak></softBreak>foo</codeBlock>' );
+						'<codeBlock language="language-css">    <softBreak></softBreak>    []<softBreak></softBreak>foo</codeBlock>' );
 				} );
 			} );
 		} );
@@ -576,7 +585,7 @@ describe( 'CodeBlockEditing', () => {
 		}
 	} );
 
-	describe( 'intent plugin integration', () => {
+	describe( 'indent plugin integration', () => {
 		it( 'should add indent code block command to indent command', () => {
 			const element = document.createElement( 'div' );
 			document.body.appendChild( element );
@@ -629,20 +638,20 @@ describe( 'CodeBlockEditing', () => {
 
 	describe( 'editing pipeline m -> v', () => {
 		it( 'should convert empty codeBlock to empty pre tag', () => {
-			setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext"></codeBlock>' );
 
-			expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="plaintext">[]</code></pre>' );
+			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="plaintext">Foo</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">Foo</codeBlock>' );
 
-			expect( getViewData( view ) ).to.equal( '<pre data-language="Plain text"><code class="plaintext">{}Foo</code></pre>' );
+			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="plaintext">' +
+				'<codeBlock language="language-plaintext">' +
 					'Foo<softBreak></softBreak>' +
 					'Bar<softBreak></softBreak>' +
 					'Biz' +
@@ -651,13 +660,13 @@ describe( 'CodeBlockEditing', () => {
 
 			expect( getViewData( view ) ).to.equal(
 				'<pre data-language="Plain text">' +
-					'<code class="plaintext">{}Foo<br></br>Bar<br></br>Biz</code>' +
+					'<code class="language-plaintext">{}Foo<br></br>Bar<br></br>Biz</code>' +
 				'</pre>' );
 		} );
 
 		it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
 			setModelData( model,
-				'<codeBlock language="plaintext">' +
+				'<codeBlock language="language-plaintext">' +
 					'<softBreak></softBreak>' +
 					'<softBreak></softBreak>' +
 					'Foo' +
@@ -668,7 +677,7 @@ describe( 'CodeBlockEditing', () => {
 
 			expect( getViewData( view ) ).to.equal(
 				'<pre data-language="Plain text">' +
-					'<code class="plaintext">[]<br></br><br></br>Foo<br></br><br></br></code>' +
+					'<code class="language-plaintext">[]<br></br><br></br>Foo<br></br><br></br></code>' +
 				'</pre>' );
 		} );
 
@@ -687,12 +696,12 @@ describe( 'CodeBlockEditing', () => {
 					const view = editor.editing.view;
 
 					setModelData( model,
-						'<codeBlock language="plaintext">foo</codeBlock>'
+						'<codeBlock language="language-plaintext">foo</codeBlock>'
 					);
 
 					expect( getViewData( view ) ).to.equal(
 						'<pre data-language="Zwykły tekst">' +
-							'<code class="plaintext">{}foo</code>' +
+							'<code class="language-plaintext">{}foo</code>' +
 						'</pre>' );
 
 					element.remove();
@@ -704,20 +713,20 @@ describe( 'CodeBlockEditing', () => {
 
 	describe( 'data pipeline m -> v conversion ', () => {
 		it( 'should convert empty codeBlock to empty pre tag', () => {
-			setModelData( model, '<codeBlock language="plaintext"></codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext"></codeBlock>' );
 
-			expect( editor.getData( { trim: 'none' } ) ).to.equal( '<pre><code class="plaintext">&nbsp;</code></pre>' );
+			expect( editor.getData( { trim: 'none' } ) ).to.equal( '<pre><code class="language-plaintext">&nbsp;</code></pre>' );
 		} );
 
 		it( 'should convert non-empty codeBlock to pre tag', () => {
-			setModelData( model, '<codeBlock language="plaintext">Foo</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">Foo</codeBlock>' );
 
-			expect( editor.getData() ).to.equal( '<pre><code class="plaintext">Foo</code></pre>' );
+			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="plaintext">' +
+				'<codeBlock language="language-plaintext">' +
 					'Foo<softBreak></softBreak>' +
 					'Bar<softBreak></softBreak>' +
 					'Biz' +
@@ -725,12 +734,12 @@ describe( 'CodeBlockEditing', () => {
 				'<paragraph>A<softBreak></softBreak>B</paragraph>'
 			);
 
-			expect( editor.getData() ).to.equal( '<pre><code class="plaintext">Foo\nBar\nBiz</code></pre><p>A<br>B</p>' );
+			expect( editor.getData() ).to.equal( '<pre><code class="language-plaintext">Foo\nBar\nBiz</code></pre><p>A<br>B</p>' );
 		} );
 
 		it( 'should convert codeBlock with softBreaks to pre tag #2', () => {
 			setModelData( model,
-				'<codeBlock language="plaintext">' +
+				'<codeBlock language="language-plaintext">' +
 					'<softBreak></softBreak>' +
 					'<softBreak></softBreak>' +
 					'Foo' +
@@ -739,17 +748,17 @@ describe( 'CodeBlockEditing', () => {
 				'</codeBlock>'
 			);
 
-			expect( editor.getData() ).to.equal( '<pre><code class="plaintext">\n\nFoo\n\n</code></pre>' );
+			expect( editor.getData() ).to.equal( '<pre><code class="language-plaintext">\n\nFoo\n\n</code></pre>' );
 		} );
 
 		it( 'should convert codeBlock with html content', () => {
-			setModelData( model, '<codeBlock language="plaintext">[]</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">[]</codeBlock>' );
 
 			model.change( writer => writer.insertText( '<div><p>Foo</p></div>', model.document.selection.getFirstPosition() ) );
 
 			expect( editor.getData() ).to.equal(
 				'<pre>' +
-					'<code class="plaintext">&lt;div&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/div&gt;</code>' +
+					'<code class="language-plaintext">&lt;div&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/div&gt;</code>' +
 				'</pre>' );
 		} );
 
@@ -770,7 +779,7 @@ describe( 'CodeBlockEditing', () => {
 				api.writer.insert( position, api.writer.createText( '\n' ) );
 			}, { priority: 'highest' } );
 
-			setModelData( model, '<codeBlock language="plaintext">Foo<softBreak></softBreak>Bar</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-plaintext">Foo<softBreak></softBreak>Bar</codeBlock>' );
 
 			expect( editor.getData() ).to.equal( '<code>Foo\nBar</code>' );
 		} );
@@ -792,14 +801,14 @@ describe( 'CodeBlockEditing', () => {
 		it( 'should convert pre > code to code block', () => {
 			editor.setData( '<pre><code></code></pre>' );
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="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="plaintext">[]' +
+				'<codeBlock language="language-plaintext">[]' +
 					'foo' +
 					'<softBreak></softBreak>' +
 					'bar' +
@@ -811,7 +820,7 @@ describe( 'CodeBlockEditing', () => {
 			editor.setData( '<pre><code>\n\nfoo\n\n</code></pre>' );
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="plaintext">[]' +
+				'<codeBlock language="language-plaintext">[]' +
 					'<softBreak></softBreak>' +
 					'<softBreak></softBreak>' +
 					'foo' +
@@ -825,7 +834,7 @@ describe( 'CodeBlockEditing', () => {
 			editor.setData( '<pre><code><p>Foo</p>\n<p>Bar</p></code></pre>' );
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="plaintext">[]' +
+				'<codeBlock language="language-plaintext">[]' +
 					'<p>Foo</p>' +
 					'<softBreak></softBreak>' +
 					'<p>Bar</p>' +
@@ -836,13 +845,14 @@ 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 language="plaintext">[]<p>Foo</p><pre>Bar</pre><p>Biz</p></codeBlock>' );
+			expect( getModelData( model ) ).to.equal(
+				'<codeBlock language="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>&lt;div&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/div&gt;</code></pre>' );
 
-			expect( getModelData( model ) ).to.equal( '<codeBlock language="plaintext">[]<div><p>Foo</p></div></codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="language-plaintext">[]<div><p>Foo</p></div></codeBlock>' );
 		} );
 
 		it( 'should be overridable', () => {
@@ -868,7 +878,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="plaintext">x</codeBlock>' +
+				'<codeBlock language="language-plaintext">x</codeBlock>' +
 				'<paragraph>bar</paragraph>' +
 				'<paragraph></paragraph>' );
 		} );
@@ -877,7 +887,7 @@ describe( 'CodeBlockEditing', () => {
 			editor.setData( '<pre><code>foo</code></pre><pre><code>bar</code></pre>' );
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="plaintext">[]foo</codeBlock><codeBlock language="plaintext">bar</codeBlock>' );
+				'<codeBlock language="language-plaintext">[]foo</codeBlock><codeBlock language="language-plaintext">bar</codeBlock>' );
 		} );
 
 		it( 'should upcast two code blocks in a row (#2)', () => {
@@ -886,9 +896,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="plaintext">[]foo</codeBlock>' +
+				'<codeBlock language="language-plaintext">[]foo</codeBlock>' +
 				'<paragraph> </paragraph>' +
-				'<codeBlock language="plaintext">bar</codeBlock>' );
+				'<codeBlock language="language-plaintext">bar</codeBlock>' );
 		} );
 
 		it( 'should not convert when modelCursor and its ancestors disallow to insert codeBlock', () => {
@@ -923,7 +933,7 @@ describe( 'CodeBlockEditing', () => {
 		} );
 
 		it( 'should intercept input when selection anchored in the code block', () => {
-			setModelData( model, '<codeBlock language="css">f[o]o</codeBlock>' );
+			setModelData( model, '<codeBlock language="language-css">f[o]o</codeBlock>' );
 
 			const dataTransferMock = {
 				getData: sinon.stub().withArgs( 'text/plain' ).returns( 'bar\nbaz\n' )
@@ -935,7 +945,7 @@ describe( 'CodeBlockEditing', () => {
 			} );
 
 			expect( getModelData( model ) ).to.equal(
-				'<codeBlock language="css">' +
+				'<codeBlock language="language-css">' +
 					'fbar' +
 					'<softBreak></softBreak>' +
 					'baz' +
@@ -948,40 +958,40 @@ describe( 'CodeBlockEditing', () => {
 
 		describe( 'getSelectedContent()', () => {
 			it( 'should not engage when there is nothing selected', () => {
-				setModelData( model, '<codeBlock language="css">fo[]o<softBreak></softBreak>bar</codeBlock>' );
+				setModelData( model, '<codeBlock language="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="css">fo[o<softBreak></softBreak>b]ar</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">fo[o<softBreak></softBreak>b]ar</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<codeBlock language="css">o<softBreak></softBreak>b</codeBlock>'
+					'<codeBlock language="language-css">o<softBreak></softBreak>b</codeBlock>'
 				);
 			} );
 
 			it( 'should wrap a partial multi-line selection into a code block (#2)', () => {
-				setModelData( model, '<codeBlock language="css">fo[o<softBreak></softBreak>]bar</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">fo[o<softBreak></softBreak>]bar</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<codeBlock language="css">o<softBreak></softBreak></codeBlock>'
+					'<codeBlock language="language-css">o<softBreak></softBreak></codeBlock>'
 				);
 			} );
 
 			it( 'should wrap a partial multi-line selection into a code block (#3)', () => {
-				setModelData( model, '<codeBlock language="css">[foo<softBreak></softBreak>bar]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">[foo<softBreak></softBreak>bar]</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<codeBlock language="css">foo<softBreak></softBreak>bar</codeBlock>'
+					'<codeBlock language="language-css">foo<softBreak></softBreak>bar</codeBlock>'
 				);
 			} );
 
 			it( 'should wrap a complete single-line selection into a code block', () => {
-				setModelData( model, '<codeBlock language="css">[foo]</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">[foo]</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<codeBlock language="css">foo</codeBlock>'
+					'<codeBlock language="language-css">foo</codeBlock>'
 				);
 			} );
 
@@ -990,7 +1000,7 @@ describe( 'CodeBlockEditing', () => {
 					allowAttributes: 'code'
 				} );
 
-				setModelData( model, '<codeBlock language="css">[fo]o<softBreak></softBreak>bar</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">[fo]o<softBreak></softBreak>bar</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
 					'<$text code="true">fo</$text>'
@@ -1002,7 +1012,7 @@ describe( 'CodeBlockEditing', () => {
 					allowAttributes: 'code'
 				} );
 
-				setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
+				setModelData( model, '<codeBlock language="language-css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
 					'<$text code="true">a</$text>'
@@ -1010,32 +1020,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="css">foo<softBreak></softBreak>b[a]r</codeBlock>' );
+				setModelData( model, '<codeBlock language="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="css">fo]o<softBreak></softBreak>bar</codeBlock>' );
+				setModelData( model,
+					'<paragraph>[x</paragraph><codeBlock language="language-css">fo]o<softBreak></softBreak>bar</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<paragraph>x</paragraph><codeBlock language="css">fo</codeBlock>'
+					'<paragraph>x</paragraph><codeBlock language="language-css">fo</codeBlock>'
 				);
 			} );
 
 			it( 'should preserve a code block in a cross-selection (#2)', () => {
-				setModelData( model, '<paragraph>[x</paragraph><codeBlock language="css">foo<softBreak></softBreak>b]ar</codeBlock>' );
+				setModelData( model,
+					'<paragraph>[x</paragraph><codeBlock language="language-css">foo<softBreak></softBreak>b]ar</codeBlock>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<paragraph>x</paragraph><codeBlock language="css">foo<softBreak></softBreak>b</codeBlock>'
+					'<paragraph>x</paragraph><codeBlock language="language-css">foo<softBreak></softBreak>b</codeBlock>'
 				);
 			} );
 
 			it( 'should preserve a code block in a cross-selection (#3)', () => {
-				setModelData( model, '<codeBlock language="css">foo<softBreak></softBreak>b[ar</codeBlock><paragraph>x]</paragraph>' );
+				setModelData( model,
+					'<codeBlock language="language-css">foo<softBreak></softBreak>b[ar</codeBlock><paragraph>x]</paragraph>' );
 
 				expect( stringify( model.getSelectedContent( model.document.selection ) ) ).to.equal(
-					'<codeBlock language="css">ar</codeBlock><paragraph>x</paragraph>'
+					'<codeBlock language="language-css">ar</codeBlock><paragraph>x</paragraph>'
 				);
 			} );
 		} );

+ 3 - 3
packages/ckeditor5-code-block/tests/codeblockui.js

@@ -79,7 +79,7 @@ describe( 'CodeBlockUI', () => {
 			sinon.assert.calledOnce( executeSpy );
 			sinon.assert.calledOnce( focusSpy );
 			sinon.assert.calledWithExactly( executeSpy.firstCall, 'codeBlock', {
-				language: 'cs',
+				language: 'language-cs',
 				forceValue: true
 			} );
 		} );
@@ -157,7 +157,7 @@ describe( 'CodeBlockUI', () => {
 
 				expect( listView.items.get( 2 ).children.first.isOn ).to.be.false;
 
-				command.value = 'cs';
+				command.value = 'language-cs';
 				expect( listView.items.get( 2 ).children.first.isOn ).to.be.true;
 			} );
 
@@ -216,7 +216,7 @@ describe( 'CodeBlockUI', () => {
 				sinon.assert.calledOnce( executeSpy );
 				sinon.assert.calledOnce( focusSpy );
 				sinon.assert.calledWithExactly( executeSpy.firstCall, 'codeBlock', {
-					language: 'plaintext'
+					language: 'language-plaintext'
 				} );
 			} );
 		} );

+ 90 - 371
packages/ckeditor5-code-block/tests/indentcodeblockcommand.js

@@ -15,7 +15,7 @@ import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltestedit
 import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'IndentCodeBlockCommand', () => {
-	let editor, model, indentCommand, outdentCommand;
+	let editor, model, indentCommand;
 
 	beforeEach( () => {
 		return ModelTestEditor
@@ -26,7 +26,6 @@ describe( 'IndentCodeBlockCommand', () => {
 				editor = newEditor;
 				model = editor.model;
 				indentCommand = new IndentCodeBlockCommand( editor, 'forward' );
-				outdentCommand = new IndentCodeBlockCommand( editor, 'backward' );
 			} );
 	} );
 
@@ -34,418 +33,138 @@ describe( 'IndentCodeBlockCommand', () => {
 		return editor.destroy();
 	} );
 
-	describe( 'Forward (indent) command', () => {
-		describe( '#isEnabled', () => {
-			it( 'should be true when the first selected block is a codeBlock #1', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+	describe( '#isEnabled', () => {
+		it( 'should be true when the first selected block is a codeBlock #1', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
 
-				expect( indentCommand.isEnabled ).to.be.true;
-			} );
-
-			it( 'should be true when the first selected block is a codeBlock #2', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
-
-				expect( indentCommand.isEnabled ).to.be.true;
-			} );
-
-			it( 'should be false when there is no code block in the selection', () => {
-				setModelData( model, '<paragraph>foo[]</paragraph>' );
-
-				expect( indentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when the selection is not anchored in the code block', () => {
-				setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="foo">bar</codeBlock><paragraph>ba]z</paragraph>' );
-
-				expect( indentCommand.isEnabled ).to.be.false;
-			} );
-
-			describe( 'config.codeBlock.indentSequence', () => {
-				it( 'should disable the command when the config is not set', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: false
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const indentCommand = new IndentCodeBlockCommand( editor, 'forward' );
-
-							setModelData( model, '<codeBlock language="foo">[]foo</codeBlock>' );
-
-							expect( indentCommand.isEnabled ).to.be.false;
-
-							return editor.destroy();
-						} );
-				} );
-			} );
+			expect( indentCommand.isEnabled ).to.be.true;
 		} );
 
-		describe( 'execute()', () => {
-			it( 'should indent when a selection is collapsed in an empty code block', () => {
-				setModelData( model, '<codeBlock language="foo">[]</codeBlock>' );
-
-				indentCommand.execute();
-
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	[]</codeBlock>' );
-			} );
-
-			it( 'should indent when a selection is collapsed', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
-
-				indentCommand.execute();
-
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f	[]oo</codeBlock>' );
-			} );
-
-			it( 'should indent a whole line when a selection is expanded', () => {
-				setModelData( model, '<codeBlock language="foo">f[o]o</codeBlock>' );
-
-				indentCommand.execute();
-
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[o]o</codeBlock>' );
-			} );
-
-			it( 'should indent multiple lines when a selection is expanded', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>b]ar</codeBlock>' );
+		it( 'should be true when the first selected block is a codeBlock #2', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
 
-				indentCommand.execute();
-
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[oo<softBreak></softBreak>	b]ar</codeBlock>' );
-			} );
+			expect( indentCommand.isEnabled ).to.be.true;
+		} );
 
-			it( 'should append the indentation to the line\'s leading white spaces (#1)', () => {
-				setModelData( model, '<codeBlock language="foo">[]foo</codeBlock>' );
+		it( 'should be false when there is no code block in the selection', () => {
+			setModelData( model, '<paragraph>foo[]</paragraph>' );
 
-				// <codeBlock language="foo">    []foo</codeBlock>
-				model.change( writer => {
-					writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
-				} );
+			expect( indentCommand.isEnabled ).to.be.false;
+		} );
 
-				indentCommand.execute();
+		it( 'should be false when the selection is not anchored in the code block', () => {
+			setModelData( model, '<paragraph>f[oo</paragraph><codeBlock language="foo">bar</codeBlock><paragraph>ba]z</paragraph>' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">    	[]foo</codeBlock>' );
-			} );
-
-			it( 'should append the indentation to the line\'s leading white spaces (#2)', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>b]ar</codeBlock>' );
+			expect( indentCommand.isEnabled ).to.be.false;
+		} );
 
-				// <codeBlock language="foo">    f[oo<softBreak></softBreak>    b]ar</codeBlock>
-				model.change( writer => {
-					writer.insertText( '    ', model.document.getRoot().getChild( 0 ), 4 );
-					writer.insertText( '    ', model.document.getRoot().getChild( 0 ), 0 );
-				} );
+		describe( 'config.codeBlock.indentSequence', () => {
+			it( 'should disable the command when the config is not set', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: false
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const indentCommand = new IndentCodeBlockCommand( editor, 'forward' );
 
-				indentCommand.execute();
+						setModelData( model, '<codeBlock language="foo">[]foo</codeBlock>' );
 
-				expect( getModelData( model ) ).to.equal(
-					'<codeBlock language="foo">    	f[oo<softBreak></softBreak>    	b]ar</codeBlock>' );
-			} );
+						expect( indentCommand.isEnabled ).to.be.false;
 
-			describe( 'config.codeBlock.indentSequence', () => {
-				it( 'should be used when indenting', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: '  '
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const indentCommand = new IndentCodeBlockCommand( editor, 'forward' );
-
-							setModelData( model, '<codeBlock language="foo">f[o]o</codeBlock>' );
-
-							indentCommand.execute();
-
-							expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">  f[o]o</codeBlock>' );
-
-							return editor.destroy();
-						} );
-				} );
+						return editor.destroy();
+					} );
 			} );
 		} );
 	} );
 
-	describe( 'Backward (outdent) command', () => {
-		describe( '#isEnabled', () => {
-			it( 'should be true when the selection is in a line containing the indent sequence', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+	describe( 'execute()', () => {
+		it( 'should indent when a selection is collapsed in an empty code block', () => {
+			setModelData( model, '<codeBlock language="foo">[]</codeBlock>' );
 
-				// <codeBlock language="foo">	f[]oo</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.true;
-			} );
-
-			it( 'should be true when any line in the selection contains more than the indent sequence', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
-
-				// <codeBlock language="foo">	f[oo</codeBlock><paragraph>ba]r</paragraph>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.true;
-			} );
+			indentCommand.execute();
 
-			it( 'should be true when any line in the selection contains the indent sequence', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><codeBlock language="foo">ba]r</codeBlock>' );
-
-				// <codeBlock language="foo">f[oo</codeBlock><codeBlock language="foo">	ba]r</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 1 ) );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.true;
-			} );
-
-			it( 'should be false when the indent sequence is in other element', () => {
-				setModelData( model, '<paragraph>foo[]</paragraph>' );
-
-				// <paragraph>	foo[]</paragraph>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when there is no indent sequence in the line (#1)', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when there is no indent sequence in the line (#2)', () => {
-				setModelData( model, '<codeBlock language="foo">[]</codeBlock>' );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when there is no indent sequence in the line (#3)', () => {
-				setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when there is no corrent sequence in the line', () => {
-				setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
-
-				// <codeBlock language="foo">    foo[]</codeBlock>
-				model.change( writer => {
-					writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when the sequence is not in leading characters of the line (#1)', () => {
-				setModelData( model, '<codeBlock language="foo">barfoo[]</codeBlock>' );
-
-				// <codeBlock language="foo">bar	foo[]</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 3 );
-				} );
-
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
-
-			it( 'should be false when the sequence is not in leading characters of the line (#2)', () => {
-				setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	[]</codeBlock>' );
+		} );
 
-				// <codeBlock language="foo">foo[]</codeBlock>
-				model.change( writer => {
-					writer.insertText( '    	    ', model.document.getRoot().getChild( 0 ), 0 );
-				} );
+		it( 'should indent when a selection is collapsed', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
 
-				expect( outdentCommand.isEnabled ).to.be.false;
-			} );
+			indentCommand.execute();
 
-			describe( 'config.codeBlock.indentSequence', () => {
-				it( 'should be respected (#1)', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: '  '
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const outdentCommand = new IndentCodeBlockCommand( editor, 'backward' );
-
-							setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
-
-							// <codeBlock language="foo">    foo[]</codeBlock>
-							model.change( writer => {
-								writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
-							} );
-
-							expect( outdentCommand.isEnabled ).to.be.true;
-
-							return editor.destroy();
-						} );
-				} );
-
-				it( 'should be respected (#2)', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: '  '
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const outdentCommand = new IndentCodeBlockCommand( editor, 'backward' );
-
-							setModelData( model, '<codeBlock language="foo"> foo[]</codeBlock>' );
-
-							// <codeBlock language="foo"> foo[]</codeBlock>
-							model.change( writer => {
-								writer.insertText( ' ', model.document.getRoot().getChild( 0 ) );
-							} );
-
-							expect( outdentCommand.isEnabled ).to.be.false;
-
-							return editor.destroy();
-						} );
-				} );
-
-				it( 'should disable the command when the config is not set', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: false
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const outdentCommand = new IndentCodeBlockCommand( editor, 'backward' );
-
-							setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
-
-							// <codeBlock language="foo">	foo[]</codeBlock>
-							model.change( writer => {
-								writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
-							} );
-
-							expect( outdentCommand.isEnabled ).to.be.false;
-
-							return editor.destroy();
-						} );
-				} );
-			} );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f	[]oo</codeBlock>' );
 		} );
 
-		describe( 'execute()', () => {
-			it( 'should outdent a single line', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+		it( 'should indent a whole line when a selection is expanded', () => {
+			setModelData( model, '<codeBlock language="foo">f[o]o</codeBlock>' );
 
-				// <codeBlock language="foo">	f[]oo</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
-				} );
+			indentCommand.execute();
 
-				outdentCommand.execute();
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[o]o</codeBlock>' );
+		} );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[]oo</codeBlock>' );
-			} );
+		it( 'should indent multiple lines when a selection is expanded', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>b]ar</codeBlock>' );
 
-			it( 'should outdent only one level in a single line', () => {
-				setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+			indentCommand.execute();
 
-				// <codeBlock language="foo">		f[]oo</codeBlock>
-				model.change( writer => {
-					writer.insertText( '		', model.document.getRoot().getChild( 0 ) );
-				} );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[oo<softBreak></softBreak>	b]ar</codeBlock>' );
+		} );
 
-				outdentCommand.execute();
+		it( 'should append the indentation to the line\'s leading white spaces (#1)', () => {
+			setModelData( model, '<codeBlock language="foo">[]foo</codeBlock>' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[]oo</codeBlock>' );
+			// <codeBlock language="foo">    []foo</codeBlock>
+			model.change( writer => {
+				writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
 			} );
 
-			it( 'should outdent multiple lines', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+			indentCommand.execute();
 
-				// <codeBlock language="foo">	f[oo<softBreak></softBreak>	ba]r</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 4 );
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 0 );
-				} );
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">    	[]foo</codeBlock>' );
+		} );
 
-				outdentCommand.execute();
+		it( 'should append the indentation to the line\'s leading white spaces (#2)', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>b]ar</codeBlock>' );
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+			// <codeBlock language="foo">    f[oo<softBreak></softBreak>    b]ar</codeBlock>
+			model.change( writer => {
+				writer.insertText( '    ', model.document.getRoot().getChild( 0 ), 4 );
+				writer.insertText( '    ', model.document.getRoot().getChild( 0 ), 0 );
 			} );
 
-			it( 'should outdent only one level across multiple lines', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
-
-				// <codeBlock language="foo">	f[oo<softBreak></softBreak>		ba]r</codeBlock>
-				model.change( writer => {
-					writer.insertText( '		', model.document.getRoot().getChild( 0 ), 4 );
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 0 );
-				} );
+			indentCommand.execute();
 
-				outdentCommand.execute();
-
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>	ba]r</codeBlock>' );
-			} );
+			expect( getModelData( model ) ).to.equal(
+				'<codeBlock language="foo">    	f[oo<softBreak></softBreak>    	b]ar</codeBlock>' );
+		} );
 
-			it( 'should outdent some lines', () => {
-				setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+		describe( 'config.codeBlock.indentSequence', () => {
+			it( 'should be used when indenting', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: '  '
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const indentCommand = new IndentCodeBlockCommand( editor, 'forward' );
 
-				// <codeBlock language="foo">f[oo<softBreak></softBreak>	ba]r</codeBlock>
-				model.change( writer => {
-					writer.insertText( '	', model.document.getRoot().getChild( 0 ), 4 );
-				} );
+						setModelData( model, '<codeBlock language="foo">f[o]o</codeBlock>' );
 
-				outdentCommand.execute();
+						indentCommand.execute();
 
-				expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
-			} );
+						expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">  f[o]o</codeBlock>' );
 
-			describe( 'config.codeBlock.indentSequence', () => {
-				it( 'should be respected', () => {
-					return ModelTestEditor
-						.create( {
-							plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
-							codeBlock: {
-								indentSequence: '  '
-							}
-						} )
-						.then( newEditor => {
-							const editor = newEditor;
-							const model = editor.model;
-							const outdentCommand = new IndentCodeBlockCommand( editor, 'backward' );
-
-							setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
-
-							// <codeBlock language="foo">  f[]oo</codeBlock>
-							model.change( writer => {
-								writer.insertText( '  ', model.document.getRoot().getChild( 0 ) );
-							} );
-
-							outdentCommand.execute();
-
-							expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[]oo</codeBlock>' );
-
-							return editor.destroy();
-						} );
-				} );
+						return editor.destroy();
+					} );
 			} );
 		} );
 	} );

+ 311 - 0
packages/ckeditor5-code-block/tests/outdentcodeblockcommand.js

@@ -0,0 +1,311 @@
+/**
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+import CodeBlockEditing from '../src/codeblockediting';
+import OutdentCodeBlockCommand from '../src/outdentcodeblockcommand';
+
+import AlignmentEditing from '@ckeditor/ckeditor5-alignment/src/alignmentediting';
+import BoldEditing from '@ckeditor/ckeditor5-basic-styles/src/bold/boldediting';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import BlockQuoteEditing from '@ckeditor/ckeditor5-block-quote/src/blockquoteediting';
+
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+
+describe( 'OutdentCodeBlockCommand', () => {
+	let editor, model, outdentCommand;
+
+	beforeEach( () => {
+		return ModelTestEditor
+			.create( {
+				plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ]
+			} )
+			.then( newEditor => {
+				editor = newEditor;
+				model = editor.model;
+				outdentCommand = new OutdentCodeBlockCommand( editor, 'backward' );
+			} );
+	} );
+
+	afterEach( () => {
+		return editor.destroy();
+	} );
+
+	describe( '#isEnabled', () => {
+		it( 'should be true when the selection is in a line containing the indent sequence', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+			// <codeBlock language="foo">	f[]oo</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.true;
+		} );
+
+		it( 'should be true when any line in the selection contains more than the indent sequence', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><paragraph>ba]r</paragraph>' );
+
+			// <codeBlock language="foo">	f[oo</codeBlock><paragraph>ba]r</paragraph>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.true;
+		} );
+
+		it( 'should be true when any line in the selection contains the indent sequence', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo</codeBlock><codeBlock language="foo">ba]r</codeBlock>' );
+
+			// <codeBlock language="foo">f[oo</codeBlock><codeBlock language="foo">	ba]r</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 1 ) );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.true;
+		} );
+
+		it( 'should be false when the indent sequence is in other element', () => {
+			setModelData( model, '<paragraph>foo[]</paragraph>' );
+
+			// <paragraph>	foo[]</paragraph>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when there is no indent sequence in the line (caret inside text)', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when there is no indent sequence in the line (empty line)', () => {
+			setModelData( model, '<codeBlock language="foo">[]</codeBlock>' );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when there is no indent sequence in the line (caret at the end of a block)', () => {
+			setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when there is no corrent sequence in the line', () => {
+			setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+
+			// <codeBlock language="foo">    foo[]</codeBlock>
+			model.change( writer => {
+				writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when the sequence is not in leading characters of the line', () => {
+			setModelData( model, '<codeBlock language="foo">barfoo[]</codeBlock>' );
+
+			// <codeBlock language="foo">bar	foo[]</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ), 3 );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false when the sequence is not in leading characters of the line (after other white-space characters)', () => {
+			setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+
+			// <codeBlock language="foo">foo[]</codeBlock>
+			model.change( writer => {
+				writer.insertText( '    	    ', model.document.getRoot().getChild( 0 ), 0 );
+			} );
+
+			expect( outdentCommand.isEnabled ).to.be.false;
+		} );
+
+		describe( 'config.codeBlock.indentSequence', () => {
+			it( 'should be respected (#1)', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: '  '
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const outdentCommand = new OutdentCodeBlockCommand( editor );
+
+						setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+
+						// <codeBlock language="foo">    foo[]</codeBlock>
+						model.change( writer => {
+							writer.insertText( '    ', model.document.getRoot().getChild( 0 ) );
+						} );
+
+						expect( outdentCommand.isEnabled ).to.be.true;
+
+						return editor.destroy();
+					} );
+			} );
+
+			it( 'should be respected (#2)', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: '  '
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const outdentCommand = new OutdentCodeBlockCommand( editor );
+
+						setModelData( model, '<codeBlock language="foo"> foo[]</codeBlock>' );
+
+						// <codeBlock language="foo"> foo[]</codeBlock>
+						model.change( writer => {
+							writer.insertText( ' ', model.document.getRoot().getChild( 0 ) );
+						} );
+
+						expect( outdentCommand.isEnabled ).to.be.false;
+
+						return editor.destroy();
+					} );
+			} );
+
+			it( 'should disable the command when the config is not set', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: false
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const outdentCommand = new OutdentCodeBlockCommand( editor );
+
+						setModelData( model, '<codeBlock language="foo">foo[]</codeBlock>' );
+
+						// <codeBlock language="foo">	foo[]</codeBlock>
+						model.change( writer => {
+							writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
+						} );
+
+						expect( outdentCommand.isEnabled ).to.be.false;
+
+						return editor.destroy();
+					} );
+			} );
+		} );
+	} );
+
+	describe( 'execute()', () => {
+		it( 'should outdent a single line', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+			// <codeBlock language="foo">	f[]oo</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			outdentCommand.execute();
+
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[]oo</codeBlock>' );
+		} );
+
+		it( 'should outdent only one level in a single line', () => {
+			setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+			// <codeBlock language="foo">		f[]oo</codeBlock>
+			model.change( writer => {
+				writer.insertText( '		', model.document.getRoot().getChild( 0 ) );
+			} );
+
+			outdentCommand.execute();
+
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">	f[]oo</codeBlock>' );
+		} );
+
+		it( 'should outdent multiple lines', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+
+			// <codeBlock language="foo">	f[oo<softBreak></softBreak>	ba]r</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ), 4 );
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ), 0 );
+			} );
+
+			outdentCommand.execute();
+
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+		} );
+
+		it( 'should outdent only one level across multiple lines', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+
+			// <codeBlock language="foo">	f[oo<softBreak></softBreak>		ba]r</codeBlock>
+			model.change( writer => {
+				writer.insertText( '		', model.document.getRoot().getChild( 0 ), 4 );
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ), 0 );
+			} );
+
+			outdentCommand.execute();
+
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>	ba]r</codeBlock>' );
+		} );
+
+		it( 'should outdent some lines', () => {
+			setModelData( model, '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+
+			// <codeBlock language="foo">f[oo<softBreak></softBreak>	ba]r</codeBlock>
+			model.change( writer => {
+				writer.insertText( '	', model.document.getRoot().getChild( 0 ), 4 );
+			} );
+
+			outdentCommand.execute();
+
+			expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[oo<softBreak></softBreak>ba]r</codeBlock>' );
+		} );
+
+		describe( 'config.codeBlock.indentSequence', () => {
+			it( 'should be respected', () => {
+				return ModelTestEditor
+					.create( {
+						plugins: [ CodeBlockEditing, Paragraph, BlockQuoteEditing, AlignmentEditing, BoldEditing ],
+						codeBlock: {
+							indentSequence: '  '
+						}
+					} )
+					.then( newEditor => {
+						const editor = newEditor;
+						const model = editor.model;
+						const outdentCommand = new OutdentCodeBlockCommand( editor );
+
+						setModelData( model, '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+						// <codeBlock language="foo">  f[]oo</codeBlock>
+						model.change( writer => {
+							writer.insertText( '  ', model.document.getRoot().getChild( 0 ) );
+						} );
+
+						outdentCommand.execute();
+
+						expect( getModelData( model ) ).to.equal( '<codeBlock language="foo">f[]oo</codeBlock>' );
+
+						return editor.destroy();
+					} );
+			} );
+		} );
+	} );
+} );

+ 1 - 1
packages/ckeditor5-code-block/theme/codeblock.css

@@ -21,7 +21,7 @@
 	font-style: normal;
 
 	/* Don't let the code be squashed e.g. when in a table cell. */
-	min-width: 60px;
+	min-width: 200px;
 
 	& code {
 		background: unset;