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.

Sign up for GitHub

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

Jump to bottom

enable adding and navigating to custom marks in the buffer #158313

Merged

meganrogge merged 66 commits into main from merogge/buffer-mark

Sep 7, 2022

Contributor

meganrogge commented Aug 16, 2022 •

edited

Loading

meganrogge added 8 commits

August 15, 2022 12:41


          add buffer mark capability

65dfef8


          Merge branch 'main' into merogge/buffer-mark

8f13bcb


          alter decoration addon, add scrollToMark

89eb98e


          fix issues

96d8811


          CommandNavigationAddon -> MarkNavigationAddon

152a1d3


          get decorations to work

6e985ea


          get mark navigation to work

89916df


          get scroll to mark to work

meganrogge self-assigned this

meganrogge requested a review from Tyriar

August 16, 2022 19:35

meganrogge added this to the August 2022 milestone

meganrogge added 7 commits

August 16, 2022 13:26


          fix hidden property

b6a6170


          add tests

95164ac


          get rid of assert

0d5a706


          improve JSdoc

04ae814


          fix description

f02a472


          stricter check

bf37a7d


          revert changes to iterm setMark

6d82617

meganrogge commented

View reviewed changes

src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts Outdated Show resolved Hide resolved

meganrogge commented

View reviewed changes

src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts Outdated Show resolved Hide resolved


          Update src/vs/workbench/contrib/terminal/test/browser/xterm/shellInte…

94f15f2

…grationAddon.test.ts

meganrogge commented

View reviewed changes

src/vs/workbench/contrib/terminal/browser/terminal.ts Outdated Show resolved Hide resolved


          Update src/vs/workbench/contrib/terminal/browser/terminal.ts

681ab27

meganrogge commented

View reviewed changes

src/vs/workbench/contrib/terminal/browser/terminal.ts Outdated Show resolved Hide resolved


          Update src/vs/workbench/contrib/terminal/browser/terminal.ts

495e3ec

meganrogge commented

View reviewed changes

src/vs/workbench/contrib/terminal/browser/terminal.ts Outdated Show resolved Hide resolved

meganrogge added 4 commits

August 16, 2022 14:15


          Update src/vs/workbench/contrib/terminal/browser/terminal.ts

0030b04


          handle generic marks as well

d87521f


          get decoration to show up

aed2a1e


          Merge branch 'main' into merogge/buffer-mark

c5fcf3f

meganrogge added 7 commits

September 6, 2022 12:31


          rename etc

fe3169e


          use iterator


          parse args

c065c18


          hidden -> true

554e6d9


          get all markers

a506a07


          Merge branch 'main' into merogge/buffer-mark

58c29ab


          Merge branch 'main' into merogge/buffer-mark

8a21f75

meganrogge requested a review from Tyriar

September 6, 2022 21:24

Member

Tyriar commented Sep 6, 2022

There's a layer issue after merge

Tyriar reviewed

View reviewed changes

Member

Tyriar left a comment

I didn't test the command nav changes but it seems correct now

src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts Show resolved Hide resolved

meganrogge added 4 commits

September 6, 2022 19:06


          try to fix layer issue

f5467da


          fix import issues

f0b8d58


          fix errors

153251e


          layer

3b2e471

Contributor Author

meganrogge commented Sep 7, 2022

Test failing because of .only and realized I think my parsing of the shell sequence is still wrong. Will fix

meganrogge added 4 commits

September 7, 2022 09:54


          add more tests

63c18da


          get markers to show up

2cbed9f


          remove nav decorations appropriately

dfafeea


          get multi line decorations to work

51cd3dd

Tyriar requested changes

View reviewed changes

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts Outdated Show resolved Hide resolved

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/terminal/browser/terminal.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts Show resolved Hide resolved

src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts Outdated Show resolved Hide resolved

meganrogge and others added 4 commits

September 7, 2022 14:41


          Update src/vs/workbench/contrib/terminal/browser/xterm/markNavigation…

5b1894e

…Addon.ts

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>


          Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts

fb5f6e2

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>


          clean up

0dd2bc9


          remaining cleanup

ccaf3cd

Tyriar approved these changes

View reviewed changes

src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts Show resolved Hide resolved

meganrogge mentioned this pull request

improve shell integration SetMark sequence constraints #160355

Closed

meganrogge enabled auto-merge (squash)

September 7, 2022 21:56

meganrogge merged commit 9e0db45 into main

meganrogge deleted the merogge/buffer-mark branch

September 7, 2022 22:00

github-actions bot locked and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet