Commit Graph

3132 Commits

Author SHA1 Message Date
Aleksandr Krasilnikov
96e9c11cb6 IJPL-172029: vcs marker: Fix disposing
(cherry picked from commit 06626edc93dcb233ed21e546ba16cd266462caaa)

IJ-CR-149651

GitOrigin-RevId: c0e59976528fb09fc3379a5da9c01d7b8cc84113
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
f6f1d9b68a IJPL-161089: ApiCheckTest
(cherry picked from commit d92b4c3934facef24db643c5067db2d32f08e618)

IJ-CR-149651

GitOrigin-RevId: e2e20253663334b2c7b4bc500918a60b7b1e1d80
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
6901adc6dc IJPL-165414: vcs marker: Rework the popup opening
Delegate the popup building and opening to the `LineStatusMarkerPopupService` and control that opened popup is disposed
before creating the new marker panel


(cherry picked from commit fff881f00d75ce4d4b9fa0fc5fa2e2407f7e8813)

IJ-CR-149651

GitOrigin-RevId: 3458a2e0f1e7830d5c67aa539839182840e9d64c
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
814318fa18 IJPL-166447: vcs marker: Close popup when call the completion
(cherry picked from commit 4e1b49b0a9e6304f33fcb29610f86535e2006ca1)

IJ-CR-149651

GitOrigin-RevId: d478b1ef381380156b2ab03aaa0d392dd0492b54
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
008dc74c2c IJPL-166455: vcs marker: Filter unrelated scrolling events to prevent popup closing
(cherry picked from commit a82ded9d80c58ac1fb70e758a9a77f6987220db0)

IJ-CR-149651

GitOrigin-RevId: 09430ea3e37046b7f0173efa6508d3259a2d2028
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
633ffa3474 IJPL-165414: vcs marker: Move "Highlight words" action form toolbar to the context menu
Add "Copy" as well to the context menu


(cherry picked from commit 7a64bba4ba719d3a5a45e9ca51ecf27ca8ed9bd0)

IJ-CR-149651

GitOrigin-RevId: 4dac3794ff4e2716cfdf5fed1fbc6b5cd1c1550f
2024-11-25 17:22:14 +00:00
Aleksandr Krasilnikov
90ee4cefd1 IJPL-165254: vcs marker: Align actions
(cherry picked from commit 1618165c41cfe0dce37e16e179441fb1792abbcc)

IJ-CR-149651

GitOrigin-RevId: 195145b946a0f294c8b149bf0a9ab9396798ccfd
2024-11-25 17:22:14 +00:00
Vyacheslav Moklev
39f1b98537 [RDCT] GTW-2902: Allow Diff editor to be opened in a new window
Before this commit, openMode was not passed for remote clients because it was not supported for them.


(cherry picked from commit 6d788461cbecfbb9990dabe6a7c7fc19e7599f60)

IJ-CR-148304

GitOrigin-RevId: 233aee8c17a77ee24d7df0cadeed8cf512efe0a0
2024-11-18 17:49:30 +00:00
Ilia.Shulgin
d925953fd0 Fix API compatibility for BlankDiffWindowUtil
(cherry picked from commit d9d7838c95f3e5d9be9ba686b30392ec089a9819)

IJ-CR-148090

GitOrigin-RevId: ed51e26a9b4e8621c0b55d0d3f177273596d40f1
2024-10-30 14:31:46 +00:00
Aleksandr Krasilnikov
f0a3e076c4 IJPL-165066 vcs marker: Fix closing of the popup when clicking on the top panel.
IJ-MR-147690

GitOrigin-RevId: 70178e6e2d14053f40a1b4fbd1a164efa1841024
2024-10-28 21:37:38 +00:00
Aleksandr Krasilnikov
d8323df36f IJPL-164292 vsc marker: Add separate EditorActionHandler to close Marker Popup simultaneously with the intention bulb
IJ-MR-147690

GitOrigin-RevId: 8a5f2de379efc13a98f2403efea3d19613bb1854
2024-10-28 21:37:38 +00:00
Aleksandr Krasilnikov
97d32070e4 IJPL-164294 vcs marker: Fix scrolling and positioning of popup
IJ-MR-147690

