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

Support QueryInput when handling renamed files (#2146)

Browse Source
This commit is contained in:
Matt Irvine
2018-08-03 18:12:31 -07:00
committed by Karl Burtram
parent b3bb6ebc6e
commit 13884c0457
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
View File

@@ -30,6 +30,9 @@ import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEd
import { IWindowService } from 'vs/platform/windows/common/windows';
import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
// {{SQL CARBON EDIT}}
import { QueryInput } from 'sql/parts/query/common/queryInput';
export class FileEditorTracker implements IWorkbenchContribution {
protected closeOnFileDelete: boolean;
@@ -142,7 +145,9 @@ export class FileEditorTracker implements IWorkbenchContribution {
// - the user has not disabled the setting closeOnFileDelete
// - the file change is local or external
// - the input is not resolved (we need to dispose because we cannot restore otherwise since we do not have the contents)
if (this.closeOnFileDelete || !isExternal || !editor.isResolved()) {
// {{SQL CARBON EDIT}} - Support FileEditorInput or QueryInput
if (this.closeOnFileDelete || !isExternal || (editor instanceof FileEditorInput && !editor.isResolved())) {
// Do NOT close any opened editor that matches the resource path (either equal or being parent) of the
// resource we move to (movedTo). Otherwise we would close a resource that has been renamed to the same
@@ -186,13 +191,15 @@ export class FileEditorTracker implements IWorkbenchContribution {
});
}
private getOpenedFileEditors(dirtyState: boolean): FileEditorInput[] {
const editors: FileEditorInput[] = [];
// {{SQL CARBON EDIT}} - Support FileEditorInput or QueryInput
private getOpenedFileEditors(dirtyState: boolean): (FileEditorInput | QueryInput)[] {
const editors: (FileEditorInput | QueryInput)[] = [];
const stacks = this.editorGroupService.getStacksModel();
stacks.groups.forEach(group => {
group.getEditors().forEach(editor => {
if (editor instanceof FileEditorInput) {
// {{SQL CARBON EDIT}} - Support FileEditorInput or QueryInput
if (editor instanceof FileEditorInput || editor instanceof QueryInput) {
if (!!editor.isDirty() === dirtyState) {
editors.push(editor);
}
@@ -222,7 +229,8 @@ export class FileEditorTracker implements IWorkbenchContribution {
const stacks = this.editorGroupService.getStacksModel();
stacks.groups.forEach(group => {
group.getEditors().forEach(input => {
if (input instanceof FileEditorInput) {
// {{SQL CARBON EDIT}} - Support FileEditorInput or QueryInput
if (input instanceof FileEditorInput || input instanceof QueryInput) {
const resource = input.getResource();
// Update Editor if file (or any parent of the input) got renamed or moved