Commit Graph

459008 Commits

Author SHA1 Message Date
Vera Petrenkova
ba81dfd08f IJ-CR-155115 IJPL-172387 FUS: Add 'invocationPlace' parameter to dialogs statistic
Merge-request: IJ-MR-151127
Merged-by: Vera Petrenkova <Vera.Petrenkova@jetbrains.com>
(cherry picked from commit dbe25a3787fd283c2576bdb8ff4f8155a963d8f9)

GitOrigin-RevId: faf82a86cb8040b1d48b9ba2c2f9907767314c86
2025-02-19 18:38:10 +00:00
Mikhail Pyltsin
769808c52d IJ-CR-155375 Revert "[java-runner] IJ-CR-154797 IDEA-363985 Temporary workaround for JNI restriction"
This reverts commit dda8badb

(cherry picked from commit a52b17f30c338d7bb11caecf17e32690f6621582)

GitOrigin-RevId: 13e035b2a42177ddb38cd84aef3e32ed7279b473
2025-02-19 13:48:10 +00:00
Roman Shevchenko
89cd6761b4 [java] restoring "dump threads" action availability on Windows
(cherry picked from commit 366fdffea056fd6896c090fae654d5c28f7289d4)

IJ-CR-155182

GitOrigin-RevId: d11412fa3094bf24ca495d1e6a504c5d4f922f11
2025-02-18 18:59:32 +00:00
Roman Shevchenko
e7a6ad4826 [java] retiring 'breakgen' DLLs from JVM process proxy (IJPL-16521)
(cherry picked from commit 3789c7f569bc1f220aa9c7524d36ac44a3754cf0)

IJ-CR-155182

GitOrigin-RevId: a7ff75cc9cc1a54c9c1b1628fb7c89f65cf8cf8d
2025-02-18 18:59:32 +00:00
Piotr Tomiak
7efa647a39 [webSymbols] WEB-63786 Rename refactoring in Astro's define:vars directive displays raw PsiSourcedWebSymbolRenameHandler
(cherry picked from commit 5005499dcbd0ca08c3542c323e47c3fb1014ad64)

IJ-CR-154369

GitOrigin-RevId: 4cd82ccd38253889cb8a217395915d5bf277644b
2025-02-17 12:52:25 +00:00
Nikita Pavlenko
a9fbe0f975 [PyCharm] PY-29177 Jupyter (fix): Added path resolution to relative local files (../../../1.png)
Part 1, initial commit of JS part.

(cherry picked from commit 8e28858f8e6b206b044c4b7cb46a6d4932a7e29d)


(cherry picked from commit f75ec86191d844fce62acb7d0f3835349d48378d)

IJ-CR-155171

GitOrigin-RevId: 16ddacb8aa77275dd894c488d36931670e45881c
2025-02-15 15:23:32 +00:00
Roman Shevchenko
daedb39b66 Cleanup (minor optimization; typos; formatting)
(cherry picked from commit 6b29ba37fb1a74af33bbbf78fb4d353bb1f76a60)


(cherry picked from commit 7e6df0a65da053bbc2aea9bdc08017565cfb5c8c)

IJ-CR-155171

GitOrigin-RevId: c4bc63da9d5e7d0457376bfaa4380cde59ab54d1
2025-02-15 15:23:32 +00:00
Roman Shevchenko
9c2cf149ef [jupyter] merging HTTP handlers
... because `JupyterCefPathHandler` is not a true "path handler" and doesn't fit into `BuiltInWebServer` security model; decoupling makes `WebServerPathHandler` easier to refactor. Besides, it delegates to an instance of `JupyterCefHttpHandler` anyway and needs an anonymous object to access `HttpRequestHandler#sendData` - so merging simplifies both the code and the logic.

(cherry picked from commit bd2122b0f2bbd2ae74da4dc2bdada6de1ccc3e1b)


(cherry picked from commit 7f157366ebb72b7083149e2a8d3a74bb17786f40)

IJ-CR-155171

GitOrigin-RevId: 8798ac40ef8abf9ed2e2994a28bd32b00ffed267
2025-02-15 15:23:32 +00:00
Nikita Biriukov
5dd2eb64cf [gradle][groovy] IDEA-343916 add Gradle icon in autocomplete variants for version catalogs with default location
The icon was available only for version catalogs with custom location.

