Rewrite

Author: hammadkhan2020

src/main/java/org/apache/commons/csv/CSVFormat.java

@@ -2236,35 +2236,32 @@ public synchronized void printRecord(final Appendable appendable, final Object..
      * Note: Must only be called if escaping is enabled, otherwise can throw exceptions.
      */
     private void printWithEscapes(final CharSequence charSeq, final Appendable appendable) throws IOException {
-        
-        final char[] delimArray = getDelimiterCharArray();
-        final int delimLength = delimArray.length;
-        final char escape = getEscapeChar();
-
         int start = 0;
         int pos = 0;
         final int end = charSeq.length();
+        final char[] delimArray = getDelimiterCharArray();
+        final int delimLength = delimArray.length;
+        final char escape = getEscapeChar();
 
         while (pos < end) {
             char c = charSeq.charAt(pos);
-            
+            final boolean isDelimiterStart = isDelimiter(c, charSeq, pos, delimArray, delimLength);
             final boolean isCr = c == Constants.CR;
             final boolean isLf = c == Constants.LF;
-            if (isDelimiter(c, charSeq, pos, delimArray, delimLength) || isCr || isLf || c == escape){
-                // handle escaped character or delimiter
+            if (isCr || isLf || c == escape || isDelimiterStart) {
+                // write out segment up until this char
                 if (pos > start) {
                     appendable.append(charSeq, start, pos);
-                    // write out segment until this char
                 }
                 if (isLf) {
-                    c = 'n'; // convert isLF to 'n'
+                    c = 'n';
                 } else if (isCr) {
-                    c = 'r'; // convert isCR to 'r'
+                    c = 'r';
                 }
                 escape(c, appendable);
-                {
-                    while (++pos < end && isDelimiter(charSeq.charAt(pos), delim, delimLength)) {
-                    
+                if (isDelimiterStart) {
+                    for (int i = 1; i < delimLength; i++) {
+                        pos++;
                         escape(charSeq.charAt(pos), appendable);
                     }
                 }