Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions

View File

@@ -8,6 +8,7 @@
import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
import { IClipboardService as vsIClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { clipboard, nativeImage } from 'electron';
import URI from 'vs/base/common/uri';
export class ClipboardService implements IClipboardService {
_serviceBrand: any;
@@ -47,4 +48,25 @@ export class ClipboardService implements IClipboardService {
writeFindText(text: string): void {
this._vsClipboardService.writeFindText(text);
}
/**
* Writes files to the system clipboard.
*/
writeFiles(files: URI[]): void {
this._vsClipboardService.writeFiles(files);
}
/**
* Reads files from the system clipboard.
*/
readFiles(): URI[] {
return this._vsClipboardService.readFiles();
}
/**
* Find out if files are copied to the clipboard.
*/
hasFiles(): boolean {
return this._vsClipboardService.hasFiles();
}
}

View File

@@ -8,7 +8,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtension } from 'vs
import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
import * as nls from 'vs/nls';
import { deepClone } from 'vs/base/common/objects';
import { IExtensionPointUser, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
import { ProviderProperties } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component';
import { DATABASE_DASHBOARD_TABS } from 'sql/parts/dashboard/pages/databaseDashboardPage.contribution';

View File

@@ -22,20 +22,21 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
export interface ITaskOptions {
id: string;
title: string;
iconClass: string;
iconPath: { dark: string; light: string; };
description?: ITaskHandlerDescription;
}
export abstract class Task {
public readonly id: string;
public readonly title: string;
public readonly iconClass: string;
public readonly iconPathDark: string;
public readonly iconPath: { dark: string; light: string; };
private readonly _description: ITaskHandlerDescription;
constructor(opts: ITaskOptions) {
this.id = opts.id;
this.title = opts.title;
this.iconClass = opts.iconClass;
this.iconPath = opts.iconPath;
this._description = opts.description;
}
@@ -49,7 +50,7 @@ export abstract class Task {
private toCommandAction(): ICommandAction {
return {
iconClass: this.iconClass,
iconPath: this.iconPath,
id: this.id,
title: this.title
};