Code review: IJ-CR-153925
(cherry picked from commit b00d2ccd1901705489097ad193dcd97cb0fb9062)

GitOrigin-RevId: 65fbd12dbe95f05763bb8d64c65ab7c1cd67db3c
2025-02-14 14:58:29 +00:00
Nikita Biriukov
7110c90cca [gradle][groovy] IDEA-343916 enable completion for a property with version catalog name
- fixes completion for "libs" `GradleVersionCatalogsCompletionTest#testCompletionForVersionCatalogProperty`
- also enables completion for all other version catalog names of a build

I realized that `GradleExtensionsContributor#processPropertiesFromCatalog` is called not only while resolving but also while completion: when only a part of catalog name was written. In this case, `name` argument is `null` and accessors should be created for all version catalogs of the corresponding build. To achieve that, I added `GradleVersionCatalogHandler#getAccessorsForAllCatalogs`.

I decided to add a separate method for getting all accessors because if I use the existing `getAccessorClass`, it would recreate `ProjectBuildModel` for each version catalog.

Code review: IJ-CR-153925
(cherry picked from commit 1250f5b3bb22b6ed1968683b0b6144418d0ad70f)

GitOrigin-RevId: 3f270387510983fbd51ba630c54a04db7d5a5025
2025-02-14 14:58:29 +00:00
Nikita Biriukov
5ad7bbe193 [gradle] IDEA-363330 fix NPE in SyntheticVersionCatalogAccessor
Code review: IJ-CR-153925
(cherry picked from commit 46cad97432505dbb6231380329e97fdae32daf0b)

GitOrigin-RevId: df2c71f2c70d5bcc644a19ee2bd028432563ffc5
2025-02-14 14:58:29 +00:00
Nikita Biriukov
741d8ddc72 [gradle][groovy] IDEA-343916 fix navigation from the reference with version catalog name
In runtime, navigation did not work for this example:
`my<caret>Libs`.junit.jupiter
Where myLibs is a name of a version catalog defined in settings.gradle. However, navigation would work if the caret is located on `junit`.

The Interesting point is that `GradleVersionCatalogsResolveTest` has the test `testNavigationToTomlFile2` that covers this case. It was passing well because:
- in runtime, references to version catalogs are resolving using the data from the Android module. The corresponding Psi elements - StaticVersionCatalogProperty are created in GradleExtensionsContributor.kt
- in tests, references were resolved using the older approach which still works if android module does not provide version catalogs. It didn't because GroovyDslParser from the android module was not available in tests. Hence, reference was resolved using the GradleExtensionProperty PSI element created in GradleProjectExtensionContributor.kt

Code review: IJ-CR-153925
(cherry picked from commit de4bcd81a61a3bc45119857357f43a8a21a75392)

GitOrigin-RevId: a143eb4a149cea8cc549986023793912bd5c869d
2025-02-14 14:58:29 +00:00
Nikita Biriukov
4eeaeee016 [gradle][groovy] IDEA-343916 resolve references in build.gradle to a TOML with custom location of included builds
The changes in this commit allow resolving references to version catalogs in included builds of a composite build if android module provides these version catalogs.

I found two existing approaches to resolve a reverence with a name of a version catalog (e.g. 'myLibs') to a TOML file:
1) Using the data from VersionCatalogsModel that is prepared at sync in `CommonGradleProjectResolverExtension#populateProjectExtraModels`.
Resolve happens in `GradleProjectExtensionContributor`. It works well for simple projects, not composite ones.
This allows navigation to a version catalog with custom location that could be specified in settings.gradle

2) Using the data from `ProjectBuildModel` that is prepared in android module. Resolve happens in `GradleExtensionsContributor`.
It works only if the code in android module correctly discovers version catalogs and provides them.
In comparison to the first approach, the data is compared not while syncing but when it is requested

Code review: IJ-CR-153925
(cherry picked from commit d2859302e5aba22413d3b1da874bff1cd15c46b2)

