Merge branch 'master' into ck/5954-memory-leaks

ckeditor · Nov 4, 2021 · 5144be2 · 5144be2
2 parents 546d453 + 9dc7bd8
commit 5144be2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/docs/framework/guides/package-generator.md b/docs/framework/guides/package-generator.md
@@ -32,14 +32,14 @@ Available modifiers for the command are:
 
 After successfully creating the new package, enter it by executing the following command:
 
-```
-// assuming that your package was created with `ckeditor5-foo` as its name
+```bash
+# Assuming that your package was created with `ckeditor5-foo` as its name.
 cd ckeditor5-foo
 ```
 
 Then run the test environment for the plugin by executing:
 
-```
+```bash
 npm run start
 ```
 

diff --git a/packages/ckeditor5-find-and-replace/src/utils.js b/packages/ckeditor5-find-and-replace/src/utils.js
@@ -150,7 +150,7 @@ export function findByTextCallback( searchTerm, options ) {
 		}
 
 		if ( !new RegExp( nonLetterGroup + '$' ).test( searchTerm ) ) {
-			regExpQuery = `${ regExpQuery }(?:_|${ nonLetterGroup }|$)`;
+			regExpQuery = `${ regExpQuery }(?=_|${ nonLetterGroup }|$)`;
 		}
 	}
 

diff --git a/packages/ckeditor5-find-and-replace/tests/findcommand.js b/packages/ckeditor5-find-and-replace/tests/findcommand.js
@@ -299,6 +299,14 @@ describe( 'FindCommand', () => {
 					expect( results.length ).to.equal( 0 );
 				} );
 
+				it( 'set to true matches words separated by a single space', () => {
+					editor.setData( '<p>bar bar</p>' );
+
+					const { results } = command.execute( 'bar', { wholeWords: true } );
+
+					expect( results.length ).to.equal( 2 );
+				} );
+
 				it( 'is disabled by default', () => {
 					editor.setData( '<p>foo aabaraa</p>' );