yes honey

Author: Miodec

frontend/src/ts/input/handlers/insert-text.ts

@@ -33,6 +33,7 @@ import { goToNextWord } from "../helpers/word-navigation";
 import { onBeforeInsertText } from "./before-insert-text";
 import { shouldGoToNextWord, isCharCorrect } from "../helpers/validation";
 import { getCurrentInput, logTestEvent } from "../../test/events/data";
+import { isCommitCharacter } from "../helpers/util";
 
 const charOverrides = new Map<string, string>([
   ["…", "..."],
@@ -142,6 +143,11 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
   const wordIndex = TestState.activeWordIndex;
   const correctShiftUsed =
     Config.oppositeShiftMode === "off" ? null : isCorrectShiftUsed();
+  const isCommit = isCommitCharacter({
+    data,
+    inputValue: testInput,
+    targetWord: currentWord,
+  });
 
   // is char correct
   const correct = isCharCorrect({
@@ -174,6 +180,7 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
       data,
       inputValue: testInput,
       targetWord: currentWord,
+      isCommitCharacter: isCommit,
     });
 
   if (correctShiftUsed === false) {
@@ -274,6 +281,7 @@ export async function onInsertText(options: OnInsertTextParams): Promise<void> {
         testInput: testInput,
         targetWord: currentWord,
         correct,
+        isCommitCharacter: isCommit,
       })
     ) {
       TestLogic.fail("difficulty");

frontend/src/ts/input/helpers/fail-or-finish.ts

@@ -1,6 +1,5 @@
 import { Config } from "../../config/store";
 import { whorf } from "../../utils/misc";
-import { isCommitCharacter } from "./util";
 
 /**
  * Check if the test should fail due to minimum burst settings
@@ -46,20 +45,17 @@ export function checkIfFailedDueToDifficulty(options: {
   testInput: string;
   targetWord: string;
   correct: boolean;
+  isCommitCharacter: boolean;
 }): boolean {
-  const { data, testInput, correct, targetWord } = options;
+  const { data, testInput, correct, targetWord, isCommitCharacter } = options;
   // Using space or newline instead of shouldInsertSpace or increasedWordIndex
   // because we want expert mode to fail no matter if confidence or stop on error is on
 
   if (Config.mode === "zen") return false;
 
   const shouldFailDueToExpert =
     Config.difficulty === "expert" &&
-    isCommitCharacter({
-      data,
-      inputValue: testInput,
-      targetWord,
-    }) &&
+    isCommitCharacter &&
     testInput + data !== targetWord;
 
   const shouldFailDueToMaster = Config.difficulty === "master" && !correct;

frontend/src/ts/input/helpers/validation.ts

@@ -1,5 +1,4 @@
 import { Config } from "../../config/store";
-import { isCommitCharacter } from "./util";
 
 /**
  * Check if the input data is correct
@@ -40,12 +39,11 @@ export function shouldGoToNextWord(options: {
   data: string;
   inputValue: string;
   targetWord: string;
+  isCommitCharacter: boolean;
 }): boolean {
-  const { inputValue, targetWord, data } = options;
+  const { inputValue, targetWord, data, isCommitCharacter } = options;
 
-  const isCommit = isCommitCharacter(options);
-
-  if (!isCommit) return false;
+  if (!isCommitCharacter) return false;
 
   if (Config.mode === "zen") return true;