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.

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

Check the path for spaces before sending. Avoids filenames to be inte… #56966

Merged
merged 6 commits into from Sep 20, 2018
Merged

Check the path for spaces before sending. Avoids filenames to be inte… #56966

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a94b984
Check the path for spaces before sending. Avoids filenames to be inte…
luiszun Aug 22, 2018
652c816
Added check to handle Linux
alexr00 Sep 14, 2018
cd2adf7
Merge branch 'master' into SpacedFilename
alexr00 Sep 14, 2018
26dc9e2
Changed to escape space on mac and Linux instead of surrounding path …
alexr00 Sep 14, 2018
8b43a14
Merge branch 'SpacedFilename' of https://github.com/luiszun/vscode in…
alexr00 Sep 14, 2018
b1cb558
Added full escaping of space and escaped backslash on not Windows
alexr00 Sep 18, 2018
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
11 changes: 10 additions & 1 deletion src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
import { isWindows } from 'vs/base/common/platform';
import { Command } from 'vs/editor/browser/editorExtensions';
import { timeout } from 'vs/base/common/async';

Expand Down Expand Up @@ -653,7 +654,15 @@ export class RunActiveFileInTerminalAction extends Action {
this.notificationService.warn(nls.localize('workbench.action.terminal.runActiveFile.noFile', 'Only files on disk can be run in the terminal'));
return TPromise.as(void 0);
}
instance.sendText(uri.fsPath, true);
let uriPath: string = uri.fsPath;
if ((uriPath.indexOf(' ') !== -1) || (uriPath.indexOf('"') !== -1)) {
if (isWindows) {
uriPath = '"' + uriPath + '"';
} else {
uriPath = '\'' + uriPath + '\'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Escaping on macOS and Linux would probably be better done by escaping each space, this is more typical than quoting the whole path. This is what happens when you drag a file in that contains spaces: /Users/daimms/Desktop/Screen\ Shot\ 2018-09-14\ at\ 12.39.14\ PM.png

}
}
instance.sendText(uriPath, true);
return this.terminalService.showPanel();
}
}
Expand Down