chore: Align with upstream #397

RomanNikitenko · 2024-08-08T07:41:28Z

What does this PR do?

Rebase against the upstream
Fixes the following problem:

I had to downgrade typescript version to fix the problem: f02fa7b
I'm going to upgrade typescript version on the che-code side after resolving eclipse-che/che#23082

Fixes the following problem:

@azatsarynnyy please check if I rewrote your logic correctly: e45ddcb
Related PRs/use cases are:

What issues does this PR fix?

eclipse-che/che#23071

How to test this PR?

PR jobs should be green
testing of any use cases is useful as we pick up a lot of commits from the upstream

Filter out the editor-provided commands

Start a new workspace from the test project https://github.com/RomanNikitenko/web-nodejs-sample/tree/testPR. Its .che/che-editor.yaml contains the init-che-code-command exec command.
Verify that there is no editor-specific command among the devfile-type Tasks.

Include the commands imported from a parent Devfile as to VS Code Tasks

Go to the dashboard => Create Workspace => Use an Editor Definition
Set quay.io/che-incubator-pull-requests/che-code:pr-397-amd64 to the Editor Image field
Set https://github.com/l0rd/inventory-quarkus/tree/parent to the Git repo URL
Press Create & Open
Open VS Code Tasks list and verify that the commands defined in the parent Devfile are listed as well as the commands defined in the project's Devfile:

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

Revert "Fixes #216824" This reverts commit f46e922.

Fixes #224310

These can flake due to the pty host crashing. Disabling for now, they require more investigation. Tracked in #216564

Skip all terminal smoke tests on Linux

Fixes #223883

Don't trigger suggest after [^\s]-

Add a convenience prop for prompt prefix

