Merge branch 'master' into 745_colon_word_sep

This commit is contained in:
Daniel Imms
2017-07-02 12:30:45 -07:00
committed by GitHub
4 changed files with 40 additions and 25 deletions
+2 -1
View File
@@ -178,6 +178,7 @@ export class SelectionManager extends EventEmitter {
*/
public setBuffer(buffer: CircularList<any>): void {
this._buffer = buffer;
this.clearSelection();
}
/**
@@ -233,7 +234,7 @@ export class SelectionManager extends EventEmitter {
// and joining the array into a multi-line string.
const formattedResult = result.map(line => {
return line.replace(ALL_NON_BREAKING_SPACE_REGEX, ' ');
}).join('\n');
}).join(Browser.isMSWindows ? '\r\n' : '\n');
return formattedResult;
}