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

Fully handle "?" shortcut #75393

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes #75386.

cc @runiq

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @ollie27

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 11, 2020
@GuillaumeGomez
Copy link
Member Author

r? @jyn514

@rust-highfive rust-highfive assigned jyn514 and unassigned ollie27 Aug 11, 2020
@GuillaumeGomez GuillaumeGomez force-pushed the fix-help-shortcut branch 2 times, most recently from e1d2090 to 81bb314 Compare August 11, 2020 11:54
@@ -408,7 +408,7 @@ function defocusSearchBar() {
break;

case "?":
if (ev.shiftKey) {
if (ev.key || ev.shiftKey) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not just remove this branch?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've been switching between this and removing the condition for a while. You made the balance change haha.

Copy link
Contributor

@pickfire pickfire left a comment

Choose a reason for hiding this comment

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

Looks good to me but I didn't test it out.

@GuillaumeGomez
Copy link
Member Author

I tested both and they worked on my computer. If an issue occurs, it's pretty simple to rollback.

@bors: r=pickfire rollup

@bors
Copy link
Contributor

bors commented Aug 11, 2020

📌 Commit fdf2fe1 has been approved by pickfire

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#75036 (Prefer pattern matching over indexing)
 - rust-lang#75378 (Introduce `rustc_lexer::is_ident` and use it in couple of places)
 - rust-lang#75393 (Fully handle "?" shortcut)
 - rust-lang#75403 (Update comment for function)
 - rust-lang#75407 (Requested changes to [*mut T|*const T]::set_ptr_value)
 - rust-lang#75408 (Update MinGW comments in ci.yml)
 - rust-lang#75409 (Fix range term in alloc vec doc)

Failed merges:

r? @ghost
@ollie27 ollie27 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 11, 2020
@bors bors merged commit a421197 into rust-lang:master Aug 11, 2020
@GuillaumeGomez GuillaumeGomez deleted the fix-help-shortcut branch August 11, 2020 22:00
@jyn514
Copy link
Member

jyn514 commented Aug 11, 2020

Looks like everyone took care of this without me 😆

@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc: Help dialog doesn't open when the ? key is not behind Shift
7 participants