…s feature is used (fix #219159) (#224399)

* debug: improve behavior for slow-running prelaunch tasks Shows this notification if a prelaunch task has been running for more than 10 seconds: ![](https://memes.peet.io/img/24-07-be15cd9d-c9cd-40dc-8937-9d62466e5c96.png) Also does a little cleanup of some probably-leaking disposables in the task runner. Fixes #218267 * hygenie * dom: make SafeTriangle smaller, add tests

… #224385) (#224405)

fix all x-model highlight flickering

Fixes #224419

Fixes #224357

fix #214797

Request completions for args at beginning of word

…ybinding (#224409) fixes #223959

fix #216464

Also exclude $ from comletions from start logic

* viewContainer contribution point Signed-off-by: thegecko <[email protected]> * Updates from feedback * Make extension point debug-only * Rename proposal --------- Signed-off-by: thegecko <[email protected]> Co-authored-by: Rob Lourens <[email protected]>

fix microsoft/vscode-copilot-release#1309

Fix microsoft/vscode-copilot#6416

* Disable chat "thumbs up" button by default Roll out with an experiment * Flip experiment key * Fix tests

fix #221565

Add all pwsh keywords as completions

* chore: bump kerberos * Bump kerberos in remote as well

This scheme is no longer used

Revert "chore: bump kerberos (#224992)" This reverts commit 5eb2a65.

…ed workspace, prevent trust dialog from showing for this case (#225087) fix #224881

* Update marked This bumps our marked version from 4.x to 14.x. This fixes a number of bugs in markdown parsing however is somewhat risky as we've missed so many versions. Hoping to merge early in the iteration so we can catch any potential issues * Add highlighting Copying over marked-highlight for now * Fix newline in generated html * Fix plaintext rendering of headers

* Revert "Revert "chore: bump kerberos" (#225084)" This reverts commit 9af3636. * build: avoid dlopen kerberos deps on macOS * ci: update cache * chore: update rpm and deb dependencies

Remote Inserted/Deleted text from header

vscode-upstream-sha1: 559107b 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

github-actions · 2024-08-08T07:41:43Z

Click here to review and test in web IDE:

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

github-actions · 2024-08-09T11:20:24Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-397-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-397-dev-amd64

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

github-actions · 2024-08-09T13:15:10Z

Pull Request images published ✨

Editor: quay.io/che-incubator-pull-requests/che-code:pr-397-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-397-dev-amd64

azatsarynnyy · 2024-08-14T09:53:59Z

Use case 1:

Use case 2:

alexdima and others added 30 commits July 31, 2024 15:52

Revert StableEditorScroll changes (#224289)

d90ab31

Revert "Fixes #216824" This reverts commit f46e922.

Cannot parse treesitter telemetry (#224387)

e23a9db

Fixes #224310

esm - reduce diff (#224388)

b18a8c5

Skip all terminal smoke tests on Linux

249b7c2

These can flake due to the pty host crashing. Disabling for now, they require more investigation. Tracked in #216564

Merge pull request #224393 from microsoft/tyriar/216564

cfcc0cd

Skip all terminal smoke tests on Linux

Don't trigger suggest after [^\s]-

990fdb0

Fixes #223883

Git - add support for reftable storage format (#224395)

151e03b

Remove release-pipeline labeler (#224342)

3c737ad

Merge pull request #224396 from microsoft/tyriar/223883

ab9c44e

Don't trigger suggest after [^\s]-

Add a convenience prop for prompt prefix

c3b9374

Remove on-comments workflow and update commands (#224355)

d9d5b1e

Merge pull request #224398 from microsoft/tyriar/prompt_prefix

59a301a

Add a convenience prop for prompt prefix

Open Editors list is displays incorrect list when the SCM Working Set…

830e533

…s feature is used (fix #219159) (#224399)

NLS can get mixed up when stable overwrites insider metadata (fix…

284a605

… #224385) (#224405)

Fix all x-model highlight flickering (#224415)

79327ff

fix all x-model highlight flickering

Request completions for args at beginning of word

33458a8

Fixes #224419

debug: scope theme colors of breakpoints (#224417)

84f25c7

Fixes #224357

terminal chat cleanup (#224416)

67e68db

fix #214797

Merge pull request #224420 from microsoft/tyriar/224419

ae1b5e0

Request completions for args at beginning of word

polish debug accessibility help dialogs, introduce Clear Console ke…

52e0f91

…ybinding (#224409) fixes #223959

fix flaky terminal persistence smoke test (#224414)

14253f3

fix #216464

Remove bad-tag workflow (#224428)

0de5dad

Also exclude $ from comletions from start logic

cde35bb

Merge pull request #224429 from microsoft/tyriar/excl_question

263eb70

Also exclude $ from comletions from start logic

Remove on-open workflow (#224425)

cdf38dc

Persist chat sessions in empty windows (#224430)

6c37657

fix microsoft/vscode-copilot-release#1309

Fix extra space under chat confirm widget (#224444)

e286952

Fix microsoft/vscode-copilot#6416

Disable chat "thumbs up" button by default (#224443)

b34298a

* Disable chat "thumbs up" button by default Roll out with an experiment * Flip experiment key * Fix tests

meganrogge and others added 15 commits August 7, 2024 09:21

alert SR users with kb editor search result count (#224955)

43ec66e

fix #221565

Merge pull request #225050 from microsoft/tyriar/225042

f8bcaf0

Add all pwsh keywords as completions

chore: bump kerberos (#224992)

5eb2a65

* chore: bump kerberos * Bump kerberos in remote as well

Remove copilot code block scheme (#225071)

ca51dd3

This scheme is no longer used

remove config toolbar for IW execution setting (#224999)

3945bc5

don't throw error when waitToActivate is true (#225082)

8ea260e

Revert "chore: bump kerberos" (#225084)

9af3636

Revert "chore: bump kerberos (#224992)" This reverts commit 5eb2a65.

only get workspace tasks when getKnownTasks is called if in a trust…

4a7a65c

…ed workspace, prevent trust dialog from showing for this case (#225087) fix #224881

fix: add postinst template conditions (#225097)

28ba9f5

Hide glyph margin for inserted/deleted cells in nb diff view (#225100)

1dcacc6

chore: update [email protected] (#225101)

d288df1

* Revert "Revert "chore: bump kerberos" (#225084)" This reverts commit 9af3636. * build: avoid dlopen kerberos deps on macOS * ci: update cache * chore: update rpm and deb dependencies

Remove Inserted/Deleted text from notebook cell diff header (#225091)

559107b

Remote Inserted/Deleted text from header

Rebase against the upstream 559107b

a99552b

vscode-upstream-sha1: 559107b rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED

chore: Update yarn.lock after resolving conflicts

a869d8a

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

fix: Fix build of the che-commands extension

e45ddcb

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

RomanNikitenko force-pushed the resolve-conflicts branch from 4519713 to e45ddcb Compare August 8, 2024 12:50

fix: Fix compilation errors related to axios instance

f02fa7b

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

chore: Provide automatic resolving a conflict for typescript version

759e44e

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

RomanNikitenko marked this pull request as ready for review August 9, 2024 13:51

RomanNikitenko requested review from azatsarynnyy and vitaliy-guliy as code owners August 9, 2024 13:51

vitaliy-guliy approved these changes Aug 12, 2024

View reviewed changes

azatsarynnyy approved these changes Aug 13, 2024

View reviewed changes

RomanNikitenko merged commit 6897dd1 into main Aug 19, 2024
7 checks passed

RomanNikitenko deleted the resolve-conflicts branch August 19, 2024 09:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Align with upstream #397

chore: Align with upstream #397

RomanNikitenko commented Aug 8, 2024 •

edited

Loading

github-actions bot commented Aug 8, 2024 •

edited

Loading

github-actions bot commented Aug 9, 2024

github-actions bot commented Aug 9, 2024

azatsarynnyy commented Aug 14, 2024

chore: Align with upstream #397

chore: Align with upstream #397

Conversation

RomanNikitenko commented Aug 8, 2024 • edited Loading

What does this PR do?

What issues does this PR fix?

How to test this PR?

Filter out the editor-provided commands

Include the commands imported from a parent Devfile as to VS Code Tasks

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

github-actions bot commented Aug 8, 2024 • edited Loading

github-actions bot commented Aug 9, 2024

github-actions bot commented Aug 9, 2024

azatsarynnyy commented Aug 14, 2024

RomanNikitenko commented Aug 8, 2024 •

edited

Loading

github-actions bot commented Aug 8, 2024 •

edited

Loading