Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- displays root folder name in multi-folder workspace project #44027

Merged
merged 1 commit into from
Feb 20, 2018
Merged

- displays root folder name in multi-folder workspace project #44027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ export class FileRenderer implements IRenderer {
@IContextViewService private contextViewService: IContextViewService,
@IInstantiationService private instantiationService: IInstantiationService,
@IThemeService private themeService: IThemeService,
@IConfigurationService private configurationService: IConfigurationService
@IConfigurationService private configurationService: IConfigurationService,
@IWorkspaceContextService private contextService: IWorkspaceContextService

) {
this.state = state;
this.config = this.configurationService.getValue<IFilesConfiguration>();
Expand Down Expand Up @@ -310,7 +312,11 @@ export class FileRenderer implements IRenderer {
}),
DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_UP, (e: IKeyboardEvent) => {
const initialRelPath: string = relative(stat.root.resource.fsPath, stat.parent.resource.fsPath);
this.displayCurrentPath(inputBox, initialRelPath, fileKind);
let projectFolderName: string = '';
if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
projectFolderName = paths.basename(stat.root.resource.fsPath); // show root folder name in multi-folder project
}
this.displayCurrentPath(inputBox, initialRelPath, fileKind, projectFolderName);
}),
DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => {
done(inputBox.isInputValid(), true);
Expand All @@ -320,11 +326,12 @@ export class FileRenderer implements IRenderer {
];
}

private displayCurrentPath(inputBox: InputBox, initialRelPath: string, fileKind: FileKind) {
private displayCurrentPath(inputBox: InputBox, initialRelPath: string, fileKind: FileKind, projectFolderName?: string) {
if (inputBox.validate()) {
const value = inputBox.value;
if (value && value.search(/[\\/]/) !== -1) { // only show if there's a slash
const newPath = paths.normalize(paths.join(initialRelPath, value), true);

const newPath = paths.normalize(paths.join(projectFolderName, initialRelPath, value), true);
const fileType: string = FileKind[fileKind].toLowerCase();

inputBox.showMessage({
Expand Down