ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 9bc92b48d945144abb405b9e8df05e18accb9148

Browse Source
This commit is contained in:
ADS Merger
2020-02-19 03:11:35 +00:00
parent 98584d32a7
commit 1e308639e5
253 changed files with 6414 additions and 2296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/browser/editor/profiler/dashboardInput.ts
View File

@@ -46,8 +46,8 @@ export class DashboardInput extends EditorInput {
// vscode has a comment that Mode's will eventually be removed (not sure the state of this comment)
// so this might be able to be undone when that happens
if (!model.getModel(this.getResource())) {
model.createModel('', modeService.create('dashboard'), this.getResource());
if (!model.getModel(this.resource)) {
model.createModel('', modeService.create('dashboard'), this.resource);
}
this._initializedPromise = _connectionService.connectIfNotConnected(_connectionProfile, 'dashboard').then(
u => {
@@ -72,7 +72,7 @@ export class DashboardInput extends EditorInput {
return DashboardInput.ID;
}
public getResource(): URI {
public get resource(): URI {
return URI.from({
scheme: 'dashboard',
path: 'dashboard'

4
src/sql/workbench/browser/editor/profiler/profilerInput.ts
View File

@@ -287,4 +287,8 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
super.dispose();
this._profilerService.disconnectSession(this.id);
}
get resource(): URI | undefined {
return undefined;
}
}