microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 15:40:41 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

better handle case of dropped folder to tabs

Browse Source
This commit is contained in:
Benjamin Pasero
2016-06-14 09:53:04 +02:00
parent 3c2ced25bd
commit 28fd4571e8
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
View File

@@ -8,7 +8,6 @@ import {TPromise} from 'vs/base/common/winjs.base';
import nls = require('vs/nls');
import errors = require('vs/base/common/errors');
import {MIME_BINARY, MIME_TEXT} from 'vs/base/common/mime';
import labels = require('vs/base/common/labels');
import types = require('vs/base/common/types');
import paths = require('vs/base/common/paths');
import {IEditorViewState} from 'vs/editor/common/editorCommon';
@@ -230,13 +229,11 @@ export class TextFileEditor extends BaseTextEditor {
private openAsFolder(input: EditorInput): boolean {
// Since we cannot open a folder, we have to restore the previous input if any or close the editor
let handleEditorPromise: TPromise<any>;
// Since we cannot open a folder, we have to restore the previous input if any and close the editor
let handleEditorPromise: TPromise<any> = this.editorService.closeEditor(this.position, this.input);
let previousInput = this.historyService.getHistory()[1];
if (previousInput) {
handleEditorPromise = this.editorService.openEditor(previousInput, null, this.position);
} else {
handleEditorPromise = this.editorService.closeEditor(this.position, this.input);
handleEditorPromise = handleEditorPromise.then(() => this.editorService.openEditor(previousInput, null, this.position));
}
handleEditorPromise.done(() => {
@@ -251,11 +248,6 @@ export class TextFileEditor extends BaseTextEditor {
return viewlet.getExplorerView().select(fileEditorInput.getResource(), true);
}, errors.onUnexpectedError);
}
// Otherwise inform the user
else {
this.messageService.show(Severity.Info, nls.localize('folderOutofWorkspace', "The folder '{0}' is outside the currently opened root folder and can not be opened in this instance.", labels.getPathLabel(fileEditorInput.getResource())));
}
}
}, errors.onUnexpectedError);