GitOrigin-RevId: f2f65eff37cbfed5da79cfa570fa61caafc667a2
2025-02-14 14:58:29 +00:00
Pavel Porvatov
be4ffdc36a IJPL-172384 Intellij IDEA 2024.3 freezes on opening Context Menu (Opt + Enter) using Catppuccin Latte or Gerry* Light themes
(cherry picked from commit 962c0efacc7ddde78d5610b9c79a409c23471b4c)

IJ-CR-154778

GitOrigin-RevId: 75f41a865282f6a6110a9eae000bd95cad6ad9a0
2025-02-14 13:22:47 +00:00
Pavel Porvatov
ab6b288cae IJPL-172384 Intellij IDEA 2024.3 freezes on opening Context Menu (Opt + Enter) using Catppuccin Latte or Gerry* Light themes
(cherry picked from commit d6e781abe0adbb39b2037c4e0c751ecefd7ed9a8)

IJ-CR-154778

GitOrigin-RevId: bab7b9840f607f3252f2c9112ebee348f2ce1426
2025-02-14 13:22:47 +00:00
Victor Turansky
8c3b6796a7 Revert "WEB-67146 Hide "Module" scope option from "Find in Files" popup for WebStorm"
This reverts commit 8011960cf942f31f7e54e14996eb5ec2e7891903.

GitOrigin-RevId: 9a61750af8953a783c59f8971aef55b89ea4cddb
2025-02-13 18:11:23 +00:00
Mikhail Pyltsin
85d38f47ea [java-runner] IJ-CR-154797 IDEA-363985 Temporary workaround for JNI restriction
(cherry picked from commit 636caa3aaf46f8bbe6b37ca474662bb95f705f97)

GitOrigin-RevId: dda8badbd17ef8a6f23930282779e482f12c10e4
2025-02-13 17:08:27 +00:00
Mikhail Pyltsin
3d43f7077c IJ-CR-153901 [java-parser] IDEA-366391 Inconsistent doc comment association after markdown support
- fix naming

(cherry picked from commit 26986a580dbe2d963c390fe850ad71ba393fde7c)

GitOrigin-RevId: d179fe7610545851823b0e7864a0903414b29ba2
2025-02-13 14:23:53 +00:00
Mikhail Pyltsin
770cfd6fff [java-parser] IJ-CR-153901 IDEA-366391 Inconsistent doc comment association after markdown support
- use language level to predict the order of comments

(cherry picked from commit e7986fcb2302dde7ad80fae9346f6a27edb576ae)

GitOrigin-RevId: f1cee2d3123a9a9845f999ac03984427799c84db
2025-02-13 14:23:53 +00:00
Mikhail Pyltsin
19af3dce28 [java-parser] IDEA-366391 Inconsistent doc comment association after markdown support
(cherry picked from commit 072bc109310e3059f3fab309dbd521ca2caad6e6)

GitOrigin-RevId: adabc2d3ad33c5f997f09565ddf24c4ef445290b
2025-02-13 14:23:53 +00:00
Bas Leijdekkers
b5a53393ed Java: fix bad code is green problem (IDEA-366474)
"cannot reference super before superclass constructor is called"

(cherry picked from commit a2eeb5211fed697bc99ec9620bca4493c5a7adae)

GitOrigin-RevId: 6c404d216a804825e70d5c37866e3055dc8c5443
2025-02-13 14:23:53 +00:00
Bas Leijdekkers
2f1f604a68 Java: rename feature to the currently correct name (IDEA-364189)
Statements before super() -> Flexible Constructor Bodies

(cherry picked from commit 8878101b0b2cef4d149c8f0819919ae5393c1e74)

GitOrigin-RevId: 53a432bb1945c00c23cfc4b1f7f25387c6f406dd
2025-02-13 14:23:53 +00:00
Bas Leijdekkers
3746633993 Java: match javac from jdk 24 in error highlighting for Flexible Constructor Bodies - JEP 492 (IDEA-364189)
(cherry picked from commit 686bd65963483f93acd22ae8956681f889105409)

GitOrigin-RevId: b8c02f835e7173b68aa39aee57e4a8c590608482
2025-02-13 14:23:53 +00:00
Bas Leijdekkers
8e0d1b142f Java: fix error message (IDEA-364189)
(cherry picked from commit 6ddc29ca9af9523ac8597bc00b920b872a4250b6)

