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

Add smart paste terminal feature #231178

Open
wants to merge 30 commits into
base: main
Choose a base branch
from

Conversation

Parasaran-Python
Copy link
Contributor

fix #229280

Added a new terminal feature setting to control the feature, we check for spaces or back slashes and escape or wrap in double-quotes accordingly, the unit tests have been modified accordingly.

@Parasaran-Python
Copy link
Contributor Author

Hi @Tyriar ,

I've opened this PR but still need some clarity on a few aspects regarding smart paste:

Relative Paths: Should we support relative paths? If so, to what extent? Considering they can start with . or .., what should be the scope for these?

Shell Type Check: Do we really need to check for shell types? Would it be simpler to just wrap any path in quotes if it contains spaces or backslashes, regardless of the shell?

PowerShell Behavior: I've noticed that in a PowerShell terminal, the _paste function in terminal.clipboard.contribution.ts doesn't seem to trigger when pasting. However, the middle mouse click works fine. Is this something we should address as a bug?

Smart Paste behavior: Should smart paste only come into action if the entire clipboard string is a path? Or should we also consider parts of the string that might be paths and wrap or escape those?

Thank you for your help with these questions! 😊

@Parasaran-Python
Copy link
Contributor Author

@Parasaran-Python please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

1. **Definitions**.
   **“Code”** means the computer software code, whether in human-readable or machine-executable form,
   that is delivered by You to Microsoft under this Agreement.
   **“Project”** means any of the projects owned or managed by Microsoft and offered under a license
   approved by the Open Source Initiative ([www.opensource.org](http://www.opensource.org)).
   **“Submit”** is the act of uploading, submitting, transmitting, or distributing code or other content to any
   Project, including but not limited to communication on electronic mailing lists, source code control
   systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
   discussing and improving that Project, but excluding communication that is conspicuously marked or
   otherwise designated in writing by You as “Not a Submission.”
   **“Submission”** means the Code and any other copyrightable material Submitted by You, including any
   associated comments and documentation.

2. **Your Submission**. You must agree to the terms of this Agreement before making a Submission to any
   Project. This Agreement covers any and all Submissions that You, now or in the future (except as
   described in Section 4 below), Submit to any Project.

3. **Originality of Work**. You represent that each of Your Submissions is entirely Your original work.
   Should You wish to Submit materials that are not Your original work, You may Submit them separately
   to the Project if You (a) retain all copyright and license information that was in the materials as You
   received them, (b) in the description accompanying Your Submission, include the phrase “Submission
   containing materials of a third party:” followed by the names of the third party and any licenses or other
   restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
   guidelines concerning Submissions.

4. **Your Employer**. References to “employer” in this Agreement include Your employer or anyone else
   for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
   Submission is made in the course of Your work for an employer or Your employer has intellectual
   property rights in Your Submission by contract or applicable law, You must secure permission from Your
   employer to make the Submission before signing this Agreement. In that case, the term “You” in this
   Agreement will refer to You and the employer collectively. If You change employers in the future and
   desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
   and secure permission from the new employer before Submitting those Submissions.

5. **Licenses**.


* **Copyright License**. You grant Microsoft, and those who receive the Submission directly or
  indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
  Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
  the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
  parties.

* **Patent License**. You grant Microsoft, and those who receive the Submission directly or
  indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
  Your patent claims that are necessarily infringed by the Submission or the combination of the
  Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
  import or otherwise dispose of the Submission alone or with the Project.

* **Other Rights Reserved**. Each party reserves all rights not expressly granted in this Agreement.
  No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
  granted by implication, exhaustion, estoppel or otherwise.


6. **Representations and Warranties**. You represent that You are legally entitled to grant the above
   licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
   have disclosed under Section 3). You represent that You have secured permission from Your employer to
   make the Submission in cases where Your Submission is made in the course of Your work for Your
   employer or Your employer has intellectual property rights in Your Submission by contract or applicable
   law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
   have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
   You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
   REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
   EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
   PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
   NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.

7. **Notice to Microsoft**. You agree to notify Microsoft in writing of any facts or circumstances of which
   You later become aware that would make Your representations in this Agreement inaccurate in any
   respect.

8. **Information about Submissions**. You agree that contributions to Projects and information about
   contributions may be maintained indefinitely and disclosed publicly, including Your name and other
   information that You submit with Your Submission.

9. **Governing Law/Jurisdiction**. This Agreement is governed by the laws of the State of Washington, and
   the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
   Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
   exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
   defenses of lack of personal jurisdiction and forum non-conveniens.

10. **Entire Agreement/Assignment**. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@microsoft-github-policy-service agree

@@ -83,6 +83,7 @@ export const enum TerminalSettingId {
EnableVisualBell = 'terminal.integrated.enableVisualBell',
CommandsToSkipShell = 'terminal.integrated.commandsToSkipShell',
AllowChords = 'terminal.integrated.allowChords',
AllowSmartPaste = 'terminal.integrated.allowSmartPaste',
Copy link
Member

Choose a reason for hiding this comment

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

I think enableSmartPaste is more appropriate than allow*

@@ -165,6 +165,7 @@ export interface ITerminalConfiguration {
scrollback: number;
commandsToSkipShell: string[];
allowChords: boolean;
allowSmartPaste: boolean;
Copy link
Member

Choose a reason for hiding this comment

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

We want this to live entirely within terminalContrib/clipboard, including the configuration setup

@@ -96,8 +96,17 @@ export class TerminalClipboardContribution extends Disposable implements ITermin
return;
}

let shellType = '';

shellType = (this._ctx.instance as ITerminalInstance).shellType ?? '';
Copy link
Member

Choose a reason for hiding this comment

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

We should not be using as here, I think the fix here is to add shellType to IBaseTerminalInstance

@@ -9,14 +9,84 @@ import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.j
import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';

export async function shouldPasteTerminalText(accessor: ServicesAccessor, text: string, bracketedPasteMode: boolean | undefined): Promise<boolean | { modifiedText: string }> {
class SmartPasteUtils {
Copy link
Member

Choose a reason for hiding this comment

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

namespace smartPaste is preferable to a class containing only statics. However just moving these into a separate file inside terminalContrib/clipboard would be best

* @param string
* @returns true if the string is a path
*/
static isPath(string: string): boolean {
Copy link
Member

Choose a reason for hiding this comment

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

isPathLike? This will help hint that it's not actually verifying that it's an actual path, but something that likely is.

static isPath(string: string): boolean {
// Regex to detect common path formats
const windowsPathPattern = /^[a-zA-Z]:(\\|\/)/; // Windows absolute path
const uncPathPattern = /^\\\\/; // Windows UNC path
Copy link
Member

Choose a reason for hiding this comment

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

windowsUncPattern?

Comment on lines 30 to 33
*
* @param string
* @param shellType
* @returns func to handle smart paste, escape chars or wrap inside double quotes
Copy link
Member

Choose a reason for hiding this comment

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

Same as above

Comment on lines 44 to 63
// Escape backslashes and wrap in double quotes if necessary
const escapedPath = string.replace(/\\/g, '\\\\');
if (string.includes(' ')) {
return `"${escapedPath}"`;
}
return escapedPath;
}

case 'bash': // Linux/macOS Bash
// Wrap in quotes if spaces or special characters exist
if (string.includes(' ')) {
return `"${string}"`;
}
return string;

case 'pwsh':
// Simply wrap in quotes if spaces are present
if (string.includes(' ')) {
return `"${string}"`;
}
Copy link
Member

Choose a reason for hiding this comment

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

You also need to ensure that the quote you're using is escaped properly within string

* @param shellType
* @returns func to handle smart paste, escape chars or wrap inside double quotes
*/
static handleSmartPaste(string: string, shellType: string): string {
Copy link
Member

Choose a reason for hiding this comment

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

Same as above, we want to avoid a "string" var

Comment on lines 33 to 42
function setConfigValue(multiLinePaste: unknown, smartPaste: boolean) {
configurationService = new TestConfigurationService({
[TerminalSettingId.EnableMultiLinePasteWarning]: value
[TerminalSettingId.EnableMultiLinePasteWarning]: multiLinePaste,
[TerminalSettingId.AllowSmartPaste]: smartPaste
});
instantiationService.stub(IConfigurationService, configurationService);
}
Copy link
Member

Choose a reason for hiding this comment

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

Since there's another one now, tests would be easier to read if this was an object:

values: { enableMultiLinePaste?: unknown, enableSmartPaste?: boolean }

They could also default to false?

@Tyriar Tyriar changed the title fix #229280 Add smart paste terminal feature Oct 14, 2024
@Tyriar Tyriar added this to the Backlog milestone Oct 14, 2024
@Parasaran-Python
Copy link
Contributor Author

Hi @Tyriar ,

I've opened this PR but still need some clarity on a few aspects regarding smart paste:

Relative Paths: Should we support relative paths? If so, to what extent? Considering they can start with . or .., what should be the scope for these?

Shell Type Check: Do we really need to check for shell types? Would it be simpler to just wrap any path in quotes if it contains spaces or backslashes, regardless of the shell?

PowerShell Behavior: I've noticed that in a PowerShell terminal, the _paste function in terminal.clipboard.contribution.ts doesn't seem to trigger when pasting. However, the middle mouse click works fine. Is this something we should address as a bug?

Smart Paste behavior: Should smart paste only come into action if the entire clipboard string is a path? Or should we also consider parts of the string that might be paths and wrap or escape those?

Thank you for your help with these questions! 😊

@Tyriar while I go through your comments and incorporate them, could you please check these queries? 🙂

@Tyriar
Copy link
Member

Tyriar commented Oct 14, 2024

@Parasaran-Python

Relative Paths: Should we support relative paths? If so, to what extent? Considering they can start with . or .., what should be the scope for these?

You could experiment with using detectLinks from terminalLinkParsing.ts which does relative paths and so much more. Maybe just calling into that and handling when IParsedLink.path matches the entire text? ie. no suffix or prefix

Shell Type Check: Do we really need to check for shell types? Would it be simpler to just wrap any path in quotes if it contains spaces or backslashes, regardless of the shell?

We could have a default path, and then tweak for shell-specific behavior as necessary.

PowerShell Behavior: I've noticed that in a PowerShell terminal, the _paste function in terminal.clipboard.contribution.ts doesn't seem to trigger when pasting. However, the middle mouse click works fine. Is this something we should address as a bug?

Pasting in PowerShell is actually handled a little specially, there's a custom keybinding which sends ^V to PSReadLine which then handles the pasting.

// An extra Windows-only ctrl+v keybinding is used for pwsh that sends ctrl+v directly to the
// shell, this gets handled by PSReadLine which properly handles multi-line pastes. This is
// disabled in accessibility mode as PowerShell does not run PSReadLine when it detects a screen
// reader. This works even when clipboard.readText is not supported.
if (isWindows) {
registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+v
when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
primary: KeyMod.CtrlCmd | KeyCode.KeyV
});
}

As you see in the comment this is done to properly support multi-line pasting. Not sure the best way to handle this, maybe we should only be doing that when the string is multi-line? 🤔

Smart Paste behavior: Should smart paste only come into action if the entire clipboard string is a path? Or should we also consider parts of the string that might be paths and wrap or escape those?

I think it makes the most sense only if the entire text is a path. Otherwise it would be pretty unexpected imo.

@Tyriar
Copy link
Member

Tyriar commented Oct 16, 2024

@Parasaran-Python fyi it's a little easier to review your change if you don't force push. Force pushing breaks diffs so I can't diff when you've newly done over what you did that i already reviewed

@Parasaran-Python
Copy link
Contributor Author

Sure @Tyriar will not force push going forward, force push had become necessary as I prefer rebase over merge to have a clean linear commit history,

Fyi, have incorporated the changes, just the relative paths thing is pending.

@Parasaran-Python
Copy link
Contributor Author

@Tyriar , I experimented with detectLinks and noticed an issue: it ignores anything after a space in paths that contain spaces. A relative path could be mistaken for another keyword. For example, if I have a folder named "cd dir" in my current working directory, and I try to paste "cd dir" in the terminal to access the folder "dir," the command gets wrapped in quotes. This leads to unintended behavior.

If it was just for cd we could even check if the path string exists (on device) before wrapping but this could be used with a command like mkdir as well.

I hope I was clear.

Need some clarity in this aspect, as I seem to be approaching a dead end 😕

May be the scope has to be limited to a safe extent (for relative paths).

@Tyriar
Copy link
Member

Tyriar commented Oct 16, 2024

I experimented with detectLinks and noticed an issue: it ignores anything after a space in paths that contain spaces. A relative path could be mistaken for another keyword

Yeah you're right, I thought it handled space paths too but that's tackled here:

const fallbackMatchers: RegExp[] = [
// Python style error: File "<path>", line <line>
/^ *File (?<link>"(?<path>.+)"(, line (?<line>\d+))?)/,
// Unknown tool #200166: FILE <path>:<line>:<col>
/^ +FILE +(?<link>(?<path>.+)(?::(?<line>\d+)(?::(?<col>\d+))?)?)/,
// Some C++ compile error formats:
// C:\foo\bar baz(339) : error ...
// C:\foo\bar baz(339,12) : error ...
// C:\foo\bar baz(339, 12) : error ...
// C:\foo\bar baz(339): error ... [#178584, Visual Studio CL/NVIDIA CUDA compiler]
// C:\foo\bar baz(339,12): ...
// C:\foo\bar baz(339, 12): ...
/^(?<link>(?<path>.+)\((?<line>\d+)(?:, ?(?<col>\d+))?\)) ?:/,
// C:\foo/bar baz:339 : error ...
// C:\foo/bar baz:339:12 : error ...
// C:\foo/bar baz:339: error ...
// C:\foo/bar baz:339:12: error ... [#178584, Clang]
/^(?<link>(?<path>.+):(?<line>\d+)(?::(?<col>\d+))?) ?:/,
// Cmd prompt
/^(?<link>(?<path>.+))>/,
// The whole line is the path
/^ *(?<link>(?<path>.+))/
];

Perhaps use terminalLinkParsing first and then fallback to the simpler matching?

@Parasaran-Python
Copy link
Contributor Author

Thanks @Tyriar that works, the only thing that's pending now is the ctrl+v on powershell,

smart paste not working on ctrl+v on PS might be a pain, I would love to have smart paste working even with a ctrl+v action on a power shell instance 🙂

While I explore ways to achieve this please do drop suggestions if any.😊

Thanks again.

// reader. This works even when clipboard.readText is not supported.
if (isWindows) {
registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+v
when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
Copy link
Contributor Author

@Parasaran-Python Parasaran-Python Oct 19, 2024

Choose a reason for hiding this comment

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

@Tyriar I have removed this and handled the ctrl+v action in "src\vs\workbench\contrib\terminalContrib\clipboard\browser\terminalClipboard.ts" itself,

this used to handle only ctrl+v action on pwsh, if the user tries to paste using right mouse click the multi line paste didn't used to work properly (Not sure if this is a bug or an expected behavior),

Now with the changes I've made the right mouse click also works as expected

It's just that we get the multi line paste alert on ctrl+v as well, which in my opinion shouldn't be an issue as this brings in consistency in the behavior.

image

@Parasaran-Python
Copy link
Contributor Author

@Tyriar have made some changes, requesting you to re-review.


export const terminalClipboardConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
[TerminalClipboardSettingId.EnableSmartPaste]: {
markdownDescription: localize('terminal.integrated.enableSmartPaste', "Whether or not to allow smart paste to automatically wrap file path with double quotes"),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We dont just wrap the path with ", we just escape the \ if there are no spaces, need a text that's more clear

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature request: setting to wrap absolute path Copy Path command with quotes
3 participants