Fix bug where trailing whitespace wasn't stripped according to prefer…

…ence and terminal newlines weren't copied properly either.
gnachman · Apr 6, 2014 · d422fe6 · d422fe6
1 parent 069c11c
commit d422fe6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/PTYTextView.m b/PTYTextView.m
@@ -3695,7 +3695,7 @@ - (NSString *)selectedTextWithPad:(BOOL)pad
             iTermTextExtractor *extractor =
                 [iTermTextExtractor textExtractorWithDataSource:_dataSource];
             NSString *content = [extractor contentInRange:range
-                                               nullPolicy:kiTermTextExtractorNullPolicyTreatAsSpace
+                                               nullPolicy:kiTermTextExtractorNullPolicyMidlineAsSpaceIgnoreTerminal
                                                       pad:NO
                                        includeLastNewline:copyLastNewline
                                    trimTrailingWhitespace:trimWhitespace

diff --git a/iTermTextExtractor.h b/iTermTextExtractor.h
@@ -26,9 +26,10 @@ typedef enum {
 } iTermTextExtractorClass;
 
 typedef enum {
-    kiTermTextExtractorNullPolicyFromStartToFirst,
-    kiTermTextExtractorNullPolicyFromLastToEnd,
-    kiTermTextExtractorNullPolicyTreatAsSpace
+    kiTermTextExtractorNullPolicyFromStartToFirst,  // Ignore content prior to last null
+    kiTermTextExtractorNullPolicyFromLastToEnd,  // Ignore content after last null
+    kiTermTextExtractorNullPolicyTreatAsSpace,  // Treat midline nulls as spaces and a range of terminal nulls as a single space
+    kiTermTextExtractorNullPolicyMidlineAsSpaceIgnoreTerminal,  // Treat midline nulls as space and strip terminal nulls
 } iTermTextExtractorNullPolicy;
 
 @interface iTermTextExtractor : NSObject

diff --git a/iTermTextExtractor.m b/iTermTextExtractor.m
@@ -550,6 +550,7 @@ - (NSString *)contentInRange:(VT100GridWindowedRange)windowedRange
                                   case kiTermTextExtractorNullPolicyFromStartToFirst:
                                       return YES;
                                   case kiTermTextExtractorNullPolicyTreatAsSpace:
+                                  case kiTermTextExtractorNullPolicyMidlineAsSpaceIgnoreTerminal:
                                       [result appendString:@" "];
                                       break;
                               }
@@ -576,6 +577,8 @@ - (NSString *)contentInRange:(VT100GridWindowedRange)windowedRange
                                        case kiTermTextExtractorNullPolicyTreatAsSpace:
                                            [result appendString:@" "];
                                            break;
+                                       case kiTermTextExtractorNullPolicyMidlineAsSpaceIgnoreTerminal:
+                                           break;
                                    }
                                }
                                if (code == EOL_HARD &&
@@ -589,9 +592,10 @@ - (NSString *)contentInRange:(VT100GridWindowedRange)windowedRange
                            }];
 
     if (trimSelectionTrailingSpaces) {
-        [result stringByTrimmingTrailingWhitespace];
+        return [result stringByTrimmingTrailingWhitespace];
+    } else {
+        return result;
     }
-    return result;
 }
 
 
@@ -785,7 +789,11 @@ - (void)enumerateCharsInRange:(VT100GridWindowedRange)range
             }
         }
 
-        if (eolBlock && y != range.coordRange.end.y) {
+        BOOL haveReachedEol = YES;
+        if (y == range.coordRange.end.y) {
+            haveReachedEol = numNulls > 0;
+        }
+        if (eolBlock && haveReachedEol) {
             BOOL stop;
             if (fullWidth) {
                 stop = eolBlock(theLine[width].code, numNulls, y);