Browse Source

XML and HTML are treated as separates languages.

Kamil Piechaczek 5 years ago
parent
commit
b8831a082e

+ 2 - 1
packages/ckeditor5-code-block/src/codeblockediting.js

@@ -61,13 +61,14 @@ export default class CodeBlockEditing extends Plugin {
 				{ language: 'cpp', label: 'C++' },
 				{ language: 'css', label: 'CSS' },
 				{ language: 'diff', label: 'Diff' },
-				{ language: 'xml', label: 'HTML/XML' },
+				{ language: 'html', label: 'HTML' },
 				{ language: 'java', label: 'Java' },
 				{ language: 'javascript', label: 'JavaScript' },
 				{ language: 'php', label: 'PHP' },
 				{ language: 'python', label: 'Python' },
 				{ language: 'ruby', label: 'Ruby' },
 				{ language: 'typescript', label: 'TypeScript' },
+				{ language: 'xml', label: 'XML' },
 			],
 
 			// A single tab.

+ 3 - 2
packages/ckeditor5-code-block/tests/codeblockediting.js

@@ -83,13 +83,14 @@ describe( 'CodeBlockEditing', () => {
 						{ language: 'cpp', label: 'C++' },
 						{ language: 'css', label: 'CSS' },
 						{ language: 'diff', label: 'Diff' },
-						{ language: 'xml', label: 'HTML/XML' },
+						{ language: 'html', label: 'HTML' },
 						{ language: 'java', label: 'Java' },
 						{ language: 'javascript', label: 'JavaScript' },
 						{ language: 'php', label: 'PHP' },
 						{ language: 'python', label: 'Python' },
 						{ language: 'ruby', label: 'Ruby' },
-						{ language: 'typescript', label: 'TypeScript' }
+						{ language: 'typescript', label: 'TypeScript' },
+						{ language: 'xml', label: 'XML' }
 					] );
 				} );
 			} );

+ 5 - 1
packages/ckeditor5-code-block/tests/codeblockui.js

@@ -121,7 +121,7 @@ describe( 'CodeBlockUI', () => {
 							withText: true
 						},
 						{
-							label: 'HTML/XML',
+							label: 'HTML',
 							withText: true
 						},
 						{
@@ -147,6 +147,10 @@ describe( 'CodeBlockUI', () => {
 						{
 							label: 'TypeScript',
 							withText: true
+						},
+						{
+							label: 'XML',
+							withText: true
 						}
 					] );
 			} );