Small improvement for search term generation

Author: Malte311

javascripts/background/searchTermGeneration.js

@@ -32,6 +32,11 @@ function getSuggestion(term, callback) {
  * @param {function} callback Mandatory callback function with suggestion as parameter. 
  */
 function getSuggestionRecursive(original, current, runs, alreadyDone, callback) {
+	if (isValid(original, current)) {
+		callback(current);
+		return;
+	}
+
 	var words = getAllWords(current);
 	words = words.filter(w => w.split(' ').length <= original.split(' ').length);
 	words = words.filter(w => !alreadyDone.includes(w));
@@ -57,11 +62,8 @@ function getSuggestionRecursive(original, current, runs, alreadyDone, callback)
 					}
 
 					alreadyDone.push(suggestion);
-	
-					var suggestionWords = suggestion.split(' ');
-					var termWords = original.split(' ');
-					if (suggestionWords.length == termWords.length &&
-						!suggestionWords.some(w => termWords.includes(w))) {
+
+					if (isValid(original, suggestion)) {
 						callback(suggestion); // No inCallback() call: break from loop
 						return;
 					} else {
@@ -173,4 +175,19 @@ function chooseTerm(suggestions, alreadyChosen) {
 	}
 
 	return '';
+}
+
+/**
+ * Checks if a suggestion is valid, i.e., it contains the same number of words as the original
+ * term and it contains not a single word of the original term.
+ * 
+ * @param {string} originalTerm The original term.
+ * @param {string} suggestionTerm The suggestion to be checked.
+ */
+function isValid(originalTerm, suggestionTerm) {
+	var suggestionWords = suggestionTerm.split(' ');
+	var originalWords = originalTerm.split(' ');
+
+	return suggestionWords.length == originalWords.length && 
+		   !suggestionWords.some(w => originalWords.includes(w));
 }

readme.md

@@ -7,11 +7,11 @@
 ## Lines of code
 |Language                     |files          |blank        |comment           |code|
 |-----------------------------|---------------|-------------|------------------|----|
-|JavaScript                   |   21          |  217        |    558           |1066|
+|JavaScript                   |   21          |  220        |    565           |1073|
 |HTML                         |    2          |   10        |      1           | 116|
 |JSON                         |    2          |    0        |      0           |  84|
 |Bourne Shell                 |    1          |   13        |      8           |  38|
 |CSS                          |    2          |    4        |      6           |  34|
 |Markdown                     |    1          |    3        |      0           |  14|
 |-                            |-              |-            |-                 |-   |
-|SUM:                         |   29          |  247        |    573           |1352|
+|SUM:                         |   29          |  250        |    580           |1359|