Merge pull request #805 from Tyriar/801_null_check

Add null check when mouse coords are bad
This commit is contained in:
Daniel Imms
2017-07-20 09:19:09 -07:00
committed by GitHub
+11 -3
View File
@@ -522,6 +522,10 @@ export class SelectionManager extends EventEmitter {
*/ */
private _getWordAt(coords: [number, number]): IWordPosition { private _getWordAt(coords: [number, number]): IWordPosition {
const bufferLine = this._buffer.get(coords[1]); const bufferLine = this._buffer.get(coords[1]);
if (!bufferLine) {
return null;
}
const line = translateBufferLineToString(bufferLine, false); const line = translateBufferLineToString(bufferLine, false);
// Get actual index, taking into consideration wide characters // Get actual index, taking into consideration wide characters
@@ -590,8 +594,10 @@ export class SelectionManager extends EventEmitter {
*/ */
protected _selectWordAt(coords: [number, number]): void { protected _selectWordAt(coords: [number, number]): void {
const wordPosition = this._getWordAt(coords); const wordPosition = this._getWordAt(coords);
this._model.selectionStart = [wordPosition.start, coords[1]]; if (wordPosition) {
this._model.selectionStartLength = wordPosition.length; this._model.selectionStart = [wordPosition.start, coords[1]];
this._model.selectionStartLength = wordPosition.length;
}
} }
/** /**
@@ -600,7 +606,9 @@ export class SelectionManager extends EventEmitter {
*/ */
private _selectToWordAt(coords: [number, number]): void { private _selectToWordAt(coords: [number, number]): void {
const wordPosition = this._getWordAt(coords); const wordPosition = this._getWordAt(coords);
this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? wordPosition.start : (wordPosition.start + wordPosition.length), coords[1]]; if (wordPosition) {
this._model.selectionEnd = [this._model.areSelectionValuesReversed() ? wordPosition.start : (wordPosition.start + wordPosition.length), coords[1]];
}
} }
/** /**