GitOrigin-RevId: 20a8d077f497d0bcb58a46d9ba30f525b1af897a
2024-10-28 21:37:38 +00:00
Ilia.Shulgin
f0b3a80be1 [git] IJPL-164368 Fix missing shortening in DiffEditorTabTitleProvider#getEditorTabTitleAsync
(cherry picked from commit c4b5b2c690d6e41cef4f2a753abbd4f3d73b0097)


(cherry picked from commit e1640c34f10d70dee227b9dc7f02d3aad34bbb4f)

IJ-CR-147679

GitOrigin-RevId: 0ba41f789621100883cdd387aa043608c4481a31
2024-10-25 21:58:52 +00:00
Maria Filippova
102b7b31a1 WI-78414 Support for Merge VCS conflicts in "import" statements for PhpStorm
(cherry picked from commit e3b61c66d9dc0e4ce5f4ce407226ef0dc0b2b652)

IJ-CR-147427

GitOrigin-RevId: e8a6a6d33f4425760fed1ae30d0f978d3fe4262c
2024-10-24 16:27:46 +00:00
Aleksandr Krasilnikov
562d970db4 IJPL-161089 ApiCheckTest
GitOrigin-RevId: 7b5c69091c6e04f3e36a04da1d19df432825d580
2024-10-14 19:42:25 +00:00
Aleksandr Krasilnikov
86d58fbf8c IJPL-161089 vcs marker: Initial implementation of committing separate chunk from gutter
GitOrigin-RevId: 7009ec8c785bed0074084c44495749e52c30e9e4
2024-10-14 19:42:25 +00:00
Aleksandr Krasilnikov
aa3a77d9a0 IJPL-161089 vcs marker: Adjust layout and gaps to preserve a toolbar on top in case when additional component is higher
GitOrigin-RevId: f11808ced79de23f7609be80a5eb5376df91dc70
2024-10-14 19:42:25 +00:00
Aleksandr Krasilnikov
de429c0107 IJPL-161089 vcs marker: Track inner components resizing
GitOrigin-RevId: 026cb25f0d49b51a3e2ee3ada8c01fd70ecd5e84
2024-10-14 19:42:25 +00:00
Aleksandr Krasilnikov
3706d2c968 IJPL-161089 vcs marker: Show popup hint manually without using HintManager
In case when hint popup contains inner `EditorTextField` it happens that popup could be unpredictably
closed during typing in this editor. It is impossible to control this behavior using `HintManager::show*` method,
so workaround is to show it manually and add corresponding listeners on a source editor

GitOrigin-RevId: b021a7815d497eee0b739ea5560971162605df52
2024-10-14 19:42:25 +00:00
Vladimir Krivosheev
f88f078dda bazel: update model
GitOrigin-RevId: dcd1f70f9ee2d7f04919b2da0eb725d6c5e54c3d
2024-10-07 12:22:54 +00:00
Nikita.Ashihmin
a82c5d2f20 PY-71854 Platform(refactor): Replace all usage of old non file type specific File limits to the new FileSizeLimit
GitOrigin-RevId: c65b945a34e24ab79b06f2039361fd6dcc1048e7
2024-10-05 23:58:19 +00:00
Vladimir Krivosheev
4a176d4c02 IJ-CR-146078 extract intellij.platform.bootstrap
GitOrigin-RevId: b79efc92829111228e83058e54381d8e02116b6f
2024-10-05 22:01:55 +00:00
Daniil Ovchinnikov
823e985f18 API dumps: re-generate dumps
GitOrigin-RevId: b5cec844cbfe3313723404f7a85b590c25350b41
2024-10-04 21:20:21 +00:00
Aleksey Pivovarov
0c7aa58e59 IJPL-163247 diff: fix "Undo" in Unified diff viewer
'com.intellij.openapi.fileEditor.EditorDataProvider' used to have a priority over
'com.intellij.openapi.fileEditor.impl.EditorWindow' for FileEditor data key.
Thus, UndoAction used to get 'TextEditorProvider.EditorWrapper' instead of 'DiffEditorViewerFileEditor'.

Unified viewer is not using 'com.intellij.diff.tools.holders.TextEditorHolder', so needs an own fix for IJPL-156898.
Follow-up: b6c36e30572c84933fe09fefa8b40143c7a36309

