Use correct new line character when copying query results (#4170)

This commit is contained in:
Matt Irvine
2019-02-25 16:39:57 -08:00
committed by GitHub
parent d0a4a4242d
commit 07983d75ea

View File

@@ -26,6 +26,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { ResultSerializer } from 'sql/platform/node/resultSerializer'; import { ResultSerializer } from 'sql/platform/node/resultSerializer';
import { TPromise } from 'vs/base/common/winjs.base'; import { TPromise } from 'vs/base/common/winjs.base';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { URI } from 'vs/base/common/uri';
export interface IEditSessionReadyEvent { export interface IEditSessionReadyEvent {
ownerUri: string; ownerUri: string;
@@ -113,7 +115,8 @@ export default class QueryRunner extends Disposable {
@INotificationService private _notificationService: INotificationService, @INotificationService private _notificationService: INotificationService,
@IConfigurationService private _configurationService: IConfigurationService, @IConfigurationService private _configurationService: IConfigurationService,
@IClipboardService private _clipboardService: IClipboardService, @IClipboardService private _clipboardService: IClipboardService,
@IInstantiationService private instantiationService: IInstantiationService @IInstantiationService private instantiationService: IInstantiationService,
@ITextResourcePropertiesService private _textResourcePropertiesService: ITextResourcePropertiesService
) { ) {
super(); super();
} }
@@ -597,8 +600,7 @@ export default class QueryRunner extends Disposable {
} }
private getEolString(): string { private getEolString(): string {
const { eol } = this._configurationService.getValue<{ eol: string }>('files'); return this._textResourcePropertiesService.getEOL(URI.parse(this.uri), 'sql');
return eol;
} }
private shouldIncludeHeaders(includeHeaders: boolean): boolean { private shouldIncludeHeaders(includeHeaders: boolean): boolean {