ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/platform/clipboard/common/clipboardService.ts
View File

@@ -15,12 +15,12 @@ export interface IClipboardService {
/**
* Writes text to the system clipboard.
*/
writeText(text: string): void;
writeText(text: string, type?: string): void;
/**
* Reads the content of the clipboard in plain text
*/
readText(): string;
readText(type?: string): string;
/**
* Reads text from the system find pasteboard.

21
src/vs/platform/clipboard/electron-browser/clipboardService.ts
View File

@@ -10,20 +10,19 @@ import { isMacintosh } from 'vs/base/common/platform';
export class ClipboardService implements IClipboardService {
// Clipboard format for files
private static FILE_FORMAT = 'code/file-list';
private static FILE_FORMAT = 'code/file-list'; // Clipboard format for files
_serviceBrand: any;
public writeText(text: string): void {
clipboard.writeText(text);
writeText(text: string, type?: string): void {
clipboard.writeText(text, type);
}
public readText(): string {
return clipboard.readText();
readText(type?: string): string {
return clipboard.readText(type);
}
public readFindText(): string {
readFindText(): string {
if (isMacintosh) {
return clipboard.readFindText();
}
@@ -31,23 +30,23 @@ export class ClipboardService implements IClipboardService {
return '';
}
public writeFindText(text: string): void {
writeFindText(text: string): void {
if (isMacintosh) {
clipboard.writeFindText(text);
}
}
public writeResources(resources: URI[]): void {
writeResources(resources: URI[]): void {
if (resources.length) {
clipboard.writeBuffer(ClipboardService.FILE_FORMAT, this.resourcesToBuffer(resources));
}
}
public readResources(): URI[] {
readResources(): URI[] {
return this.bufferToResources(clipboard.readBuffer(ClipboardService.FILE_FORMAT));
}
public hasResources(): boolean {
hasResources(): boolean {
return clipboard.has(ClipboardService.FILE_FORMAT);
}