ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 09:35:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

Browse Source
This commit is contained in:
Anthony Dresser
2019-03-22 13:07:54 -07:00
committed by GitHub
parent f5c9174c2f
commit 4a87a24235
296 changed files with 2531 additions and 2472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
View File

@@ -21,7 +21,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
import { Schemas } from 'vs/base/common/network';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { IRemoteEnvironmentService } from 'vs/workbench/services/remote/common/remoteEnvironmentService';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
interface FileQuickPickItem extends IQuickPickItem {
uri: URI;
@@ -59,7 +59,7 @@ export class RemoteFileDialog {
@IModelService private readonly modelService: IModelService,
@IModeService private readonly modeService: IModeService,
@IEnvironmentService private readonly environmentService: IEnvironmentService,
@IRemoteEnvironmentService private readonly remoteEnvironmentService: IRemoteEnvironmentService,
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
) {
this.remoteAuthority = this.windowService.getConfiguration().remoteAuthority;
@@ -111,7 +111,7 @@ export class RemoteFileDialog {
private async getOptions(options: ISaveDialogOptions | IOpenDialogOptions): Promise<IOpenDialogOptions | undefined> {
let defaultUri = options.defaultUri;
if (!defaultUri) {
const env = await this.remoteEnvironmentService.remoteEnvironment;
const env = await this.remoteAgentService.getEnvironment();
if (env) {
defaultUri = env.userHome;
} else {