Merge from vscode de81ccf04849309f843db21130c806a5783678f7 (#4738)

This commit is contained in:
Anthony Dresser
2019-03-28 13:06:16 -07:00
committed by GitHub
parent cc2951265e
commit e6785ffe95
77 changed files with 562 additions and 835 deletions

View File

@@ -205,9 +205,9 @@ export enum FileType {
export interface IStat {
type: FileType;
mtime?: number;
ctime?: number;
size?: number;
mtime: number;
ctime: number;
size: number;
}
export interface IWatchOptions {

View File

@@ -693,7 +693,6 @@ export class TreeResourceNavigator2<T, TFilterData> extends Disposable {
}
this._register(this.tree.onDidChangeSelection(e => this.onSelection(e)));
this._register(this.tree.onMouseDblClick(e => this.onSelection(e)));
this._register(this.tree.onDidOpen(e => this.onSelection(e)));
}

View File

@@ -25,7 +25,7 @@ export function createSpdLogService(processName: string, logLevel: LogLevel, log
export function createRotatingLogger(name: string, filename: string, filesize: number, filecount: number): spdlog.RotatingLogger {
const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');
return new _spdlog.RotatingLogger(name, filename, filesize, filecount);
return _spdlog.createRotatingLogger(name, filename, filesize, filecount);
}
class SpdLogService extends AbstractLogService implements ILogService {

View File

@@ -580,7 +580,7 @@ export class Menubar {
case StateType.Ready:
return [new MenuItem({
label: this.mnemonicLabel(nls.localize('miRestartToUpdate', "Restart to &&Update...")), click: () => {
label: this.mnemonicLabel(nls.localize('miRestartToUpdate', "Restart to &&Update")), click: () => {
this.reportMenuActionTelemetry('RestartToUpdate');
this.updateService.quitAndInstall();
}

View File

@@ -10,6 +10,8 @@ import { generateUuid } from 'vs/base/common/uuid';
import { IChannel } from 'vs/base/parts/ipc/common/ipc';
import { FileChangeType, FileDeleteOptions, FileOverwriteOptions, FileSystemProviderCapabilities, FileType, FileWriteOptions, IFileChange, IFileSystemProvider, IStat, IWatchOptions } from 'vs/platform/files/common/files';
import { VSBuffer } from 'vs/base/common/buffer';
import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
import { OperatingSystem } from 'vs/base/common/platform';
export const REMOTE_FILE_SYSTEM_CHANNEL_NAME = 'remotefilesystem';
@@ -30,12 +32,13 @@ export class RemoteExtensionsFileSystemProvider extends Disposable implements IF
private readonly _onDidChangeCapabilities = this._register(new Emitter<void>());
readonly onDidChangeCapabilities: Event<void> = this._onDidChangeCapabilities.event;
constructor(channel: IChannel) {
constructor(channel: IChannel, environment: Promise<IRemoteAgentEnvironment | null>) {
super();
this._session = generateUuid();
this._channel = channel;
this.setCaseSensitive(true);
environment.then(remoteAgentEnvironment => this.setCaseSensitive(!!(remoteAgentEnvironment && remoteAgentEnvironment.os === OperatingSystem.Linux)));
this._channel.listen<IFileChangeDto[]>('filechange', [this._session])((events) => {
this._onDidChange.fire(events.map(RemoteExtensionsFileSystemProvider._createFileChange));

View File

@@ -62,7 +62,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
'http.systemCertificates': {
type: 'boolean',
default: true,
description: localize('systemCertificates', "Controls whether CA certificates should be loaded from the OS.")
description: localize('systemCertificates', "Controls whether CA certificates should be loaded from the OS. (On Windows and Mac a reload of the window is required after turning this off.)")
}
}
});

View File

@@ -334,12 +334,14 @@ export interface IDialogStyleOverrides extends IButtonStyleOverrides {
dialogForeground?: ColorIdentifier;
dialogBackground?: ColorIdentifier;
dialogShadow?: ColorIdentifier;
dialogBorder?: ColorIdentifier;
}
export const defaultDialogStyles = <IDialogStyleOverrides>{
dialogBackground: editorWidgetBackground,
dialogForeground: foreground,
dialogShadow: widgetShadow,
dialogBorder: contrastBorder,
buttonForeground: buttonForeground,
buttonBackground: buttonBackground,
buttonHoverBackground: buttonHoverBackground,

View File

@@ -9,8 +9,10 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProces
import { URLServiceChannelClient, URLHandlerChannel } from 'vs/platform/url/node/urlIpc';
import { URLService } from 'vs/platform/url/common/urlService';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import product from 'vs/platform/product/node/product';
export class RelayURLService extends URLService implements IURLHandler {
private urlService: IURLService;
constructor(
@@ -25,8 +27,12 @@ export class RelayURLService extends URLService implements IURLHandler {
openerService.registerOpener(this);
}
open(uri: URI): Promise<boolean> {
return this.urlService.open(uri);
async open(uri: URI): Promise<boolean> {
if (uri.scheme !== product.urlProtocol) {
return false;
}
return await this.urlService.open(uri);
}
handleURL(uri: URI): Promise<boolean> {