GitOrigin-RevId: 7cfdd628c2c8c41e1d538aec4e7c87495920e1dd
2024-10-04 16:28:21 +00:00
Aleksey Pivovarov
9309701e72 IJPL-163243 diff: fix "Missing semicolon" errors not being shown in Unified diff viewer
GitOrigin-RevId: d7a0ccbee60f85aed856cca2b9874e1382d3e01d
2024-10-04 15:45:32 +00:00
Nikolay Chashnikov
b01d4c953a IJPL-797 intellij.platform.diff.impl review internal API
Mark as internal classes which have no usages in the Marketplace and in plugins in the intellij project.

GitOrigin-RevId: 009e6fc11c39f8666ffae7d0f5d9313cc4ec948d
2024-10-03 17:39:16 +00:00
Roman Shevchenko
69479687e5 [project] replacing FileChooserDescriptor#isFileVisible with file- and/or extension-based filters (IJPL-150176)
GitOrigin-RevId: 7176005f3d39d2f2e928c2e5f804de173e5d83f4
2024-10-02 09:28:56 +00:00
Vladimir Krivosheev
a9e7930abe bazel - build lang-impl
GitOrigin-RevId: c4c4dce20bd6e4046644f95f6e7b3f437c51668d
2024-09-27 13:47:17 +00:00
Gregory.Shrago
acd6732fd9 add knownIssue section for top issues
GitOrigin-RevId: 3c14a0f95846e432a28fdc680089ebc124ddb8a3
2024-09-26 01:47:21 +00:00
Dmitry Batkovich
a2a9a816a9 IJPL-161819 inline prompt detection:
* add context to generation prompt
* implement support for html, yaml, json
* remove progress bar from generation status bar
* change UX to highlight regeneration / prompt clarification after generation done
* refactor code

GitOrigin-RevId: c87d4dd1302e44a281d86d7f7861d6b2c94ef29f
2024-09-24 07:50:10 +00:00
Aleksey Pivovarov
c796e05468 EA-1469039 IJPL-101036 diff: better mocking in UnifiedImaginaryEditor
GitOrigin-RevId: 21a077ad656db3277ac84487560ed1050291d1fd
2024-09-23 13:33:33 +00:00
Vladimir Krivosheev
834bd75254 run jps-to-bazel by Bazel, compile platform using Bazel
GitOrigin-RevId: 3774d5adc404b02036f70b7cc35c9e60fdb5d84c
2024-09-21 00:54:17 +00:00
Lev Serebryakov
6400f70dde IJPL-149317 More explicit locks.
GitOrigin-RevId: 8564e9e1b352a77c3ca0d44470fdbbda5f1e9c49
2024-09-19 18:43:28 +00:00
Ilia.Shulgin
9e5b3bf53e [diff] IJPL-161760 Invalidate DiffFilePathLabelWrapper on theme update
Label size was set to 0x0 after theme update

GitOrigin-RevId: fae07e9d664da1c0b335231a21422297811864bb
2024-09-18 18:22:43 +00:00
Vladimir Krivosheev
09bdd80767 diff-impl - avoid multiple content roots
GitOrigin-RevId: f0c0e3cdc78ef834408fb5de6ad5e5f76922aff5
2024-09-17 20:21:34 +00:00
Vadim Salavatov
33f306e990 IJPL-161819 update api dump
GitOrigin-RevId: 125637b43e7e72a954c4526456f5cf4bdc234656
2024-09-16 20:51:55 +00:00
Konstantin Nisht
4fbc8c3e29 IJPL-161819 inline prompt code generation: show diff in the gutter after code generation
IJPL-162132: Clear progressbar only when a meaningful message arrives from LLM

IJPL-161819 gutter animation

IJPL-161819 hide bulb on edt

IJPL-161819 revert temporary code

IJPL-161819 properly dispose InlinePromptEditorFilter

IJPL-161819 hide unsupported actions

IJPL-162132: Do now show lightbulb after code generation

IJPL-161819 add tooltip text for line marker gutter

IJPL-161819 add revert action on gutter

IJPL-161819 move AIInEditorDiffRendererOnGutter to better packages

IJPL-161819 use proper diff color

IJPL-161819 move AIInEditorDiffRendererOnGutter to inlinePromptDetector module

also, add dependency on `intellij.platform.collaborationTools`

IJPL-161819 fix retry inlay text

IJPL-161819 add gutter markers to inline prompt

IJPL-161819 do not show generation diff on undo by default

cleanup

rename object

IJPL-161819 add `simplify` to prompt initiating words

IJPL-161819 ignore warnings shown while inline prompt is shown

IJPL-161819 ignore new errors in the current file when an inline prompt is shown

