Merge branch 'master' into feature/remove-braces-from-if-statement

_templates/refactoring/new/error-reason-switch.ejs.t

@@ -8,4 +8,4 @@ after: switch
   noCaseErrorMessage = h.changeCase.noCase(errorReason.message)
 -%>
     case ErrorReason.<%= pascalErrorName %>:
-      return didNotFound("<%= noCaseErrorMessage %>");
+      return didNotFind("<%= noCaseErrorMessage %>");

_templates/refactoring/new/index.js

@@ -16,11 +16,11 @@ module.exports = {
             {
               name: "name",
               message: "Name of the error",
-              initial: "DidNotFoundIfElseToFlip"
+              initial: "DidNotFindIfElseToFlip"
             },
             {
               name: "message",
-              message: "Error message for the user => \"I didn't found",
+              message: "Error message for the user => \"I didn't find",
               initial: "an if statement to flip"
             }
           ]

src/editor/error-reason.ts

@@ -1,33 +1,33 @@
 export { ErrorReason, toString };
 
 enum ErrorReason {
-  DidNotFoundJsxAttributeToAddBracesTo,
-  DidNotFoundBracesToRemove,
-  DidNotFoundClassToExtractInterface,
-  DidNotFoundReactComponent,
-  DidNotFoundIfStatementToAddBraces,
-  DidNotFoundDeadCode,
-  DidNotFoundForLoopToConvert,
-  DidNotFoundStatementToMerge,
-  DidNotFoundNestedIf,
-  DidNotFoundBinaryExpression,
-  DidNotFoundExtractableCode,
-  DidNotFoundInlinableCode,
-  DidNotFoundInlinableCodeIdentifiers,
-  DidNotFoundNegatableExpression,
-  DidNotFoundRedundantElse,
-  DidNotFoundIfElseToFlip,
-  DidNotFoundTernaryToFlip,
-  DidNotFoundTernaryToSimplify,
-  DidNotFoundIfElseToConvert,
-  DidNotFoundTernaryToConvert,
-  DidNotFoundArrowFunctionToAddBraces,
-  DidNotFoundBracesToRemoveFromArrowFunction,
-  DidNotFoundBracesToRemoveFromIfStatement,
-  DidNotFoundIfStatementToSplit,
-  DidNotFoundIfStatementsToMerge,
-  DidNotFoundDeclarationToSplit,
-  DidNotFoundStringToConvert,
+  DidNotFindJsxAttributeToAddBracesTo,
+  DidNotFindBracesToRemove,
+  DidNotFindClassToExtractInterface,
+  DidNotFindReactComponent,
+  DidNotFindIfStatementToAddBraces,
+  DidNotFindDeadCode,
+  DidNotFindForLoopToConvert,
+  DidNotFindStatementToMerge,
+  DidNotFindNestedIf,
+  DidNotFindBinaryExpression,
+  DidNotFindExtractableCode,
+  DidNotFindInlinableCode,
+  DidNotFindInlinableCodeIdentifiers,
+  DidNotFindNegatableExpression,
+  DidNotFindRedundantElse,
+  DidNotFindIfElseToFlip,
+  DidNotFindTernaryToFlip,
+  DidNotFindTernaryToSimplify,
+  DidNotFindIfElseToConvert,
+  DidNotFindTernaryToConvert,
+  DidNotFindArrowFunctionToAddBraces,
+  DidNotFindBracesToRemoveFromArrowFunction,
+  DidNotfindBracesToRemoveFromIfStatement,
+  DidNotFindIfStatementToSplit,
+  DidNotFindIfStatementsToMerge,
+  DidNotFindDeclarationToSplit,
+  DidNotFindStringToConvert,
   CantMoveStatementUp,
   CantMoveMultiLinesStatementUp,
   CantMoveStatementDown,
@@ -43,86 +43,86 @@ enum ErrorReason {
 
 function toString(reason: ErrorReason): string {
   switch (reason) {
-    case ErrorReason.DidNotFoundJsxAttributeToAddBracesTo:
-      return didNotFound("a jsx attribute to add braces to");
+    case ErrorReason.DidNotFindJsxAttributeToAddBracesTo:
+      return didNotFind("a jsx attribute to add braces to");
 
-    case ErrorReason.DidNotFoundBracesToRemove:
-      return didNotFound("braces to remove from jsx attribute");
+    case ErrorReason.DidNotFindBracesToRemove:
+      return didNotFind("braces to remove from jsx attribute");
 
-    case ErrorReason.DidNotFoundClassToExtractInterface:
-      return didNotFound("a class to extract the interface");
+    case ErrorReason.DidNotFindClassToExtractInterface:
+      return didNotFind("a class to extract the interface");
 
-    case ErrorReason.DidNotFoundReactComponent:
-      return didNotFound("a React component to convert");
+    case ErrorReason.DidNotFindReactComponent:
+      return didNotFind("a React component to convert");
 
-    case ErrorReason.DidNotFoundIfStatementToAddBraces:
-      return didNotFound("a valid if statement to add braces to");
+    case ErrorReason.DidNotFindIfStatementToAddBraces:
+      return didNotFind("a valid if statement to add braces to");
 
-    case ErrorReason.DidNotFoundDeadCode:
-      return didNotFound("dead code to delete");
+    case ErrorReason.DidNotFindDeadCode:
+      return didNotFind("dead code to delete");
 
-    case ErrorReason.DidNotFoundForLoopToConvert:
-      return didNotFound("a valid for loop to convert");
+    case ErrorReason.DidNotFindForLoopToConvert:
+      return didNotFind("a valid for loop to convert");
 
-    case ErrorReason.DidNotFoundStatementToMerge:
-      return didNotFound("a statement to merge with");
+    case ErrorReason.DidNotFindStatementToMerge:
+      return didNotFind("a statement to merge with");
 
-    case ErrorReason.DidNotFoundNestedIf:
-      return didNotFound("a nested if to bubble up");
+    case ErrorReason.DidNotFindNestedIf:
+      return didNotFind("a nested if to bubble up");
 
-    case ErrorReason.DidNotFoundBinaryExpression:
-      return didNotFound("a binary expression to convert");
+    case ErrorReason.DidNotFindBinaryExpression:
+      return didNotFind("a binary expression to convert");
 
-    case ErrorReason.DidNotFoundExtractableCode:
-      return didNotFound("a valid code to extract");
+    case ErrorReason.DidNotFindExtractableCode:
+      return didNotFind("a valid code to extract");
 
-    case ErrorReason.DidNotFoundInlinableCode:
-      return didNotFound("a valid code to inline");
+    case ErrorReason.DidNotFindInlinableCode:
+      return didNotFind("a valid code to inline");
 
-    case ErrorReason.DidNotFoundInlinableCodeIdentifiers:
-      return "I didn't found references of this variable in the code 🤔";
+    case ErrorReason.DidNotFindInlinableCodeIdentifiers:
+      return "I didn't find references of this variable in the code 🤔";
 
-    case ErrorReason.DidNotFoundNegatableExpression:
-      return didNotFound("a valid expression to negate");
+    case ErrorReason.DidNotFindNegatableExpression:
+      return didNotFind("a valid expression to negate");
 
-    case ErrorReason.DidNotFoundRedundantElse:
-      return didNotFound("a redundant else to remove");
+    case ErrorReason.DidNotFindRedundantElse:
+      return didNotFind("a redundant else to remove");
 
-    case ErrorReason.DidNotFoundIfElseToFlip:
-      return didNotFound("an if statement to flip");
+    case ErrorReason.DidNotFindIfElseToFlip:
+      return didNotFind("an if statement to flip");
 
-    case ErrorReason.DidNotFoundTernaryToFlip:
-      return didNotFound("a ternary to flip");
+    case ErrorReason.DidNotFindTernaryToFlip:
+      return didNotFind("a ternary to flip");
 
-    case ErrorReason.DidNotFoundTernaryToSimplify:
-      return didNotFound("a ternary to simplify");
+    case ErrorReason.DidNotFindTernaryToSimplify:
+      return didNotFind("a ternary to simplify");
 
-    case ErrorReason.DidNotFoundIfElseToConvert:
-      return didNotFound("a valid if statement to convert");
+    case ErrorReason.DidNotFindIfElseToConvert:
+      return didNotFind("a valid if statement to convert");
 
-    case ErrorReason.DidNotFoundTernaryToConvert:
-      return didNotFound("a ternary to convert into if statement");
+    case ErrorReason.DidNotFindTernaryToConvert:
+      return didNotFind("a ternary to convert into if statement");
 
-    case ErrorReason.DidNotFoundArrowFunctionToAddBraces:
-      return didNotFound("an arrow function to add braces");
+    case ErrorReason.DidNotFindArrowFunctionToAddBraces:
+      return didNotFind("an arrow function to add braces");
 
-    case ErrorReason.DidNotFoundBracesToRemoveFromArrowFunction:
-      return didNotFound("braces to remove");
+    case ErrorReason.DidNotFindBracesToRemoveFromArrowFunction:
+      return didNotFind("braces to remove");
 
-    case ErrorReason.DidNotFoundBracesToRemoveFromIfStatement:
-      return didNotFound("braces to remove");
+    case ErrorReason.DidNotfindBracesToRemoveFromIfStatement:
+      return didNotFind("braces to remove");
 
-    case ErrorReason.DidNotFoundIfStatementToSplit:
-      return didNotFound("an if statement that can be split");
+    case ErrorReason.DidNotFindIfStatementToSplit:
+      return didNotFind("an if statement that can be split");
 
-    case ErrorReason.DidNotFoundIfStatementsToMerge:
-      return didNotFound("if statements that can be merged");
+    case ErrorReason.DidNotFindIfStatementsToMerge:
+      return didNotFind("if statements that can be merged");
 
-    case ErrorReason.DidNotFoundDeclarationToSplit:
-      return didNotFound("a declaration that can be splitted");
+    case ErrorReason.DidNotFindDeclarationToSplit:
+      return didNotFind("a declaration that can be splitted");
 
-    case ErrorReason.DidNotFoundStringToConvert:
-      return didNotFound("a string to convert into template literal");
+    case ErrorReason.DidNotFindStringToConvert:
+      return didNotFind("a string to convert into template literal");
 
     case ErrorReason.CantMoveStatementUp:
       return cantDoIt("move this statement up");
@@ -162,8 +162,8 @@ function toString(reason: ErrorReason): string {
   }
 }
 
-function didNotFound(element: string): string {
-  return `I didn't found ${element} from current selection 🤔`;
+function didNotFind(element: string): string {
+  return `I didn't find ${element} from current selection 🤔`;
 }
 
 function cantDoIt(element: string): string {

src/refactorings/add-braces-to-arrow-function/add-braces-to-arrow-function.test.ts

@@ -56,7 +56,7 @@ describe("Add Braces to Arrow Function", () => {
     await doAddBracesToArrowFunction(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundArrowFunctionToAddBraces
+      ErrorReason.DidNotFindArrowFunctionToAddBraces
     );
   });
 
@@ -69,7 +69,7 @@ describe("Add Braces to Arrow Function", () => {
     await doAddBracesToArrowFunction(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundArrowFunctionToAddBraces
+      ErrorReason.DidNotFindArrowFunctionToAddBraces
     );
   });
 

src/refactorings/add-braces-to-arrow-function/add-braces-to-arrow-function.ts

@@ -12,7 +12,7 @@ async function addBracesToArrowFunction(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundArrowFunctionToAddBraces);
+    editor.showError(ErrorReason.DidNotFindArrowFunctionToAddBraces);
     return;
   }
 

src/refactorings/add-braces-to-if-statement/add-braces-to-if-statement.test.ts

@@ -122,7 +122,7 @@ if (isValid) {
     await doAddBracesToIfStatement(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundIfStatementToAddBraces
+      ErrorReason.DidNotFindIfStatementToAddBraces
     );
   });
 
@@ -135,7 +135,7 @@ if (isValid) {
     await doAddBracesToIfStatement(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundIfStatementToAddBraces
+      ErrorReason.DidNotFindIfStatementToAddBraces
     );
   });
 

src/refactorings/add-braces-to-if-statement/add-braces-to-if-statement.ts

@@ -13,7 +13,7 @@ async function addBracesToIfStatement(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundIfStatementToAddBraces);
+    editor.showError(ErrorReason.DidNotFindIfStatementToAddBraces);
     return;
   }
 

src/refactorings/bubble-up-if-statement/bubble-up-if-statement.test.ts

@@ -289,7 +289,7 @@ if (canLog) {
 
     await doBubbleUpIfStatement(code, selection);
 
-    expect(showErrorMessage).toBeCalledWith(ErrorReason.DidNotFoundNestedIf);
+    expect(showErrorMessage).toBeCalledWith(ErrorReason.DidNotFindNestedIf);
   });
 
   async function doBubbleUpIfStatement(

src/refactorings/bubble-up-if-statement/bubble-up-if-statement.ts

@@ -12,7 +12,7 @@ async function bubbleUpIfStatement(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundNestedIf);
+    editor.showError(ErrorReason.DidNotFindNestedIf);
     return;
   }
 

