github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code to remove a bookmark

Browse Source
This commit is contained in:
Allan Odgaard
2014-10-19 12:11:46 +02:00
parent a22801f615
commit 12b981a202
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Frameworks/OakTextView/src/OakDocumentView.mm
View File

@@ -800,12 +800,8 @@ private:
if([columnIdentifier isEqualToString:kBookmarksColumnIdentifier])
{
ng::buffer_t& buf = document->buffer();
std::map<size_t, std::string> const& marks = buf.get_marks(buf.begin(lineNumber), buf.eol(lineNumber), document::kBookmarkIdentifier);
for(auto const& pair : marks)
{
if(pair.second == document::kBookmarkIdentifier)
return buf.remove_mark(buf.begin(lineNumber) + pair.first, pair.second);
}
for(auto const& pair : buf.get_marks(buf.begin(lineNumber), buf.eol(lineNumber), document::kBookmarkIdentifier))
return buf.remove_mark(buf.begin(lineNumber) + pair.first, document::kBookmarkIdentifier);
buf.set_mark(buf.begin(lineNumber), document::kBookmarkIdentifier);
}
else if([columnIdentifier isEqualToString:kFoldingsColumnIdentifier])
@@ -827,12 +823,8 @@ private:
size_t lineNumber = sel.last().max().line;
std::vector<size_t> toRemove;
std::map<size_t, std::string> const& marks = buf.get_marks(buf.begin(lineNumber), buf.eol(lineNumber), document::kBookmarkIdentifier);
for(auto const& pair : marks)
{
if(pair.second == document::kBookmarkIdentifier)
toRemove.push_back(buf.begin(lineNumber) + pair.first);
}
for(auto const& pair : buf.get_marks(buf.begin(lineNumber), buf.eol(lineNumber), document::kBookmarkIdentifier))
toRemove.push_back(pair.first);
if(toRemove.empty())
{