mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-26 13:19:42 +00:00
adopt remote module
This commit is contained in:
@@ -29,13 +29,11 @@ var build = path.join(root, '.build');
|
||||
var commit = util.getVersion(root);
|
||||
|
||||
var baseModules = [
|
||||
'applicationinsights', 'assert',
|
||||
'child_process', 'chokidar', 'crypto', 'emmet',
|
||||
'applicationinsights', 'assert', 'child_process', 'chokidar', 'crypto', 'emmet',
|
||||
'events', 'fs', 'getmac', 'glob', 'graceful-fs', 'http', 'http-proxy-agent',
|
||||
'https', 'https-proxy-agent', 'iconv-lite', 'electron', 'net',
|
||||
'os', 'path', 'readline', 'remote', 'sax', 'semver',
|
||||
'stream', 'string_decoder', 'url', 'vscode-textmate', 'winreg',
|
||||
'yauzl', 'native-keymap'
|
||||
'os', 'path', 'readline', 'sax', 'semver', 'stream', 'string_decoder', 'url',
|
||||
'vscode-textmate', 'winreg', 'yauzl', 'native-keymap'
|
||||
];
|
||||
|
||||
// Build
|
||||
|
||||
@@ -19,8 +19,7 @@ import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpe
|
||||
import {INullService} from 'vs/platform/instantiation/common/instantiation';
|
||||
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
|
||||
|
||||
import {ipcRenderer as ipc, webFrame} from 'electron';
|
||||
import remote = require('remote');
|
||||
import {ipcRenderer as ipc, webFrame, remote} from 'electron';
|
||||
|
||||
export class CloseEditorAction extends Action {
|
||||
|
||||
@@ -147,7 +146,7 @@ export class ToggleDevToolsAction extends Action {
|
||||
}
|
||||
|
||||
public run(): Promise {
|
||||
remote.getCurrentWindow().toggleDevTools();
|
||||
remote.getCurrentWindow().webContents.toggleDevTools();
|
||||
|
||||
return Promise.as(true);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,7 @@ import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceE
|
||||
|
||||
import win = require('vs/workbench/electron-browser/window');
|
||||
|
||||
import remote = require('remote');
|
||||
import {ipcRenderer as ipc, webFrame} from 'electron';
|
||||
import {ipcRenderer as ipc, webFrame, remote} from 'electron';
|
||||
|
||||
export class ElectronIntegration {
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ import severity from 'vs/base/common/severity';
|
||||
import {Promise} from 'vs/base/common/winjs.base';
|
||||
import {Action} from 'vs/base/common/actions';
|
||||
import {ipcRenderer as ipc, shell} from 'electron';
|
||||
import remote = require('remote');
|
||||
import {isLinux} from 'vs/base/common/platform';
|
||||
import {IMessageService} from 'vs/platform/message/common/message';
|
||||
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
|
||||
|
||||
@@ -21,8 +21,7 @@ import {IEventService} from 'vs/platform/event/common/event';
|
||||
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
|
||||
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
|
||||
|
||||
import remote = require('remote');
|
||||
import {ipcRenderer as ipc} from 'electron';
|
||||
import {ipcRenderer as ipc, remote} from 'electron';
|
||||
|
||||
export interface IPath {
|
||||
filePath: string;
|
||||
|
||||
@@ -20,7 +20,7 @@ import { RawGitService, DelayedRawGitService } from 'vs/workbench/parts/git/node
|
||||
import URI from 'vs/base/common/uri';
|
||||
import { spawn, exec } from 'child_process';
|
||||
import { join } from 'path';
|
||||
import * as remote from 'remote';
|
||||
import { remote } from 'electron';
|
||||
|
||||
function findSpecificGit(gitPath: string): Promise {
|
||||
return new Promise((c, e) => {
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
var electron = require('electron');
|
||||
var shell = electron.shell;
|
||||
var ipc = electron.ipcRenderer;
|
||||
var remote = require('remote');
|
||||
var remote = electron.remote;
|
||||
var currentWindow = remote.getCurrentWindow();
|
||||
|
||||
function init(context) {
|
||||
|
||||
@@ -19,7 +19,6 @@ import {IFileService} from 'vs/platform/files/common/files';
|
||||
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
|
||||
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
|
||||
|
||||
import remote = require('remote');
|
||||
import fs = require('fs');
|
||||
|
||||
export class SnippetsTracker implements workbenchExt.IWorkbenchContribution {
|
||||
|
||||
@@ -14,8 +14,6 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
|
||||
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
|
||||
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
|
||||
|
||||
import remote = require('remote');
|
||||
|
||||
export class MessageService extends WorkbenchMessageService {
|
||||
|
||||
constructor(
|
||||
@@ -36,7 +34,7 @@ export class MessageService extends WorkbenchMessageService {
|
||||
confirmation.secondaryButton = nls.localize('cancelButton', "Cancel");
|
||||
}
|
||||
|
||||
let opts: remote.IMessageBoxOptions = {
|
||||
let opts: Electron.Dialog.ShowMessageBoxOptions = {
|
||||
title: confirmation.title || this.contextService.getConfiguration().env.appName,
|
||||
message: confirmation.message,
|
||||
buttons: [
|
||||
|
||||
@@ -9,8 +9,7 @@ import {ElectronWindow} from 'vs/workbench/electron-browser/window';
|
||||
import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation';
|
||||
import Event, {Emitter} from 'vs/base/common/event';
|
||||
|
||||
import remote = require('remote');
|
||||
import {ipcRenderer as ipc} from 'electron';
|
||||
import {ipcRenderer as ipc, remote} from 'electron';
|
||||
|
||||
export var IWindowService = createDecorator<IWindowService>('windowService');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user