Fix #100

Author: cowtowncoder

release-notes/CREDITS

@@ -61,3 +61,8 @@ Rob Baily (rob-baily@github)
 * Contributed fix for #93: CSV mapper does not support Views or filtering correctly
   for serialization
  (2.6.5)
+
+dharaburda@github)
+
+* Contributed fix for #100: trim spaces: don't trim/strip separator character
+ (2.6.5)

src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java

@@ -908,17 +908,18 @@ protected final int _nextChar() throws IOException
         }
         return _inputBuffer[_inputPtr++];
     }
-    
+
     protected final int _skipLeadingSpace() throws IOException
     {
+        final int sep = _separatorChar;
         while (true) {
             if (_inputPtr >= _inputEnd) {
                 if (!loadMore()) {
                     return -1;
                 }
             }
             char ch = _inputBuffer[_inputPtr++];
-            if (ch > ' ') {
+            if ((ch > ' ') || (ch == sep)) {
                 return ch;
             }
             switch (ch) {
@@ -928,7 +929,7 @@ protected final int _skipLeadingSpace() throws IOException
             }
         }
     }
-    
+
     /*
     /**********************************************************************
     /* Numeric accessors for CsvParser

src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ParserTrimSpacesTest.java

@@ -80,4 +80,38 @@ public void testTrimming() throws Exception
         assertFalse(it.hasNext());
         it.close();
     }
+
+    // for [dataformat-csv#100]: Do not eat tabs when trimming space
+    public void testTrimmingTabSeparated() throws Exception
+    {
+        CsvMapper mapper = mapperForCsv();
+        mapper.enable(CsvParser.Feature.TRIM_SPACES);
+        CsvSchema schema = mapper.schemaFor(Entry.class).withColumnSeparator('\t');
+        MappingIterator<Entry> it = mapper.readerFor(Entry.class).with(schema).
+        readValues(
+            "a\t\t  c\n 1\t2\t\" 3\" \n\"ab\" \t\"c  \t\"\t  \n"
+        );
+        Entry entry;
+
+        assertTrue(it.hasNext());
+        assertNotNull(entry = it.nextValue());
+        assertEquals("a", entry.a);
+        assertEquals("", entry.b);
+        assertEquals("c", entry.c);
+
+        assertTrue(it.hasNext());
+        assertNotNull(entry = it.nextValue());
+        assertEquals("1", entry.a);
+        assertEquals("2", entry.b);
+        assertEquals(" 3", entry.c); // note: space within quotes is preserved
+
+        assertTrue(it.hasNext());
+        assertNotNull(entry = it.nextValue());
+        assertEquals("ab", entry.a);
+        assertEquals("c  \t", entry.b);
+        assertEquals("", entry.c);
+
+        assertFalse(it.hasNext());
+        it.close();
+    }
 }