Skip to content

Conversation

Jack251970
Copy link
Member

Do not add one more whitespace after commands when _settings.CloseShellAfterPress is false.

Resolve #3673.

@prlabeler prlabeler bot added the bug Something isn't working label Jun 15, 2025

This comment has been minimized.

Copy link

gitstream-cm bot commented Jun 15, 2025

🥷 Code experts: no user but you matched threshold 10

Jack251970 has most 👩‍💻 activity in the files.
Jack251970, jjw24 have most 🧠 knowledge in the files.

See details

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

Activity based on git-commit:

Jack251970
JUN 78 additions & 71 deletions
MAY 6 additions & 3 deletions
APR 34 additions & 29 deletions
MAR
FEB 3 additions & 4 deletions
JAN

Knowledge based on git-blame:
Jack251970: 24%
jjw24: 13%

To learn more about /:\ gitStream - Visit our Docs

Copy link

gitstream-cm bot commented Jun 15, 2025

Be a legend 🏆 by adding a before and after screenshot of the changes you made, especially if they are around UI/UX.

Copy link
Contributor

coderabbitai bot commented Jun 15, 2025

📝 Walkthrough

Walkthrough

The changes refactor the PrepareProcessStartInfo method in the Shell plugin by introducing a local variable for a translated notification string and restructuring string concatenation for command arguments. Multiple inline translation calls are replaced with a single variable, improving readability. No logic or control flow is altered.

Changes

File(s) Change Summary
Plugins/Flow.Launcher.Plugin.Shell/Main.cs Refactored PrepareProcessStartInfo: introduced a local variable for translation, restructured string concatenation for shell command arguments, and improved code clarity. No functional changes.

Sequence Diagram(s)

No sequence diagram generated as the changes are limited to code refactoring and do not alter control flow or introduce new features.

Assessment against linked issues

Objective Addressed Explanation
Fix Shell plugin syntax error when executing commands with spaces (#3673) The changes are purely refactoring for readability; no parsing or argument handling logic is modified to address syntax errors with spaces.

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Possibly related PRs

  • Flow-Launcher/Flow.Launcher#3657: Refactors string construction and translation retrieval in the same method, indicating both PRs target similar code for improved handling or readability.

Suggested reviewers

  • jjw24

Poem

A rabbit hopped through lines of code,
Tidying strings where translations flowed.
With clarity found and clutter gone,
The shell commands can carry on.
Though logic stands as it did before,
The code is neat—who could ask for more?
🐇✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 07f4407 and 89214fb.

📒 Files selected for processing (1)
  • Plugins/Flow.Launcher.Plugin.Shell/Main.cs (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • Plugins/Flow.Launcher.Plugin.Shell/Main.cs
⏰ Context from checks skipped due to timeout of 90000ms (4)
  • GitHub Check: gitStream workflow automation
  • GitHub Check: gitStream.cm
  • GitHub Check: Check Spelling
  • GitHub Check: build
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@Jack251970 Jack251970 added this to the Future milestone Jun 15, 2025
@Jack251970 Jack251970 requested a review from Copilot June 15, 2025 13:29
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR ensures no extra whitespace is added after commands when _settings.CloseShellAfterPress is false by extracting the translated prompt into a variable and restructuring the command argument strings.

  • Extract translation lookup into notifyStr to avoid repeated calls
  • Refactor command string concatenation to conditionally include the close-shell prompt without trailing spaces
  • Simplify ProcessStartInfo instantiation using var
Comments suppressed due to low confidence (3)

Plugins/Flow.Launcher.Plugin.Shell/Main.cs:202

  • [nitpick] The variable name notifyStr is ambiguous. Consider renaming it to something more descriptive, like closeShellPrompt or pausePrompt, to improve readability.
var notifyStr = Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close");

Plugins/Flow.Launcher.Plugin.Shell/Main.cs:217

  • Consider adding unit tests for PrepareProcessStartInfo() to verify that when CloseShellAfterPress is false no extra whitespace appears after the command, and that the prompt is correctly included when true.
info.ArgumentList.Add(

Plugins/Flow.Launcher.Plugin.Shell/Main.cs:217

  • The conditional suffix for CloseShellAfterPress is duplicated across multiple shell cases. Extract this logic into a helper method (e.g., GetCloseShellSuffix()) to reduce duplication and simplify future updates.
info.ArgumentList.Add(

@Jack251970 Jack251970 modified the milestones: Future, 2.0.0 Jun 15, 2025
@Jack251970 Jack251970 requested a review from jjw24 June 15, 2025 14:14
@Jack251970
Copy link
Member Author

@jjw24 Already tested by users. And please do the final check.

image

@Jack251970 Jack251970 enabled auto-merge June 15, 2025 15:07
Copy link

@check-spelling-bot Report

🔴 Please review

See the 📂 files view, the 📜action log, or 📝 job summary for details.

❌ Errors and Warnings Count
❌ forbidden-pattern 22
⚠️ non-alpha-in-dictionary 13

See ❌ Event descriptions for more information.

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

@Jack251970 Jack251970 merged commit 93bc231 into dev Jun 16, 2025
12 of 13 checks passed
@Jack251970 Jack251970 deleted the shell_plugin_issue branch June 16, 2025 12:48
@jjw24 jjw24 modified the milestones: 2.0.0, 1.20.2 Jul 13, 2025
jjw24 pushed a commit that referenced this pull request Jul 13, 2025
Fix one more whitespace after commands
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

BUG: Shell plugin calls syntax error

2 participants