src/refactorings/convert-for-to-foreach/convert-for-to-foreach.test.ts

@@ -208,7 +208,7 @@ items.forEach(item => {
     await doConvertForToForeach(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundForLoopToConvert
+      ErrorReason.DidNotFindForLoopToConvert
     );
   });
 

src/refactorings/convert-for-to-foreach/convert-for-to-foreach.ts

@@ -14,7 +14,7 @@ async function convertForToForeach(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundForLoopToConvert);
+    editor.showError(ErrorReason.DidNotFindForLoopToConvert);
     return;
   }
 

src/refactorings/convert-if-else-to-switch/convert-if-else-to-switch.test.ts

@@ -307,7 +307,7 @@ default:
     await doConvertIfElseToSwitch(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundIfElseToConvert
+      ErrorReason.DidNotFindIfElseToConvert
     );
   });
 

src/refactorings/convert-if-else-to-switch/convert-if-else-to-switch.ts

@@ -12,7 +12,7 @@ async function convertIfElseToSwitch(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundIfElseToConvert);
+    editor.showError(ErrorReason.DidNotFindIfElseToConvert);
     return;
   }
 

src/refactorings/convert-if-else-to-ternary/convert-if-else-to-ternary.test.ts

@@ -294,7 +294,7 @@ describe("Convert If/Else to Ternary", () => {
     await doConvertIfElseToTernary(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundIfElseToConvert
+      ErrorReason.DidNotFindIfElseToConvert
     );
   });
 

