@@ -194,3 +194,5 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo

main(server, data, configuration);

ipcRenderer.send('handshake:im ready');

}

@@ -26,7 +26,8 @@ const supportsCopyWithSyntaxHighlighting = (supportsCopy && !browser.isEdgeOrIE)

// Chrome incorrectly returns true for document.queryCommandSupported('paste')

// when the paste feature is available but the calling script has insufficient

// privileges to actually perform the action

type ExecCommand = 'cut' | 'copy' | 'paste';

@@ -174,11 +175,12 @@ class ExecCommandPasteAction extends ExecCommandAction {

kbOpts = null;

}

super('paste', {

id: 'editor.action.clipboardPasteAction',

label: nls.localize('actions.clipboard.pasteLabel', "Paste"),

alias: 'Paste',

kbOpts: kbOpts,

menuOpts: {

group: CLIPBOARD_CONTEXT_MENU_GROUP,

@@ -188,10 +190,25 @@ class ExecCommandPasteAction extends ExecCommandAction {

menuId: MenuId.MenubarEditMenu,

group: '2_ccp',

title: nls.localize({ key: 'miPaste', comment: ['&& denotes a mnemonic'] }, "&&Paste"),

}

});

}

}

class ExecCommandCopyWithSyntaxHighlightingAction extends ExecCommandAction {

@@ -667,10 +667,10 @@ var AMDLoader;

}

this._didInitialize = true;

// capture node modules

};

// patch require-function of nodejs such that we can manually create a script

// from cached data. this is done by overriding the `Module._compile` function

@@ -731,11 +731,18 @@ var AMDLoader;

this._init(nodeRequire);

this._initNodeRequire(nodeRequire, moduleManager);

var recorder = moduleManager.getRecorder();

if (/^node\|/.test(scriptSrc)) {

var pieces = scriptSrc.split('|');

var moduleExports_1 = null;

try {

}

catch (err) {

errorback(err);

@@ -55,6 +55,9 @@ export class HeapService implements IHeapService {

private _doTrackRecursive(obj: any): Promise<any> {

if (isNullOrUndefined(obj)) {

return Promise.resolve(obj);

}

@@ -651,7 +651,7 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti

activationTimesBuilder.codeLoadingStart();

logService.info(`ExtensionService#loadCommonJSModule ${modulePath}`);

try {

} catch (e) {

return Promise.reject(e);

} finally {

@@ -168,7 +168,7 @@ export class ResourcesDropHandler {

handleDrop(event: DragEvent, resolveTargetGroup: () => IEditorGroup, afterDrop: (targetGroup: IEditorGroup) => void, targetIndex?: number): void {

const untitledOrFileResources = extractResources(event).filter(r => this.fileService.canHandleResource(r.resource) || r.resource.scheme === Schemas.untitled);

if (!untitledOrFileResources.length) {

}

// Make the window active to handle the drop properly within

@@ -147,13 +147,13 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {

shell.open();

// Inform user about loading issues from the loader

});

});

});

@@ -45,7 +45,7 @@ const TextInputActions: IAction[] = [

new Separator(),

new Action('editor.action.clipboardCutAction', nls.localize('cut', "Cut"), null, true, () => document.execCommand('cut') && Promise.resolve(true)),

new Action('editor.action.clipboardCopyAction', nls.localize('copy', "Copy"), null, true, () => document.execCommand('copy') && Promise.resolve(true)),

new Separator(),

new Action('editor.action.selectAll', nls.localize('selectAll', "Select All"), null, true, () => document.execCommand('selectAll') && Promise.resolve(true))

];

@@ -248,6 +248,7 @@ export class Workbench extends Disposable implements IPartService {

super();

this.workbenchParams = { configuration, serviceCollection };

this.hasInitialFilesToOpen =

(configuration.filesToCreate && configuration.filesToCreate.length > 0) ||

@@ -129,7 +129,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer

// Kill oneself if one's parent dies. Much drama.

setInterval(function () {

try {

} catch (e) {

onTerminate();

}

@@ -932,6 +932,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {

}

private handleExternalDrop(tree: ITree, data: DesktopDragAndDropData, target: ExplorerItem | Model, originalEvent: DragMouseEvent): TPromise<void> {

const droppedResources = extractResources(originalEvent.browserEvent as DragEvent, true);

// Check for dropped external files to be folders

@@ -28,14 +28,16 @@ export class WalkThroughContentProvider implements ITextModelContentProvider, IW

public provideTextContent(resource: URI): Thenable<ITextModel> {

const query = resource.query ? JSON.parse(resource.query) : {};

const content: Thenable<string | ITextBufferFactory> = (query.moduleId ? new Promise<string>((resolve, reject) => {

return content.then(content => {

let codeEditorModel = this.modelService.getModel(resource);

if (!codeEditorModel) {

@@ -61,7 +63,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi

}

public provideTextContent(resource: URI): Thenable<ITextModel> {

let codeEditorModel = this.modelService.getModel(resource);

if (!codeEditorModel) {

const j = parseInt(resource.fragment);

@@ -78,17 +80,17 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi

return '';

};

const languageId = this.modeService.getModeIdForLanguageName(languageName);

const languageSelection = this.modeService.create(languageId);

codeEditorModel = this.modelService.createModel(codeSnippet, languageSelection, resource);

} else {

}

return codeEditorModel;

@@ -31,6 +31,7 @@ interface IExtensionCacheData {

let _SystemExtensionsRoot: string | null = null;

function getSystemExtensionsRoot(): string {

if (!_SystemExtensionsRoot) {

_SystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));

}

@@ -178,7 +178,7 @@ function _processIconThemeDocument(id: string, iconThemeDocumentLocation: URI, i

const iconThemeDocumentLocationDirname = resources.dirname(iconThemeDocumentLocation);

function resolvePath(path: string) {

}

function collectSelectors(associations: IconsAssociation, baseThemeClassName?: string) {