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

Merge pull request #14734 from atom/as-ns-clip-autoscroll

Browse Source 
Don't try to measure lines that don't exist
This commit is contained in:
Antonio Scandurra
2017-06-12 17:20:17 +02:00
committed by GitHub
parent 24051ec3a2 a314deeff9
commit d978a0f2cd
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/text-editor-component.js
View File

@@ -332,7 +332,7 @@ class TextEditorComponent {
this.derivedDimensionsCache = {}
this.updateModelSoftWrapColumn()
if (this.pendingAutoscroll) {
const {screenRange, options} = this.pendingAutoscroll
let {screenRange, options} = this.pendingAutoscroll
this.autoscrollVertically(screenRange, options)
this.requestHorizontalMeasurement(screenRange.start.row, screenRange.start.column)
this.requestHorizontalMeasurement(screenRange.end.row, screenRange.end.column)
@@ -2097,7 +2097,12 @@ class TextEditorComponent {
if (column === 0) return
if (row < this.getRenderedStartRow() || row >= this.getRenderedEndRow()) {
this.requestExtraLineToMeasure(row, this.props.model.screenLineForScreenRow(row))
const screenLine = this.props.model.screenLineForScreenRow(row)
if (screenLine) {
this.requestExtraLineToMeasure(row, screenLine)
} else {
return
}
}
let columns = this.horizontalPositionsToMeasure.get(row)