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

Fixes for broken notebook experience (#8944)

Browse Source 
* Fixes for broken notebook experience

* add sql carbon edit

* sql carbon edit

* add another sql carbon edit for import

* Set untitledResource instead of no resource
This commit is contained in:
Chris LaFreniere
2020-01-23 17:06:32 -08:00
committed by GitHub
parent 510b84df3c
commit b02bf17d1f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts
View File

@@ -458,7 +458,7 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements
}; };
let isUntitled: boolean = uri.scheme === Schemas.untitled; let isUntitled: boolean = uri.scheme === Schemas.untitled;
const fileInput = isUntitled ? this._untitledEditorService.create({ associatedResource: uri, mode: 'notebook', initialValue: options.initialContent }) : const fileInput = isUntitled ? this._untitledEditorService.create({ untitledResource: uri, mode: 'notebook', initialValue: options.initialContent }) :
this._editorService.createInput({ resource: uri, mode: 'notebook' }); this._editorService.createInput({ resource: uri, mode: 'notebook' });
let input: NotebookInput; let input: NotebookInput;
if (isUntitled) { if (isUntitled) {

6
src/vs/workbench/services/workingCopy/common/workingCopyService.ts
View File

@@ -10,6 +10,7 @@ import { URI } from 'vs/base/common/uri';
import { Disposable, IDisposable, toDisposable, DisposableStore, dispose } from 'vs/base/common/lifecycle'; import { Disposable, IDisposable, toDisposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
import { TernarySearchTree, values } from 'vs/base/common/map'; import { TernarySearchTree, values } from 'vs/base/common/map';
import { ISaveOptions, IRevertOptions } from 'vs/workbench/common/editor'; import { ISaveOptions, IRevertOptions } from 'vs/workbench/common/editor';
import { Schemas } from 'vs/base/common/network'; // {{SQL CARBON EDIT}} @chlafreniere need to block working copies of notebook editors from being tracked
export const enum WorkingCopyCapabilities { export const enum WorkingCopyCapabilities {
@@ -138,6 +139,11 @@ export class WorkingCopyService extends Disposable implements IWorkingCopyServic
registerWorkingCopy(workingCopy: IWorkingCopy): IDisposable { registerWorkingCopy(workingCopy: IWorkingCopy): IDisposable {
const disposables = new DisposableStore(); const disposables = new DisposableStore();
// {{SQL CARBON EDIT}} @chlafreniere need to block working copies of notebook editors from being tracked
if (workingCopy.resource.path.includes('notebook-editor-') && workingCopy.resource.scheme === Schemas.untitled) {
return disposables;
}
// Registry // Registry
let workingCopiesForResource = this.mapResourceToWorkingCopy.get(workingCopy.resource.toString()); let workingCopiesForResource = this.mapResourceToWorkingCopy.get(workingCopy.resource.toString());
if (!workingCopiesForResource) { if (!workingCopiesForResource) {