Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -32,11 +32,13 @@ export class BrowserWindowConfiguration implements IWindowConfiguration {
nodeCachedDataDir?: string;
backupPath?: string;
backupWorkspaceResource?: URI;
workspace?: IWorkspaceIdentifier;
folderUri?: ISingleFolderWorkspaceIdentifier;
remoteAuthority: string;
remoteAuthority?: string;
connectionToken?: string;
zoomLevel?: number;
fullscreen?: boolean;
@@ -65,7 +67,8 @@ export interface IBrowserWindowConfiguration {
}
export class BrowserWorkbenchEnvironmentService implements IEnvironmentService {
_serviceBrand: ServiceIdentifier<IEnvironmentService>;
_serviceBrand!: ServiceIdentifier<IEnvironmentService>;
readonly configuration: IWindowConfiguration = new BrowserWindowConfiguration();
@@ -102,7 +105,7 @@ export class BrowserWorkbenchEnvironmentService implements IEnvironmentService {
for (let p of vars) {
const pair = p.split('=');
if (pair.length >= 2) {
map.set(decodeURIComponent(pair[0]), decodeURIComponent(pair[1]));
map.set(pair[0], decodeURIComponent(pair[1]));
}
}