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.

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

Copy/paste images into editors (Mac only) #15782

Merged
merged 44 commits into from
Aug 13, 2024
Merged

Copy/paste images into editors (Mac only) #15782

merged 44 commits into from
Aug 13, 2024

Commits on Aug 4, 2024

  1. Add support for copying and pasting images

    @rtfeldman
    rtfeldman committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    8c8d350 View commit details
    Browse the repository at this point in the history

  2. Add ClipboardItem::string

    @rtfeldman
    rtfeldman committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4667e2e View commit details
    Browse the repository at this point in the history

  3. Support copying and pasting images better

    @rtfeldman
    rtfeldman committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    bbdefea View commit details
    Browse the repository at this point in the history

  4. Fix UTType strategy

    @rtfeldman
    rtfeldman committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    d9c42a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Fix a test

    @rtfeldman
    rtfeldman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    61b204b View commit details
    Browse the repository at this point in the history

  2. Add paste hook in assistant panel

    @rtfeldman
    rtfeldman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    e7e59aa View commit details
    Browse the repository at this point in the history

  3. Add ClipboardImage::to_image_data 

    co-authored-by: Antonio <antonio@zed.dev>
    @rtfeldman @as-cii
    rtfeldman and as-cii committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    d60a29b View commit details
    Browse the repository at this point in the history

  4. Introduce ClipboardImage

    @rtfeldman
    rtfeldman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    5664f1f View commit details
    Browse the repository at this point in the history

  5. Split img into img and surface, add image rendering to assistant panel 

    co-authored-by: Richard <richard@zed.dev>
    @mikayla-maki @rtfeldman
    mikayla-maki and rtfeldman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    257e8aa View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Prep types to re-use the GPUI cache, expand the general message type … 

    …to incorporate images
    @mikayla-maki
    mikayla-maki committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    092610b View commit details
    Browse the repository at this point in the history

  2. Fix inserting/deleting image behavior

    @rtfeldman
    rtfeldman committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    2d6e83d View commit details
    Browse the repository at this point in the history

  3. Fix sizing on pasted images 

    Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Jason <jason@zed.dev>
    @rtfeldman @as-cii @jvmncs
    3 people committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    fbf71cf View commit details
    Browse the repository at this point in the history

  4. Gracefully handle image not being able to be converted to RGBA

    @rtfeldman
    rtfeldman committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    63837e5 View commit details
    Browse the repository at this point in the history

  5. WIP 

    co-authored-by: Kyle <kylek@zed.dev>
co-authored-by: Richard <richard@zed.dev>
co-authored-by: Jason <jason@zed.dev>
    @mikayla-maki @rgbkrk
    @rtfeldman @jvmncs
    4 people committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    e600b35 View commit details
    Browse the repository at this point in the history

  6. Got everything compiling again 

    Co-authored-by: Jason <jason@zed.dev>
    @rtfeldman @jvmncs
    rtfeldman and jvmncs committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    bd3d81a View commit details
    Browse the repository at this point in the history

  7. Add an initial test for messages_from_iters

    @rtfeldman
    rtfeldman committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    cac6349 View commit details
    Browse the repository at this point in the history

  8. End to end image uploading achieved

    @mikayla-maki
    mikayla-maki committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    42727dd View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Include images in token counts

    @rtfeldman
    rtfeldman committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    3405386 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into paste-image

    @rtfeldman
    rtfeldman committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    909e31a View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. WIP

    @mikayla-maki
    mikayla-maki committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    76966b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Fix image rendering performance

    @mikayla-maki
    mikayla-maki committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c7d2fa8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into paste-image

    @mikayla-maki
    mikayla-maki committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    7e76aea View commit details
    Browse the repository at this point in the history

  3. Support copying a mixture of images and text

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ab03680 View commit details
    Browse the repository at this point in the history

  4. Prepare for copying images to/from clipboard

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    830dc63 View commit details
    Browse the repository at this point in the history

  5. Remove some things unused for copying images

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b750bba View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into paste-image

    @mikayla-maki
    mikayla-maki committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d1ba9f6 View commit details
    Browse the repository at this point in the history

  7. Add images to the context history 

    co-authored-by: richard <richard@zed.dev>
    @mikayla-maki @rtfeldman
    mikayla-maki and rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ca25ba2 View commit details
    Browse the repository at this point in the history

  8. Remove unused dep

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c54ae71 View commit details
    Browse the repository at this point in the history

  9. Fix cargo check --tests errors

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    a432585 View commit details
    Browse the repository at this point in the history

  10. Fix some clippy complaints

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    630a4d2 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/main' into paste-image

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    1fb88f3 View commit details
    Browse the repository at this point in the history

  12. Fix some Linux CI issues

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b1f67a8 View commit details
    Browse the repository at this point in the history

  13. Fix some Windows CI errors

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ba5ec71 View commit details
    Browse the repository at this point in the history

  14. Fix some more Linux CI errors

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    53e390a View commit details
    Browse the repository at this point in the history

  15. Fix an editor test

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d7da83a View commit details
    Browse the repository at this point in the history

  16. Fix some Vim test compilation errors

    @rtfeldman
    rtfeldman committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    0c38e16 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Fix another Linux CI failure

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    deb1a87 View commit details
    Browse the repository at this point in the history

  2. Temporarily disable test_nsattributed_string

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    bf4d90d View commit details
    Browse the repository at this point in the history

  3. Fix another Linux test

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    4c223a2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into paste-image

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    1167376 View commit details
    Browse the repository at this point in the history

  5. Fix a missing reference on Linux

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e7184cf View commit details
    Browse the repository at this point in the history

  6. Refactor some Option-heavy logic

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    222c1f3 View commit details
    Browse the repository at this point in the history

  7. Fix Mac clipboard serialization regression

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5da29c9 View commit details
    Browse the repository at this point in the history

  8. Fix Windows CI failure

    @rtfeldman
    rtfeldman committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    6c21eec View commit details
    Browse the repository at this point in the history