Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

View File

@@ -5,12 +5,18 @@
import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { RemoteAuthorities } from 'vs/base/common/network';
import { URI, UriComponents } from 'vs/base/common/uri';
export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverService {
_serviceBrand: any;
_serviceBrand: undefined;
constructor() {
constructor(
resourceUriProvider: ((uri: URI) => UriComponents) | undefined
) {
if (resourceUriProvider) {
RemoteAuthorities.setDelegate(resourceUriProvider);
}
}
resolveAuthority(authority: string): Promise<ResolverResult> {

View File

@@ -68,7 +68,7 @@ export class RemoteAuthorityResolverError extends Error {
export interface IRemoteAuthorityResolverService {
_serviceBrand: any;
_serviceBrand: undefined;
resolveAuthority(authority: string): Promise<ResolverResult>;

View File

@@ -15,7 +15,7 @@ export interface RemoteTunnel {
}
export interface ITunnelService {
_serviceBrand: any;
_serviceBrand: undefined;
openTunnel(remotePort: number): Promise<RemoteTunnel> | undefined;
}

View File

@@ -4,10 +4,9 @@
*--------------------------------------------------------------------------------------------*/
import { ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
export class TunnelService implements ITunnelService {
_serviceBrand: any;
export class NoOpTunnelService implements ITunnelService {
_serviceBrand: undefined;
public constructor(
) {
@@ -17,5 +16,3 @@ export class TunnelService implements ITunnelService {
return undefined;
}
}
registerSingleton(ITunnelService, TunnelService);

View File

@@ -18,7 +18,7 @@ class PendingResolveAuthorityRequest {
export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverService {
_serviceBrand: any;
_serviceBrand: undefined;
private _resolveAuthorityRequests: { [authority: string]: PendingResolveAuthorityRequest; };