diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-05-17 09:02:10 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-05-17 09:02:10 +1000 |
| commit | e2ac00d7e452d30d4fc005647d503fd247c13ba5 (patch) | |
| tree | d9d5b76e44108b79b4d283c32d202c9e88ab407e | |
| parent | e08104d60449701647a0f71f6514e7d47d2d701b (diff) | |
| download | scintilla-mirror-e2ac00d7e452d30d4fc005647d503fd247c13ba5.tar.gz | |
Optimize InsertLines and DeleteLines for ContractionState if no folds contracted.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | src/ContractionState.cxx | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 0c1275d89..66fcaf36b 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -568,6 +568,10 @@ <a href="https://sourceforge.net/p/scintilla/feature-requests/1280/">Feature #1280</a>. </li> <li> + Improved performance of line folding code on large files when no folds are contracted. + This improves the time taken to open or close large files. + </li> + <li> Fix bug where changing identifier sets in lexers preserved previous identifiers. </li> <li> diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index 565f9e141..8b5821470 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -210,16 +210,24 @@ Sci::Line ContractionState<LINE>::DocFromDisplay(Sci::Line lineDisplay) const { template <typename LINE> void ContractionState<LINE>::InsertLines(Sci::Line lineDoc, Sci::Line lineCount) { - for (Sci::Line l = 0; l < lineCount; l++) { - InsertLine(lineDoc + l); + if (OneToOne()) { + linesInDocument += static_cast<LINE>(lineCount); + } else { + for (Sci::Line l = 0; l < lineCount; l++) { + InsertLine(lineDoc + l); + } } Check(); } template <typename LINE> void ContractionState<LINE>::DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) { - for (Sci::Line l = 0; l < lineCount; l++) { - DeleteLine(lineDoc); + if (OneToOne()) { + linesInDocument -= static_cast<LINE>(lineCount); + } else { + for (Sci::Line l = 0; l < lineCount; l++) { + DeleteLine(lineDoc); + } } Check(); } |