src/refactorings/convert-if-else-to-ternary/convert-if-else-to-ternary.ts

@@ -12,7 +12,7 @@ async function convertIfElseToTernary(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundIfElseToConvert);
+    editor.showError(ErrorReason.DidNotFindIfElseToConvert);
     return;
   }
 

src/refactorings/convert-ternary-to-if-else/convert-ternary-to-if-else.test.ts

@@ -230,7 +230,7 @@ describe("Convert Ternary to If/Else", () => {
     await doConvertTernaryToIfElse(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundTernaryToConvert
+      ErrorReason.DidNotFindTernaryToConvert
     );
   });
 

src/refactorings/convert-ternary-to-if-else/convert-ternary-to-if-else.ts

@@ -12,7 +12,7 @@ async function convertTernaryToIfElse(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundTernaryToConvert);
+    editor.showError(ErrorReason.DidNotFindTernaryToConvert);
     return;
   }
 

src/refactorings/convert-to-template-literal/convert-to-template-literal.test.ts

@@ -180,7 +180,7 @@ const name = \`Jane \${lastName} / \${age}\`;`
     await doConvertToTemplateLiteral(code, selection);
 
     expect(showErrorMessage).toBeCalledWith(
-      ErrorReason.DidNotFoundStringToConvert
+      ErrorReason.DidNotFindStringToConvert
     );
   });
 

src/refactorings/convert-to-template-literal/convert-to-template-literal.ts

@@ -12,7 +12,7 @@ async function convertToTemplateLiteral(
   const updatedCode = updateCode(t.parse(code), selection);
 
   if (!updatedCode.hasCodeChanged) {
-    editor.showError(ErrorReason.DidNotFoundStringToConvert);
+    editor.showError(ErrorReason.DidNotFindStringToConvert);
     return;
   }