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

Inline Edit Feature #204158

Merged

hediet merged 77 commits into microsoft:main from githubnext:multi-ghost-text

Feb 16, 2024

Member

hediet commented Feb 2, 2024

No description provided.

hediet commented

View reviewed changes

src/vscode-dts/vscode.proposed.inlineEdit.d.ts Show resolved Hide resolved

hediet commented

View reviewed changes

src/vscode-dts/vscode.proposed.inlineEdit.d.ts Outdated Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/code/electron-sandbox/workbench/workbench-dev.html Outdated Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/editor/standalone/browser/standaloneLanguages.ts Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/workbench/api/common/extHost.api.impl.ts Outdated Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/workbench/api/common/extHostApiCommands.ts Outdated Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/workbench/services/actions/common/menusExtensionPoint.ts Outdated Show resolved Hide resolved

hediet commented

View reviewed changes

src/vs/editor/common/config/editorOptions.ts Outdated Show resolved Hide resolved

vscodenpa assigned hediet

Member Author

hediet commented Feb 5, 2024

Generally, can you try to reuse as much as possible (withoung changing the original much) from the inline completions implementation?
At least the utils you could export and reuse, you don't have to copy them.

kieferrm mentioned this pull request

Iteration Plan for February 2024 #204292

Closed

61 tasks

Contributor

Krzysztof-Cieslak commented Feb 5, 2024

OK, I've tried to clean it up a bit. utils.ts and ghostText.ts are no longer duplicated, and I'm now reusing parts of ghostTextWidget.ts (the big remaining "pain" point here is the GhostTextWidget class itself, which is very similar in both implementations - I probably could look into refactoring it a bit to enable better code reuse, but it would require bigger changes in the inlineCompletions version)

Krzysztof-Cieslak force-pushed the multi-ghost-text branch from 9eccf2e to b81b852 Compare

February 7, 2024 10:20

hediet commented

View reviewed changes

Member Author

hediet left a comment

See comments

src/vs/editor/common/config/editorOptions.ts Outdated Show resolved Hide resolved

src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts Outdated Show resolved Hide resolved

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Outdated Show resolved Hide resolved

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Outdated Show resolved Hide resolved

src/vs/workbench/api/common/extHost.api.impl.ts Outdated Show resolved Hide resolved

src/vs/workbench/api/test/browser/extHostTextEditor.test.ts Outdated Show resolved Hide resolved

src/vs/workbench/services/actions/common/menusExtensionPoint.ts Outdated Show resolved Hide resolved

src/vs/workbench/api/common/extHostTypes.ts Show resolved Hide resolved

Krzysztof-Cieslak force-pushed the multi-ghost-text branch from 2791659 to beec770 Compare

February 13, 2024 11:09

Contributor

Krzysztof-Cieslak commented Feb 13, 2024

@hediet I've addressed all the feedback

Krzysztof-Cieslak added 14 commits

February 15, 2024 12:44


          Initial implementation of multi ghost text scenario

411db69


          Make MultiGhostText independent and add selection functionality

d2f9900


          Implement accept all and accept selected

da55827


          Add remove range

b4f6bd2


          Unique IDs

0f12c63


          One-by-one UX

457898c


          Jump to position

60472a9


          Remove old code

be3b94d


          I'm an idiot

74658af


          Some improvements

bf3863b


          Handle last line suggestions correctly

07d0bd3


          Scroll to suggestion position if outside of viewport

7f71412


          Don't apply strikethrough for leading/trailing whitespaces

41ff1b2


          Bring back multiple suggestions UX

37b5de4

Krzysztof-Cieslak added 18 commits

February 15, 2024 12:46


          Add validation of inline edit (disabled for now)

e3b8175


          Add inline replacement, and handle ranges correctly

db3e1ad


          Reenable validation of incoming edits

255416a


          remove comment

9cdcb0c


          Add optional colouring

9026a5f


          Fix compilation after rebasing

9af415e


          Background-color only removed lines

9f72bb7


          Check cursor position whenever we display new edit

5312d6b


          Remove unnecessery change

e65a140


          Disable inline edit by default

b4f5d4b


          Reenable proposed API checks

ec14fec


          disposableObservableValue should be registered

a4ec892


          Remove unused code that injected additional css class into virtual lines

782611a


          Don't export renderLines

3e851da


          Use CSS class rather than dynamic styling for background coloring

fa29ac2


          Make text and range properties readonly in the API

0bafa48


          Add onBlur and onFocus behaviour

4cfe943


          Fix rendering for pure remove edits

67ecfa8

Krzysztof-Cieslak force-pushed the multi-ghost-text branch from daddef3 to 67ecfa8 Compare

February 15, 2024 11:47

hediet commented

View reviewed changes

Member Author

hediet left a comment

See comments. Looks okay, just the leaking disposable store is a blocker at the moment.

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Show resolved Hide resolved

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Outdated Show resolved Hide resolved

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Outdated Show resolved Hide resolved

src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts Outdated Show resolved Hide resolved

src/vs/workbench/api/common/extHostLanguageFeatures.ts Outdated Show resolved Hide resolved

Krzysztof-Cieslak added 3 commits

February 16, 2024 13:27


          InlineEditController.update model minor clean up

85adbf8


          Change the way onDidChangeModelContent and `onDidChangeCursorPositi…

33d199e

…on` is handled


          Free all the edits

cf468cc

hediet marked this pull request as ready for review

February 16, 2024 14:54

vscodenpa added this to the February 2024 milestone

hediet enabled auto-merge (squash)

February 16, 2024 14:56

chrmarti approved these changes

View reviewed changes

hediet merged commit ad35b73 into microsoft:main

6 checks passed

hediet changed the title ~~Multi ghost text~~ Inline Edit Feature

microsoft 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