GitOrigin-RevId: 4ae3e61c614cde608f4593ec7fa758b2ed6c1a5d
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
dfd169a1dc [java-import] IJ-CR-151305 IDEA-364508 support optimize imports
- small cleanup

(cherry picked from commit 1650941c66a06b740cee0eaa7c5053a3c5a01ebf)

GitOrigin-RevId: 9788f0d264e5b3d860ed1e1754887eba4f0f00f4
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
b3f8bbb608 [java-highlighting] IDEA-365996 Constructor in an implicitly declared class is not highlighted as error
(cherry picked from commit 2de45c452608cea2ab314511060ac733259a8c18)

GitOrigin-RevId: daed31a96a3fb96a6cbed183443ed90205b679f3
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
35c774bf7d [java-run] IDEA-365965 Support JEP 495. Filter non-static methods in abstract classes
(cherry picked from commit e96732d810ae6a0f1ffa44a0d5cc11d4c0f50d06)

GitOrigin-RevId: 5c2bb0dc9e19306adfee47c8667c7c3d98b5d064
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
e6ec1394ca IJ-CR-151305 [java-import] IDEA-364508 support optimize imports
- fix comparator

(cherry picked from commit 5c6f0a4e689359a5574578cd63377543d413ccda)

GitOrigin-RevId: 5cc96fa8dc448e65fa2d58d5692f8af27e9ddd3c
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
105b965377 [java-inspections] IDEA-365059 Support JEP 494: Fix expand module imports
- modules shouldn't add implicitly imported classes

(cherry picked from commit d18b9bc7783a478cec3e75f95542c410ae78acd8)

GitOrigin-RevId: 4929fcc6fa1bf67fa799e6feef175593f246d614
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
cd9a60ab8f IJ-CR-151305 [java-import] IDEA-364508 support optimize imports
- use layout table

(cherry picked from commit 6862419acc2beb72f87cca6b93612f9afe81f698)

GitOrigin-RevId: af86c63fa16f760ad3fd0b66fc9f86f7a21de7c7
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
46bfa503aa [java-import] IDEA-364508 support optimize imports
- new options are added
- changes for optimize imports

(cherry picked from commit 82b0223f9e7e2972d13ab182ea651cdccd28a5d3)

GitOrigin-RevId: 99f0276e1d9464f75f5bbce91ad09727582d208b
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
dc032bf4a7 IJ-CR-151018 [java-inspection] IDEA-363979 Conflicts with on-demand and module imports
- introduce enum for conflicts
- add annotations
- direct implementation isOnDemand for PsiImportModuleStatementImpl

(cherry picked from commit a116b4952b6498e98740d115cace170512d0d59a)

GitOrigin-RevId: 27f28ecf92cd147f13c5e5a6ebe123b7962aa4f1
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
a7d49a4b2f IJ-CR-150882 [java-highlighting] IDEA-363617 Support JEP 494: Module Import Declarations (Second Preview)
- more test

(cherry picked from commit fe1c623b3fe230a286f80d8a7cb7e5657b6d9493)

GitOrigin-RevId: 3c9db7f48713634c4ad9065c47ffa074cffd8d99
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
8f91e59c51 IJ-CR-151018 [java-inspection] IDEA-363979 Conflicts with on-demand and module imports
- cleanup

(cherry picked from commit 8672f5704b4a7728ffc8d170e91ee6925f54f089)

GitOrigin-RevId: 9a0f6020e71fd975c9e092f62c56c7ae2d8672f9
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
dcb8e7a582 [java-inspections] IDEA-363980 Support JEP 495. Update ImplicitToExplicit /ExplicitToImplicit inspections
- tests

(cherry picked from commit 946428cb5f8e397625acbec9446d731fb0550225)

GitOrigin-RevId: b7240b0999796cb367dd01eb49ff51b63004de94
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
3348e7291f [java-inspection] IDEA-363979 Conflicts with on-demand and module imports
(cherry picked from commit 0857df90e3f9cc450b48b56186573a9a89b5b041)