IJPL-161819 show diff after generation

Squashed commits:
Do not show quickfixes when the user is in inline prompt

add on generation diff

fix esc on retry

regenerate inlay

prevent blinking (fast fix)

add undo/redo FUS statistics

move diff listener class

hide diff on esc, add adv setting

dead code

hide diff before regeneration

do not show modified lines in diff (show them as deleted/added for more clarity)

better diff

make diff better

show diff on undo

something something

some ctrl+Z

GitOrigin-RevId: 2141d2e0b83c2b089780e0df1be12d43e4fff834
2024-09-16 20:51:55 +00:00
Aleksey Pivovarov
5087224ae0 diff: report used diff tools into FUS
GitOrigin-RevId: c68cd4d2268f43923bc6f8479e247550539386d2
2024-09-16 14:51:26 +00:00
Ilia.Shulgin
bec7876884 [diff] IJPL-162092 Fix missing path in unverioned files single side diff
GitOrigin-RevId: 9d0acc72d04111a71102189f681a8d8e3691ba4a
2024-09-13 19:55:39 +00:00
Ilia.Shulgin
1c681572dd [diff] Fix leak in FilePathDiffTitleCustomizer
`(JComponent) label.parent` was causing leak

GitOrigin-RevId: 9ac0dd70cf2293473102df2a0fb68322fe4ad664
2024-09-13 19:55:38 +00:00
Ilia.Shulgin
c242134f17 IJPL-161382 Support FilePathLabelWrapper in rem dev
Switch FilePathDiffTitleCustomizer to GridBagLayout, as GroupLayout isn't fully supported in RD

GitOrigin-RevId: 80c15edf70e0ad81cb1423a42d361894014997f9
2024-09-10 11:49:37 +00:00
Aleksey Pivovarov
040628070c diff: move EditorTabDiffPreview from [vcs-impl] to [diff-impl]
GitOrigin-RevId: ed7348283230288ac1aecbcc8999a44ef8e8d983
2024-09-09 16:29:11 +00:00
Aleksey Pivovarov
b2bc5e1223 diff: remove dependency on VcsEditorTabFilesManager
GitOrigin-RevId: 147d7554e49006d11866943ddaaa9f65350a0f27
2024-09-09 16:29:11 +00:00
Aleksey Pivovarov
a2b26d2f64 diff: drop 'DIFF_OPENED_IN_NEW_WINDOW' flag
GitOrigin-RevId: 872b7b54a28e4916332a7f8b5391229fc6dbfcd5
2024-09-09 16:29:11 +00:00
Aleksey Pivovarov
b8b2f0a5fc diff: move DiffEditorTabFilesManager implementation from [vcs-impl]
GitOrigin-RevId: 08b63232db191d60efa4b87db8e73fc9d7f22e2b
2024-09-09 16:29:11 +00:00
Aleksey Pivovarov
247b8078aa diff: reopen all FileEditor on 'Open Diff as Editor Tab' option toggle
GitOrigin-RevId: 7ad0568546b42ee84946ee5a9b870a2a22d3ab6c
2024-09-09 16:29:11 +00:00
Aleksey Pivovarov
b83a6715ba diff: use DiffEditorTabFilesManager over VcsEditorTabFilesManager
GitOrigin-RevId: af2bc69b324aacf8f2ca7393275f1cf8d58d74a4
2024-09-09 16:29:11 +00:00
Roman Shevchenko
a5666abead [project] pruning FileChooserDescriptor overrides (IJPL-150176 prerequisite)
`BrowseFolderRunnable` and `*WithBrowseButton` family: getting rid of separate "title" and "description" parameters in favor of the chooser descriptor object, to avoid cloning the latter down the road.

GitOrigin-RevId: 33ec5968a1db953c60848974135055c288accf85
2024-09-06 11:41:43 +00:00
Aleksey Pivovarov
78a686b0e9 EA-1444724 diff: fix assertion in UnifiedImaginaryEditor.calculateVisibleRange
GitOrigin-RevId: b727f2e9c3cf22e654bb328ae014af24c1ed2d7e
2024-09-03 15:25:17 +00:00
Aleksey Pivovarov
e3abda8435 IJPL-158397 lst: limit popup size to the IDE window size, not the screen size
GitOrigin-RevId: ca66e440c7feb87c5d920ec5dc8d376d5eeeea9f
2024-09-02 14:53:40 +00:00