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

Align with upstream #448

Draft
wants to merge 964 commits into
base: main
Choose a base branch
from

Conversation

RomanNikitenko
Copy link
Contributor

What does this PR do?

What issues does this PR fix?

How to test this PR?

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

connor4312 and others added 30 commits October 25, 2024 11:49
* try to force hide the view if it ever gets shown by accident

* deregister the view container if context key isn't honored
* Revert "try to force hide the view if it ever gets shown by accident (#232277)"

This reverts commit f0c6346.

* just skip the registration if we have state to hide
keep keybinding
Fixes #226474

It looks like this bug is at least 9 years old! It took me a minute to figure out what the intention was here.

I think the goal was to keep showing the hover if the user is pressing ctrl/cmd without sticky hovers enabled (e.g. to allow copying) but it was in the wrong check and would confusingly dismiss the hover when the mouse moved if ctrl/cmd was pressed.
This was unintentionally enabled in some refactors last month.

Fixes #228317
debug: fix hover variable value disappears on key down
…it (fix #231922) (#232229)

* Dragging an active view between side bars or panel does not activate it (fix #231922)

* address feedback
* Use async find provider only for file scheme (#230592)

* only use asyncfindprovider for file scheme

* add vscode remote

* Use async find provider only for file scheme (#230592)

* only use asyncfindprovider for file scheme

* add vscode remote

* 💄
* For the clear command, use `lastFocusedWidget` over `openView`

re microsoft/vscode-copilot#9865

* inline chat should react to widget clearing
also fix microsoft/vscode#231946 by replace icons with the spinner so that width stays constant
* chore - clean up `LanguageModelChatProvider` (step 1)

* fix compilo
Move fish SI script out of xdg named dir
Tyriar and others added 29 commits November 1, 2024 10:14
Show source file when running recent terminal command
* perf - validate device ID after window open

* Add telemetry event

* Revert "Add telemetry event"

This reverts commit 27cfece321509875de14ad096f177fe7ef34d200.

---------

Co-authored-by: Logan Ramos <[email protected]>
remove parameter/input backwards compat thing
Improve quoting in executeCommand API
introducing text area into the edit context to handle correctly the paste event
* add more logging

* add more log
allow cursor move during composition
Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Put terminal quick fixes into the SI menu too
Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Started failing with #232968
vscode-upstream-sha1: 231d373
rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
… from the open-vsx.org

Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
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.