GitOrigin-RevId: 8e1474a59c687561ba5f00a13fecd4d2a9057b7a
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
6113015d06 [java-highlighting] IDEA-363617 Support JEP 494: Module Import Declarations (Second Preview)
- support transitive for dependencies on 'java.base' module

(cherry picked from commit a364934e96592ae3a8244ae68b2fb5372e7f5a30)

GitOrigin-RevId: 6bffa2d03645e77537d70cd4d9d081dec80680af
2025-02-13 14:23:52 +00:00
Mikhail Pyltsin
aea70bba3b [java-highlighting] IDEA-363617 Support JEP 494: Module Import Declarations (Second Preview)
- support shadowing module imports by package-on-demand

(cherry picked from commit 643fc10bcbfee2f1d41ec02e624b30bc3a48e4bb)

GitOrigin-RevId: d1e49b2d48f0b69f8e15393cb823e5529f9b4452
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
2ce2af7f8e Java: avoid changing code style api for import setting (IJ-CR-147745)
(cherry picked from commit b6d8223525eabd52a7973ef10927403063b3b89a)

GitOrigin-RevId: 19da9f718812ff0f553d5363cd2b5ce6724e7f49
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
2ec44412eb Java: add "Layout on-demand import from the same package first" option (IDEA-204441)
enabled by default for consistency with other tools

(cherry picked from commit df5a4b65c5f31b195bd091a91d16ea0bc7bcc36c)

GitOrigin-RevId: 3b669ce15e9ad037bcff9c1e2638e2b823424ef7
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
f4cdf03f94 Java: don't break compilation on optimize imports when package has "import" in its name (IDEA-336461)
(cherry picked from commit a691c03b8814e7cffec4dd32d4dfc7f3b0e10814)

GitOrigin-RevId: 5747d57365f3b54861ba9a1a34209c42ac28669f
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
44840c3a42 Java: remove duplicated utility method
(cherry picked from commit e539495083603140f3fd4176374ad5a0e01852c1)

GitOrigin-RevId: 612d250c0a6550e3ae733cf78f4016013b20d7b8
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
e1b1b53039 Java: remove unused record class
(cherry picked from commit 8a82fa67e6fde0a4cb734d4f9f427a00203ed01c)

GitOrigin-RevId: 449dd9824bff9ec6829536e65918cdab740d3a04
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
c82b457feb Java: sort imports correctly when "Layout static imports separately" is disabled (IDEA-298584)
(cherry picked from commit 6656672e1ae56cffbc4f65cfbbd79d97004aef78)

GitOrigin-RevId: a1065f373f4f8fa92e8f36564f6091fd99408e65
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
982a5b4d9c Java: order imports correctly when layout specifies package without subpackages (IDEA-360701)
(cherry picked from commit 5398813a84a6046eaad776debfe7c75c0d8527e8)

GitOrigin-RevId: aa5274b93a06f8f4bc5b381064c7aa1de238fea3
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
24519bc121 Java: clean up LightOptimizeImportsTest
(cherry picked from commit c103b21df16a04f5c01173e1e57c943bb60a840f)

GitOrigin-RevId: 661a6944f47a101bec2852d2789cda66b7330cdd
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
a5d823ab1c Java: ImportHelper cleanup
(cherry picked from commit af547fd3d405a3ef621dead879afc3f53911ea1c)

GitOrigin-RevId: 526e1309d2567814cb68f93ddb93da2480b7b735
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
b21fd06310 Java: don't expose implementation detail in API
(cherry picked from commit 952d1b3c68f9a011ad7826cc8a1075f2ef990e6d)

GitOrigin-RevId: 87445fc4969225a3a03befab8a5ce5640283cc53
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
340fe61f67 Java: cleanup
(cherry picked from commit 6789d494b845c4455c2ef6b3c4aa816ae1906716)

GitOrigin-RevId: 36bc0a451e5b58211b2bf0268244944aebc3646d
2025-02-13 14:23:52 +00:00
Bas Leijdekkers
cd9b949072 Java: allow importing a class when there is a variable/method with the exact same name (IDEA-216101)
(cherry picked from commit e4c5b86ce2f4910711e33581c58d271dadbf6970)

GitOrigin-RevId: 6366d12eb83c3b5e20489b26d1ce0c531e52de47
2025-02-13 14:23:52 +00:00