Skip to content

Commit

Permalink
optimize prune hyperlinks
Browse files Browse the repository at this point in the history
  • Loading branch information
@PankajBhojwani
PankajBhojwani committed Aug 21, 2020
1 parent d0de3d5 commit eb3cda5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 17 deletions.
17 changes: 17 additions & 0 deletions src/buffer/out/AttrRow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,23 @@ size_t ATTR_ROW::FindAttrIndex(const size_t index, size_t* const pApplies) const
return runPos - _list.cbegin();
}

// Routine Description:
// - Finds the hyperlink IDs present in this row and returns them
// Return value:
// - An unordered set containing the hyperlink IDs present in this row
std::unordered_set<uint16_t> ATTR_ROW::GetHyperlinks()
{
std::unordered_set<uint16_t> ids;
for (const auto& run : _list)
{
if (run.GetAttributes().IsHyperlink())
{
ids.emplace(run.GetAttributes().GetHyperlinkId());
}
}
return ids;
}

// Routine Description:
// - Sets the attributes (colors) of all character positions from the given position through the end of the row.
// Arguments:
Expand Down
2 changes: 2 additions & 0 deletions src/buffer/out/AttrRow.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class ATTR_ROW final
size_t FindAttrIndex(const size_t index,
size_t* const pApplies) const;

std::unordered_set<uint16_t> GetHyperlinks();

bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith) noexcept;

Expand Down
26 changes: 9 additions & 17 deletions src/buffer/out/textBuffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,21 +1191,13 @@ const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::w

void TextBuffer::_PruneHyperlinks()
{
// First, check the old first row for hyperlink references
// Check the old first row for hyperlink references
// If there are any, search the entire buffer for the same reference
// If the buffer does not contain the same reference, we can remove that hyperlink from our map
// This way, obsolete hyperlink references are cleared from our hyperlink map instead of hanging around
std::unordered_set<uint16_t> refs;
const auto firstAttrRow = _storage.at(_firstRow).GetAttrRow();
// Get all the hyperlink references in the row we're erasing
for (auto it = firstAttrRow.begin(); it != firstAttrRow.end(); ++it)
{
if (it->IsHyperlink())
{
refs.emplace(it->GetHyperlinkId());
}
}
if (!refs.empty())
auto firstRowRefs = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
if (!firstRowRefs.empty())
{
const auto total = TotalRowCount();
// Loop through all the rows in the buffer except the first row -
Expand All @@ -1214,15 +1206,15 @@ void TextBuffer::_PruneHyperlinks()
// to see if those references are anywhere else
for (size_t i = 1; i != total; ++i)
{
const auto attrRow = GetRowByOffset(i).GetAttrRow();
for (auto it = attrRow.begin(); it != attrRow.end(); ++it)
const auto nextRowRefs = GetRowByOffset(i).GetAttrRow().GetHyperlinks();
for (auto id : nextRowRefs)
{
if (it->IsHyperlink() && (refs.find(it->GetHyperlinkId()) != refs.end()))
if (firstRowRefs.find(id) != firstRowRefs.end())
{
refs.erase(it->GetHyperlinkId());
firstRowRefs.erase(id);
}
}
if (refs.empty())
if (firstRowRefs.empty())
{
// No more hyperlink references left to search for, terminate early
break;
Expand All @@ -1231,7 +1223,7 @@ void TextBuffer::_PruneHyperlinks()
}

// Now delete obsolete references from our map
for (auto hyperlinkReference : refs)
for (auto hyperlinkReference : firstRowRefs)
{
RemoveHyperlinkFromMap(hyperlinkReference);
}
Expand Down

1 comment on commit eb3cda5

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New misspellings found, please review:

  • Hyperlinks
To accept these changes, run the following commands 
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect/alphabet.txt
.github/actions/spell-check/expect/expect.txt
.github/actions/spell-check/expect/web.txt"');
@ARGV=@expect_files;
my @stale=qw('"Autogenerated debugbreak DECLL DECSMBV Inplace notypeopt restrictederrorinfo Scs Wlk "');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
  if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
  next if /^($re)(?:$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect/eb3cda55e9aaac282190f53e7f4249fcfa1e390a.txt";
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"autogenerated Hyperlinks inplace "');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a) cmp lc($b)} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;'
git add .github/actions/spell-check/expect || echo '... you want to ensure .github/actions/spell-check/expect/eb3cda55e9aaac282190f53e7f4249fcfa1e390a.txt is added to your repository...'
✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. You can copy the contents of each perl command excluding the outer ' marks and dropping any '"/"' quotation mark pairs into a file and then run perl file.pl from the root of the repository to run the code. Alternatively, you can manually insert the items...

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spell-check/dictionary/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spell-check/dictionary/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spell-check/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spell-check/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The :check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

⚠️ Reviewers

At present, the action that triggered this message will not show its ❌ in this PR unless the branch is within this repository.
Thus, you should make sure that this comment has been addressed before encouraging the merge bot to merge this PR.

Please sign in to comment.