From e6a5c9d9354f1feb130ed326517f105ccb45a68f Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 7 Jul 2016 17:22:47 -0700 Subject: [PATCH] Fixes #7346: Paste native EOL --- .../parts/terminal/electron-browser/terminalInstance.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index 4f99d11e8cd..60681767ba8 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -6,6 +6,7 @@ import DOM = require('vs/base/browser/dom'); import lifecycle = require('vs/base/common/lifecycle'); import nls = require('vs/nls'); +import os = require('os'); import platform = require('vs/base/common/platform'); import xterm = require('xterm'); import {Dimension} from 'vs/base/browser/builder'; @@ -15,6 +16,9 @@ import {ITerminalProcess, ITerminalService} from 'vs/workbench/parts/terminal/el import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; export class TerminalInstance { + + private static eolRegex = /\r?\n/g; + private isExiting: boolean = false; private toDispose: lifecycle.IDisposable[]; @@ -45,7 +49,7 @@ export class TerminalInstance { this.xterm.on('data', (data) => { this.terminalProcess.process.send({ event: 'input', - data: data + data: data && data.replace(TerminalInstance.eolRegex, os.EOL) }); return false; }); -- GitLab