Commit: 1477288795fd9d0cf5f7afcad162ed2118cd1567 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 1477288795fd9d0cf5f7afcad162ed2118cd1567 (tree)
• Zeit: 2012-08-19 04:52:08
• Autor: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Redefine definition of paragraph

When we need to work on a paragraph (reflow, unwrap, select, etc.) we now extend upward until we see a blank line, and likewise move downward until there is a blank line.

This is related to issue #154.

Ändern Zusammenfassung

• modified: Frameworks/selection/src/selection.cc
• modified: Frameworks/selection/src/selection.h

Diff

--- a/Frameworks/selection/src/selection.cc
+++ b/Frameworks/selection/src/selection.cc
@@ -379,7 +379,7 @@ namespace ng
 			case kSelectionMoveToBeginOfDocument:     return 0; 
 			case kSelectionMoveToEndOfDocument:       return buffer.size();
 			case kSelectionMoveToBeginOfParagraph:    return buffer.begin(line);
-			case kSelectionMoveToEndOfParagraph:      return buffer.eol(line);    // TODO Better definition of kSelectionMoveToEndOfParagraph.
+			case kSelectionMoveToEndOfParagraph:      return buffer.eol(line);
 			case kSelectionMoveToBeginOfLine:         return buffer.begin(line);
 			case kSelectionMoveToEndOfLine:           return buffer.eol(line);
 			case kSelectionMoveToBeginOfSoftLine:     return layout ? layout->index_at_bol_for(caret) : buffer.begin(line);
@@ -393,6 +393,33 @@ namespace ng
 			case kSelectionMovePageUp:                return layout ? layout->page_up_for(index)   : index;
 			case kSelectionMovePageDown:              return layout ? layout->page_down_for(index) : index;
 
