diff --git a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts index 4a81a19dda01e927f852e200e54f421356af4c3e..2f4a86cb8313e164468b25a743cb797af6ddf10b 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts @@ -18,11 +18,9 @@ import model = require('vs/workbench/parts/debug/common/debugModel'); import { IViewletService } from 'vs/workbench/services/viewlet/common/viewletService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybindingService'; -import remote = require('remote'); +import {clipboard} from 'electron'; import IDebugService = debug.IDebugService; -const clipboard = remote.require('clipboard'); - export class AbstractDebugAction extends actions.Action { protected debugService: IDebugService; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts index 78e87b6d28e3d2b6efca8e95cf31916d6fbb598c..711baa60327de9903d6e01d2475a97292e0d5689 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen.ts @@ -27,7 +27,7 @@ import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlighte import { Action } from 'vs/base/common/actions'; import * as semver from 'semver'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; -import {shell} from 'electron'; +import { shell } from 'electron'; const $ = dom.emmet; diff --git a/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts b/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts index 577706009d0bf1354c5ef32a66629e3d21903106..f18a925bbcc8cec59d73e5a96ab8a2728658e3cc 100644 --- a/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts @@ -18,10 +18,7 @@ import {asFileEditorInput} from 'vs/workbench/common/editor'; import {IMessageService} from 'vs/platform/message/common/message'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; -import remote = require('remote'); -import {ipcRenderer as ipc, shell} from 'electron'; - -const Clipboard = remote.require('clipboard'); +import {ipcRenderer as ipc, shell, clipboard} from 'electron'; export class RevealInOSAction extends Action { private resource: uri; @@ -79,7 +76,7 @@ export class CopyPathAction extends Action { } public run(): Promise { - Clipboard.writeText(labels.getPathLabel(this.resource)); + clipboard.writeText(labels.getPathLabel(this.resource)); return Promise.as(true); } @@ -102,7 +99,7 @@ export class GlobalCopyPathAction extends Action { public run(): Promise { let fileInput = asFileEditorInput(this.editorService.getActiveEditorInput(), true); if (fileInput) { - Clipboard.writeText(labels.getPathLabel(fileInput.getResource())); + clipboard.writeText(labels.getPathLabel(fileInput.getResource())); this.editorService.focusEditor(); // focus back to editor } else { this.messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path"));