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

Fix how data workspace handles untitled workspaces (#14505)

Browse Source 
* add more workspace apis

* update dialog and check workspace scheme

* cleanup

* add comment

* update create project from db dialog

* cleanup

* update names

* add test
This commit is contained in:
Kim Santiago
2021-03-03 15:31:21 -08:00
committed by GitHub
parent 6ecacd6faa
commit 42fba14d88
12 changed files with 100 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/workbench/api/browser/mainThreadWorkspace.ts
View File

@@ -9,18 +9,20 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
import { Disposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@extHostNamedCustomer(SqlMainContext.MainThreadWorkspace)
export class MainThreadWorkspace extends Disposable implements MainThreadWorkspaceShape {
constructor(
extHostContext: IExtHostContext,
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@IWorkbenchEnvironmentService protected readonly environmentService: IWorkbenchEnvironmentService,
) {
super();
}
$createWorkspace(folder: URI, workspaceFile?: URI): Promise<void> {
$createAndEnterWorkspace(folder: URI, workspaceFile?: URI): Promise<void> {
folder = URI.revive(folder);
workspaceFile = URI.revive(workspaceFile);
return this.workspaceEditingService.createAndEnterWorkspace([{ uri: folder }], workspaceFile);
@@ -30,4 +32,10 @@ export class MainThreadWorkspace extends Disposable implements MainThreadWorkspa
workspaceFile = URI.revive(workspaceFile);
return this.workspaceEditingService.enterWorkspace(workspaceFile);
}
$saveAndEnterWorkspace(workspaceFile: URI): Promise<void> {
workspaceFile = URI.revive(workspaceFile);
return this.workspaceEditingService.saveAndEnterWorkspace(workspaceFile);
}
}

8
src/sql/workbench/api/common/extHostWorkspace.ts
View File

@@ -17,11 +17,15 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
this._proxy = _mainContext.getProxy(SqlMainContext.MainThreadWorkspace);
}
$createWorkspace(folder: URI, workspaceFile: URI): Promise<void> {
return this._proxy.$createWorkspace(folder, workspaceFile);
$createAndEnterWorkspace(folder: URI, workspaceFile: URI): Promise<void> {
return this._proxy.$createAndEnterWorkspace(folder, workspaceFile);
}
$enterWorkspace(workspaceFile: URI): Promise<void> {
return this._proxy.$enterWorkspace(workspaceFile);
}
$saveAndEnterWorkspace(workspaceFile: URI): Promise<void> {
return this._proxy.$saveAndEnterWorkspace(workspaceFile);
}
}

7
src/sql/workbench/api/common/sqlExtHost.api.impl.ts
View File

@@ -467,11 +467,14 @@ export function createAdsApiFactory(accessor: ServicesAccessor): IAdsExtensionAp
createModelViewEditor(title: string, options?: azdata.ModelViewEditorOptions, name?: string): azdata.workspace.ModelViewEditor {
return extHostModelViewDialog.createModelViewEditor(title, extension, name, options);
},
createWorkspace(location: vscode.Uri, workspaceFile: vscode.Uri): Promise<void> {
return extHostWorkspace.$createWorkspace(location, workspaceFile);
createAndEnterWorkspace(location: vscode.Uri, workspaceFile: vscode.Uri): Promise<void> {
return extHostWorkspace.$createAndEnterWorkspace(location, workspaceFile);
},
enterWorkspace(workspaceFile: vscode.Uri): Promise<void> {
return extHostWorkspace.$enterWorkspace(workspaceFile);
},
saveAndEnterWorkspace(workspaceFile: vscode.Uri): Promise<void> {
return extHostWorkspace.$saveAndEnterWorkspace(workspaceFile);
}
};

6
src/sql/workbench/api/common/sqlExtHost.protocol.ts
View File

@@ -759,13 +759,15 @@ export interface ExtHostBackgroundTaskManagementShape {
}
export interface ExtHostWorkspaceShape {
$createWorkspace(folder: vscode.Uri, workspaceFile: vscode.Uri): Promise<void>;
$createAndEnterWorkspace(folder: vscode.Uri, workspaceFile: vscode.Uri): Promise<void>;
$enterWorkspace(workspaceFile: vscode.Uri): Promise<void>;
$saveAndEnterWorkspace(workspaceFile: vscode.Uri): Promise<void>;
}
export interface MainThreadWorkspaceShape {
$createWorkspace(folder: vscode.Uri, workspaceFile: vscode.Uri): Promise<void>;
$createAndEnterWorkspace(folder: vscode.Uri, workspaceFile: vscode.Uri): Promise<void>;
$enterWorkspace(workspaceFile: vscode.Uri): Promise<void>;
$saveAndEnterWorkspace(workspaceFile: vscode.Uri): Promise<void>;
}
export interface MainThreadBackgroundTaskManagementShape extends IDisposable {