+			case kSelectionMoveToBeginOfHardParagraph:
+			{
+				if(line == 0)
+					return 0;
+
+				for(size_t n = line-1; n > 0; --n)
+				{
+					std::string const& line = buffer.substr(buffer.begin(n), buffer.end(n));
+					if(text::is_blank(line.data(), line.data() + line.size()))
+						return buffer.begin(n+1);
+				}
+				return 0;
+			}
+			break;
+
+			case kSelectionMoveToEndOfHardParagraph:
+			{
+				for(size_t n = line+1; n < buffer.lines(); ++n)
+				{
+					std::string const& line = buffer.substr(buffer.begin(n), buffer.end(n));
+					if(text::is_blank(line.data(), line.data() + line.size()))
+						return buffer.begin(n);
+				}
+				return buffer.size();
+			}
+			break;
+
 			case kSelectionMoveFreehandedLeft:
 			{
 				if(index.carry != 0)
@@ -692,7 +719,7 @@ namespace ng
 			case kSelectionExtendToSoftLine:           return range_t(move(buffer, min, kSelectionMoveToBeginOfSoftLine,          layout), min.index != max.index && max.index == move(buffer, max, kSelectionMoveToBeginOfSoftLine, layout).index ? max : move(buffer, move(buffer, max, kSelectionMoveToEndOfSoftLine, layout), kSelectionMoveRight, layout), false, false, true);
 			case kSelectionExtendToLine:               return range_t(move(buffer, min, kSelectionMoveToBeginOfLine,              layout), min.index != max.index && buffer.convert(max.index).column == 0 ? max : move(buffer, move(buffer, max, kSelectionMoveToEndOfLine, layout), kSelectionMoveRight, layout), false, false, true);
 			case kSelectionExtendToLineExclLF:         return range_t(move(buffer, min, kSelectionMoveToBeginOfLine,              layout), min.index != max.index && buffer.convert(max.index).column == 0 ? max : move(buffer, max, kSelectionMoveToEndOfLine, layout), false, false, true);
-			case kSelectionExtendToParagraph:          return range_t(move(buffer, min, kSelectionMoveToBeginOfParagraph,         layout), move(buffer, max, kSelectionMoveToEndOfParagraph, layout), false, false, true);
+			case kSelectionExtendToParagraph:          return range_t(move(buffer, min, kSelectionMoveToBeginOfHardParagraph,     layout), move(buffer, max, kSelectionMoveToEndOfHardParagraph, layout), false, false, true);
 			case kSelectionExtendToAll:                return range_t(move(buffer, min, kSelectionMoveToBeginOfDocument,          layout), move(buffer, max, kSelectionMoveToEndOfDocument,  layout), false, false, true);
 
 			case kSelectionExtendToWord:

--- a/Frameworks/selection/src/selection.h
+++ b/Frameworks/selection/src/selection.h
@@ -6,7 +6,7 @@
 #include <text/types.h>
 #include <oak/misc.h>
 
-enum move_unit_type { kSelectionMoveLeft, kSelectionMoveRight, kSelectionMoveFreehandedLeft, kSelectionMoveFreehandedRight, kSelectionMoveUp, kSelectionMoveDown, kSelectionMoveToBeginOfSelection, kSelectionMoveToEndOfSelection, kSelectionMoveToBeginOfSubWord, kSelectionMoveToEndOfSubWord, kSelectionMoveToBeginOfWord, kSelectionMoveToEndOfWord, kSelectionMoveToBeginOfSoftLine, kSelectionMoveToEndOfSoftLine, kSelectionMoveToBeginOfLine, kSelectionMoveToEndOfLine, kSelectionMoveToBeginOfParagraph, kSelectionMoveToEndOfParagraph, kSelectionMoveToBeginOfTypingPair, kSelectionMoveToEndOfTypingPair, kSelectionMoveToBeginOfColumn, kSelectionMoveToEndOfColumn, kSelectionMovePageUp, kSelectionMovePageDown, kSelectionMoveToBeginOfDocument, kSelectionMoveToEndOfDocument, kSelectionMoveNowhere };
+enum move_unit_type { kSelectionMoveLeft, kSelectionMoveRight, kSelectionMoveFreehandedLeft, kSelectionMoveFreehandedRight, kSelectionMoveUp, kSelectionMoveDown, kSelectionMoveToBeginOfSelection, kSelectionMoveToEndOfSelection, kSelectionMoveToBeginOfSubWord, kSelectionMoveToEndOfSubWord, kSelectionMoveToBeginOfWord, kSelectionMoveToEndOfWord, kSelectionMoveToBeginOfSoftLine, kSelectionMoveToEndOfSoftLine, kSelectionMoveToBeginOfLine, kSelectionMoveToEndOfLine, kSelectionMoveToBeginOfParagraph, kSelectionMoveToEndOfParagraph, kSelectionMoveToBeginOfHardParagraph, kSelectionMoveToEndOfHardParagraph, kSelectionMoveToBeginOfTypingPair, kSelectionMoveToEndOfTypingPair, kSelectionMoveToBeginOfColumn, kSelectionMoveToEndOfColumn, kSelectionMovePageUp, kSelectionMovePageDown, kSelectionMoveToBeginOfDocument, kSelectionMoveToEndOfDocument, kSelectionMoveNowhere };
 enum select_unit_type { kSelectionExtendLeft, kSelectionExtendRight, kSelectionExtendFreehandedLeft, kSelectionExtendFreehandedRight, kSelectionExtendUp, kSelectionExtendDown, kSelectionExtendToBeginOfSubWord, kSelectionExtendToEndOfSubWord, kSelectionExtendToBeginOfWord, kSelectionExtendToEndOfWord, kSelectionExtendToBeginOfSoftLine, kSelectionExtendToEndOfSoftLine, kSelectionExtendToBeginOfLine, kSelectionExtendToEndOfLine, kSelectionExtendToBeginOfParagraph, kSelectionExtendToEndOfParagraph, kSelectionExtendToBeginOfTypingPair, kSelectionExtendToEndOfTypingPair, kSelectionExtendToBeginOfColumn, kSelectionExtendToEndOfColumn, kSelectionExtendPageUp, kSelectionExtendPageDown, kSelectionExtendToBeginOfDocument, kSelectionExtendToEndOfDocument, kSelectionExtendToWord, kSelectionExtendToScope, kSelectionExtendToSoftLine, kSelectionExtendToLineExclLF, kSelectionExtendToLine, kSelectionExtendToParagraph, kSelectionExtendToTypingPair, kSelectionExtendToAll };
 
 namespace scope { struct context_t; struct selector_t; }