Differential D17241 Diff 59548 src/render/katerenderer.cpp

Changeset View

Standalone View

View Options

src/render/katerenderer.cpp

Context not available.
388 388​
389QVector<QTextLayout::FormatRange> KateRenderer::decorationsForLine(const Kate::TextLine &textLine, int line, bool selectionsOnly, KateRenderRange *completionHighlight, bool completionSelected) const 389​QVector<QTextLayout::FormatRange> KateRenderer::decorationsForLine(const Kate::TextLine &textLine, int line, bool selectionsOnly, KateRenderRange *completionHighlight, bool completionSelected) const
390{ 390​{
391 QVector<QTextLayout::FormatRange> newHighlight; 391​ // limit number of attributes we can highlight in reasonable time
392​ const int limitOfRanges = 1024;
393​ auto rangesWithAttributes = m_doc->buffer().rangesForLine(line, m_printerFriendly ? nullptr : m_view, true);
394​ if (rangesWithAttributes.size() > limitOfRanges) {
395​ rangesWithAttributes.clear();
396​ }
397​ const auto &al = (textLine->attributesList().size() > limitOfRanges) ? QVector<Kate::TextLineData::Attribute>() : textLine->attributesList();
392 398​
393 // Don't compute the highlighting if there isn't going to be any highlighting 399​ // Don't compute the highlighting if there isn't going to be any highlighting
394 QList<Kate::TextRange *> rangesWithAttributes = m_doc->buffer().rangesForLine(line, m_printerFriendly ? nullptr : m_view, true); 400​ if (!(selectionsOnly || !al.isEmpty() || !rangesWithAttributes.isEmpty())) {
mwolffUnsubmitted
Done

this style-change should be submitted independently of this code review

mwolff: this style-change should be submitted independently of this code review
sarsUnsubmitted
Done

I figured that since I'm indenting the whole section and touching the line anyways, that fixing the style does not hurt. ;)

(Phabricator is not showing the white-space change)

sars: I figured that since I'm indenting the whole section and touching the line anyways, that fixing…
395 if (selectionsOnly || !textLine->attributesList().isEmpty() || !rangesWithAttributes.isEmpty()) { 401​ return QVector<QTextLayout::FormatRange>();
396 RenderRangeList renderRanges; 402​ }
397 403​
398 // Add the inbuilt highlighting to the list 404​ // Add the inbuilt highlighting to the list
405​ RenderRangeList renderRanges;
406​ if (!al.isEmpty()) {
399 NormalRenderRange *inbuiltHighlight = new NormalRenderRange(); 407​ NormalRenderRange *inbuiltHighlight = new NormalRenderRange();
400 const QVector<Kate::TextLineData::Attribute> &al = textLine->attributesList(); ​
401 for (int i = 0; i < al.count(); ++i) 408​ for (int i = 0; i < al.count(); ++i)
mwolffUnsubmitted
Not Done

couldn't the al.count be limited here? if I understand the patch correctly, we throw out all highlighting if we encounter too many ranges. but could we instead just skip the items that are beyond the limit?

mwolff: couldn't the al.count be limited here? if I understand the patch correctly, we throw out all…
402 if (al[i].length > 0 && al[i].attributeValue > 0) { 409​ if (al[i].length > 0 && al[i].attributeValue > 0) {
403 inbuiltHighlight->addRange(new KTextEditor::Range(KTextEditor::Cursor(line, al[i].offset), al[i].length), specificAttribute(al[i].attributeValue)); 410​ inbuiltHighlight->addRange(new KTextEditor::Range(KTextEditor::Cursor(line, al[i].offset), al[i].length), specificAttribute(al[i].attributeValue));
404 } 411​ }
405 renderRanges.append(inbuiltHighlight); 412​ renderRanges.append(inbuiltHighlight);
413​ }
406 414​
407 if (!completionHighlight) { 415​ if (!completionHighlight) {
408 // check for dynamic hl stuff 416​ // check for dynamic hl stuff
409 const QSet<Kate::TextRange *> *rangesMouseIn = m_view ? m_view->rangesMouseIn() : nullptr; 417​ const QSet<Kate::TextRange *> *rangesMouseIn = m_view ? m_view->rangesMouseIn() : nullptr;
410 const QSet<Kate::TextRange *> *rangesCaretIn = m_view ? m_view->rangesCaretIn() : nullptr; 418​ const QSet<Kate::TextRange *> *rangesCaretIn = m_view ? m_view->rangesCaretIn() : nullptr;
411 bool anyDynamicHlsActive = m_view && (!rangesMouseIn->empty() || !rangesCaretIn->empty()); 419​ bool anyDynamicHlsActive = m_view && (!rangesMouseIn->empty() || !rangesCaretIn->empty());
412 420​
413 // sort all ranges, we want that the most specific ranges win during rendering, multiple equal ranges are kind of random, still better than old smart rangs behavior ;) 421​ // sort all ranges, we want that the most specific ranges win during rendering, multiple equal ranges are kind of random, still better than old smart rangs behavior ;)
414 std::sort(rangesWithAttributes.begin(), rangesWithAttributes.end(), rangeLessThanForRenderer); 422​ std::sort(rangesWithAttributes.begin(), rangesWithAttributes.end(), rangeLessThanForRenderer);
415 423​
416 // loop over all ranges 424​ // loop over all ranges
417 for (int i = 0; i < rangesWithAttributes.size(); ++i) { 425​ for (int i = 0; i < rangesWithAttributes.size(); ++i) {
418 // real range 426​ // real range
419 Kate::TextRange *kateRange = rangesWithAttributes[i]; 427​ Kate::TextRange *kateRange = rangesWithAttributes[i];
420 428​
421 // calculate attribute, default: normal attribute 429​ // calculate attribute, default: normal attribute
422 KTextEditor::Attribute::Ptr attribute = kateRange->attribute(); 430​ KTextEditor::Attribute::Ptr attribute = kateRange->attribute();
423 if (anyDynamicHlsActive) { 431​ if (anyDynamicHlsActive) {
424 // check mouse in 432​ // check mouse in
425 if (KTextEditor::Attribute::Ptr attributeMouseIn = attribute->dynamicAttribute(KTextEditor::Attribute::ActivateMouseIn)) { 433​ if (KTextEditor::Attribute::Ptr attributeMouseIn = attribute->dynamicAttribute(KTextEditor::Attribute::ActivateMouseIn)) {
426 if (rangesMouseIn->contains(kateRange)) { 434​ if (rangesMouseIn->contains(kateRange)) {
427 attribute = attributeMouseIn; 435​ attribute = attributeMouseIn;
428 } ​
429 } 436​ }
437​ }
430 438​
431 // check caret in 439​ // check caret in
432 if (KTextEditor::Attribute::Ptr attributeCaretIn = attribute->dynamicAttribute(KTextEditor::Attribute::ActivateCaretIn)) { 440​ if (KTextEditor::Attribute::Ptr attributeCaretIn = attribute->dynamicAttribute(KTextEditor::Attribute::ActivateCaretIn)) {
433 if (rangesCaretIn->contains(kateRange)) { 441​ if (rangesCaretIn->contains(kateRange)) {
434 attribute = attributeCaretIn; 442​ attribute = attributeCaretIn;
435 } ​
436 } 443​ }
437 } 444​ }
438 ​
439 // span range ​
440 NormalRenderRange *additionaHl = new NormalRenderRange(); ​
441 additionaHl->addRange(new KTextEditor::Range(*kateRange), attribute); ​
442 renderRanges.append(additionaHl); ​
443 } 445​ }
444 } else { ​
445 // Add the code completion arbitrary highlight to the list ​
446 renderRanges.append(completionHighlight); ​
447 } ​
448 446​
449 // Add selection highlighting if we're creating the selection decorations 447​ // span range
450 if ((m_view && selectionsOnly && showSelections() && m_view->selection()) || (completionHighlight && completionSelected) || (m_view && m_view->blockSelection())) { 448​ NormalRenderRange *additionaHl = new NormalRenderRange();
451 NormalRenderRange *selectionHighlight = new NormalRenderRange(); 449​ additionaHl->addRange(new KTextEditor::Range(*kateRange), attribute);
450​ renderRanges.append(additionaHl);
451​ }
452​ } else {
453​ // Add the code completion arbitrary highlight to the list
454​ renderRanges.append(completionHighlight);
455​ }
452 456​
453 // Set up the selection background attribute TODO: move this elsewhere, eg. into the config? 457​ // Add selection highlighting if we're creating the selection decorations
454 static KTextEditor::Attribute::Ptr backgroundAttribute; 458​ if ((m_view && selectionsOnly && showSelections() && m_view->selection()) || (completionHighlight && completionSelected) || (m_view && m_view->blockSelection())) {
455 if (!backgroundAttribute) { 459​ NormalRenderRange *selectionHighlight = new NormalRenderRange();
456 backgroundAttribute = KTextEditor::Attribute::Ptr(new KTextEditor::Attribute()); ​
457 } ​
458 460​
459 backgroundAttribute->setBackground(config()->selectionColor()); 461​ // Set up the selection background attribute TODO: move this elsewhere, eg. into the config?
460 backgroundAttribute->setForeground(attribute(KTextEditor::dsNormal)->selectedForeground().color()); 462​ static KTextEditor::Attribute::Ptr backgroundAttribute;
463​ if (!backgroundAttribute) {
464​ backgroundAttribute = KTextEditor::Attribute::Ptr(new KTextEditor::Attribute());
465​ }
461 466​
462 // Create a range for the current selection 467​ backgroundAttribute->setBackground(config()->selectionColor());
463 if (completionHighlight && completionSelected) { 468​ backgroundAttribute->setForeground(attribute(KTextEditor::dsNormal)->selectedForeground().color());
464 selectionHighlight->addRange(new KTextEditor::Range(line, 0, line + 1, 0), backgroundAttribute); ​
465 } else if (m_view->blockSelection() && m_view->selectionRange().overlapsLine(line)) { ​
466 selectionHighlight->addRange(new KTextEditor::Range(m_doc->rangeOnLine(m_view->selectionRange(), line)), backgroundAttribute); ​
467 } else { ​
468 selectionHighlight->addRange(new KTextEditor::Range(m_view->selectionRange()), backgroundAttribute); ​
469 } ​
470 469​
471 renderRanges.append(selectionHighlight); 470​ // Create a range for the current selection
472 // highlighting for the vi visual modes 471​ if (completionHighlight && completionSelected) {
472​ selectionHighlight->addRange(new KTextEditor::Range(line, 0, line + 1, 0), backgroundAttribute);
473​ } else if (m_view->blockSelection() && m_view->selectionRange().overlapsLine(line)) {
474​ selectionHighlight->addRange(new KTextEditor::Range(m_doc->rangeOnLine(m_view->selectionRange(), line)), backgroundAttribute);
475​ } else {
476​ selectionHighlight->addRange(new KTextEditor::Range(m_view->selectionRange()), backgroundAttribute);
473 } 477​ }
474 478​
475 KTextEditor::Cursor currentPosition, endPosition; 479​ renderRanges.append(selectionHighlight);
480​ // highlighting for the vi visual modes
481​ }
476 482​
477 // Calculate the range which we need to iterate in order to get the highlighting for just this line 483​ // no render ranges, nothing to do, else we loop below endless!
478 if (m_view && selectionsOnly) { 484​ if (renderRanges.isEmpty()) {
479 if (m_view->blockSelection()) { 485​ return QVector<QTextLayout::FormatRange>();
480 KTextEditor::Range subRange = m_doc->rangeOnLine(m_view->selectionRange(), line); 486​ }
481 currentPosition = subRange.start(); ​
482 endPosition = subRange.end(); ​
483 } else { ​
484 KTextEditor::Range rangeNeeded = m_view->selectionRange() & KTextEditor::Range(line, 0, line + 1, 0); ​
485 487​
486 currentPosition = qMax(KTextEditor::Cursor(line, 0), rangeNeeded.start()); 488​ // Calculate the range which we need to iterate in order to get the highlighting for just this line
487 endPosition = qMin(KTextEditor::Cursor(line + 1, 0), rangeNeeded.end()); 489​ KTextEditor::Cursor currentPosition, endPosition;
488 } 490​ if (m_view && selectionsOnly) {
491​ if (m_view->blockSelection()) {
492​ KTextEditor::Range subRange = m_doc->rangeOnLine(m_view->selectionRange(), line);
493​ currentPosition = subRange.start();
494​ endPosition = subRange.end();
489 } else { 495​ } else {
490 currentPosition = KTextEditor::Cursor(line, 0); 496​ KTextEditor::Range rangeNeeded = m_view->selectionRange() & KTextEditor::Range(line, 0, line + 1, 0);
491 endPosition = KTextEditor::Cursor(line + 1, 0); 497​
498​ currentPosition = qMax(KTextEditor::Cursor(line, 0), rangeNeeded.start());
499​ endPosition = qMin(KTextEditor::Cursor(line + 1, 0), rangeNeeded.end());
492 } 500​ }
501​ } else {
502​ currentPosition = KTextEditor::Cursor(line, 0);
503​ endPosition = KTextEditor::Cursor(line + 1, 0);
504​ }
493 505​
494 // Main iterative loop. This walks through each set of highlighting ranges, and stops each 506​ // Main iterative loop. This walks through each set of highlighting ranges, and stops each
495 // time the highlighting changes. It then creates the corresponding QTextLayout::FormatRanges. 507​ // time the highlighting changes. It then creates the corresponding QTextLayout::FormatRanges.
496 while (currentPosition < endPosition) { 508​ QVector<QTextLayout::FormatRange> newHighlight;
497 renderRanges.advanceTo(currentPosition); 509​ while (currentPosition < endPosition) {
510​ renderRanges.advanceTo(currentPosition);
498 511​
499 if (!renderRanges.hasAttribute()) { 512​ if (!renderRanges.hasAttribute()) {
500 // No attribute, don't need to create a FormatRange for this text range 513​ // No attribute, don't need to create a FormatRange for this text range
501 currentPosition = renderRanges.nextBoundary(); 514​ currentPosition = renderRanges.nextBoundary();
502 continue; 515​ continue;
503 } 516​ }
504 517​
505 KTextEditor::Cursor nextPosition = renderRanges.nextBoundary(); 518​ KTextEditor::Cursor nextPosition = renderRanges.nextBoundary();
506 519​
507 // Create the format range and populate with the correct start, length and format info 520​ // Create the format range and populate with the correct start, length and format info
508 QTextLayout::FormatRange fr; 521​ QTextLayout::FormatRange fr;
509 fr.start = currentPosition.column(); 522​ fr.start = currentPosition.column();
510 523​
511 if (nextPosition < endPosition || endPosition.line() <= line) { 524​ if (nextPosition < endPosition || endPosition.line() <= line) {
512 fr.length = nextPosition.column() - currentPosition.column(); 525​ fr.length = nextPosition.column() - currentPosition.column();
513 526​
514 } else { 527​ } else {
515 // +1 to force background drawing at the end of the line when it's warranted 528​ // +1 to force background drawing at the end of the line when it's warranted
516 fr.length = textLine->length() - currentPosition.column() + 1; 529​ fr.length = textLine->length() - currentPosition.column() + 1;
517 } 530​ }
518 531​
519 KTextEditor::Attribute::Ptr a = renderRanges.generateAttribute(); 532​ KTextEditor::Attribute::Ptr a = renderRanges.generateAttribute();
520 if (a) { 533​ if (a) {
521 fr.format = *a; 534​ fr.format = *a;
522 535​
523 if (selectionsOnly) { 536​ if (selectionsOnly) {
524 assignSelectionBrushesFromAttribute(fr, *a); 537​ assignSelectionBrushesFromAttribute(fr, *a);
525 } ​
526 } 538​ }
527 ​
528 newHighlight.append(fr); ​
529 ​
530 currentPosition = nextPosition; ​
531 } 539​ }
532 540​
533 if (completionHighlight) 541​ newHighlight.append(fr);
534 // Don't delete external completion render range 542​
535 { 543​ currentPosition = nextPosition;
536 renderRanges.removeAll(completionHighlight); 544​ }
537 } ​
538 545​
539 qDeleteAll(renderRanges); 546​ if (completionHighlight)
547​ // Don't delete external completion render range
548​ {
549​ renderRanges.removeAll(completionHighlight);
540 } 550​ }
541 551​
552​ qDeleteAll(renderRanges);
542 return newHighlight; 553​ return newHighlight;
543} 554​}
544 555​
Context not available.