From 63da95a9d9f897dea6addf46341ffb3d01f6c95b Mon Sep 17 00:00:00 2001
From: Sigee <sigee15@gmail.com>
Date: Thu, 11 Jul 2024 11:32:00 +0200
Subject: [PATCH] Extract duplicated code into a method

---
 .../java/org/apache/commons/csv/Lexer.java    | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/Lexer.java b/src/main/java/org/apache/commons/csv/Lexer.java
index 91d97837..11fc26e1 100644
--- a/src/main/java/org/apache/commons/csv/Lexer.java
+++ b/src/main/java/org/apache/commons/csv/Lexer.java
@@ -348,16 +348,7 @@ final class Lexer implements Closeable {
                     }
                 }
             } else if (isEscape(c)) {
-                if (isEscapeDelimiter()) {
-                    token.content.append(delimiter);
-                } else {
-                    final int unescaped = readEscape();
-                    if (unescaped == EOF) { // unexpected char after escape
-                        token.content.append((char) c).append((char) reader.getLastChar());
-                    } else {
-                        token.content.append((char) unescaped);
-                    }
-                }
+                appendNextEscapedCharacterToToken(token);
             } else if (isEndOfFile(c)) {
                 if (lenientEof) {
                     token.type = Token.Type.EOF;
@@ -412,16 +403,7 @@ final class Lexer implements Closeable {
             }
             // continue
             if (isEscape(ch)) {
-                if (isEscapeDelimiter()) {
-                    token.content.append(delimiter);
-                } else {
-                    final int unescaped = readEscape();
-                    if (unescaped == EOF) { // unexpected char after escape
-                        token.content.append((char) ch).append((char) reader.getLastChar());
-                    } else {
-                        token.content.append((char) unescaped);
-                    }
-                }
+                appendNextEscapedCharacterToToken(token);
             } else {
                 token.content.append((char) ch);
             }
@@ -435,6 +417,27 @@ final class Lexer implements Closeable {
         return token;
     }
 
+    /**
+     * Appends the next escaped character to the token's content.
+     *
+     * @param token
+     *            the current token
+     * @throws IOException
+     *            on stream access error
+     */
+    private void appendNextEscapedCharacterToToken(final Token token) throws IOException {
+        if (isEscapeDelimiter()) {
+            token.content.append(delimiter);
+        } else {
+            final int unescaped = readEscape();
+            if (unescaped == EOF) { // unexpected char after escape
+                token.content.append(escape).append((char) reader.getLastChar());
+            } else {
+                token.content.append((char) unescaped);
+            }
+        }
+    }
+
     /**
      * Greedily accepts \n, \r and \r\n This checker consumes silently the second control-character...
      *