Support JetBrains IDEs 2024.1 #5960

tpasternak · 2024-01-18T19:47:44Z

Checklist

I have filed an issue about this change and discussed potential changes with the maintainers.
I have received the approval from the maintainers to make this change.
This is not a stylistic, refactoring, or cleanup change.

Please note that the maintainers will not be reviewing this change until all checkboxes are ticked. See
the Contributions section in the README for more
details.

Discussion thread for this change

Issue number: <please reference the issue number or url here>

Description of this change

most of the files are just copies, you can compare them with:

diff -r sdkcompat/v2{33,41}
diff -r cpp/sdkcompat/v2{33,41}
diff -r testing/testcompat/v2{33,41}
diff intellij_platform_sdk/BUILD.idea2{33,41}
diff intellij_platform_sdk/BUILD.ue2{33,41}
diff intellij_platform_sdk/BUILD.clion2{33,41}

tpasternak · 2024-01-18T20:28:03Z

@ujohnny i'm getting this for clion, if something comes to your mind rn, then plase share, otherwise I'll do it myself

ERROR: clwb/BUILD:58:13: Building clwb/libclwb_lib.jar (31 source files) failed: (Exit 1): java failed: error executing Javac command (from target //clwb:clwb_lib) external/remotejdk17_linux_aarch64/bin/java '--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED' '--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED' ... (remaining 19 arguments skipped)
clwb/src/com/google/idea/blaze/clwb/run/GoogleTestUtilAdapter.java:35: error: cannot find symbol
    GoogleTestUtilAdapter adapter = EP_NAME.getPoint().extensions().findFirst().orElse(null);
                                                      ^
  symbol:   method extensions()
  location: interface ExtensionPoint<GoogleTestUtilAdapter>
Target //clwb:clwb_bazel_zip failed to build
Use --verbose_failures to see the command lines of failed build steps.
INFO: Elapsed time: 2.659s, Critical Path: 2.16s
INFO: 4 processes: 4 internal.
ERROR: Build did NOT complete successfully

ahmedyarub · 2024-01-19T18:29:23Z

@ujohnny i'm getting this for clion, if something comes to your mind rn, then plase share, otherwise I'll do it myself

ERROR: clwb/BUILD:58:13: Building clwb/libclwb_lib.jar (31 source files) failed: (Exit 1): java failed: error executing Javac command (from target //clwb:clwb_lib) external/remotejdk17_linux_aarch64/bin/java '--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED' '--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED' ... (remaining 19 arguments skipped)
clwb/src/com/google/idea/blaze/clwb/run/GoogleTestUtilAdapter.java:35: error: cannot find symbol
    GoogleTestUtilAdapter adapter = EP_NAME.getPoint().extensions().findFirst().orElse(null);
                                                      ^
  symbol:   method extensions()
  location: interface ExtensionPoint<GoogleTestUtilAdapter>
Target //clwb:clwb_bazel_zip failed to build
Use --verbose_failures to see the command lines of failed build steps.
INFO: Elapsed time: 2.659s, Critical Path: 2.16s
INFO: 4 processes: 4 internal.
ERROR: Build did NOT complete successfully

Does this help?
ujohnny@eb472e4

common/util/BUILD

tpasternak · 2024-01-19T21:48:41Z

So the CI is green, please just review #5968 separately, so I can rebase this branch

tpasternak · 2024-01-22T11:22:03Z

Ok, the PR is ready, I'm only blocked by #5968

ujohnny · 2024-01-22T14:53:00Z

intellij_platform_sdk/BUILD

@@ -601,7 +627,7 @@ config_setting(
 config_setting(
    name = "clion-2023.2-mac",
    values = {
-        "cpu": "darwin_x86_64", #todo how about m1?
+        "cpu": "darwin_x86_64",  #todo how about m1?


I'm not sure if you'd like to be in blame list for this line with this PR

ujohnny

some nits, also reached you privately regarding copyrights. otherwise lgtm

ujohnny · 2024-01-22T15:00:30Z

sdkcompat/BUILD

@@ -15,6 +15,9 @@ java_library(
    name = "sdkcompat",
    visibility = SDK_COMPAT_VISIBILITY,
    exports = select_for_plugin_api({
+        "clion-2024.1": ["//sdkcompat/v241"],


should we keep these sorted lexicographically?

ujohnny · 2024-01-22T15:01:36Z

third_party/go/BUILD

@@ -22,6 +22,9 @@ java_library(
        "intellij-ue-2023.2": ["@go_2023_2//:go"],
        "intellij-2023.3": ["@go_2023_3//:go"],
        "intellij-ue-2023.3": ["@go_2023_3//:go"],
+        "intellij-2024.1": ["@go_2024_1//:go"],
+        "intellij-ue-2024.1": ["@go_2024_1//:go"],
+


nit: whitespace

ujohnny · 2024-01-22T15:02:05Z

java/BUILD

@@ -57,6 +57,7 @@ java_library(
        "//sdkcompat",
        "//shared",
        "//third_party/auto_value",
+        "@error_prone_annotations//jar"


please add trailing comma

ujohnny · 2024-01-22T15:02:34Z

intellij_platform_sdk/build_defs.bzl

@@ -104,6 +104,23 @@ def _check_channel_map():
        fail("Unexpected values in INDIRECT_PRODUCT_CHANNELS: %s" % unexpected)

 DIRECT_IJ_PRODUCTS = {
+    "clion-2024.1": struct(


same comment re lexicographic order

tpasternak · 2024-01-22T16:45:32Z

some nits, also reached you privately regarding copyrights. otherwise lgtm

tpasternak · 2024-01-22T20:45:31Z

Ok, formatting problems addressed and copytight headers added cc @ujohnny @mai93

mai93

thanks @tpasternak. Left minor comments

common/settings/BUILD

mai93 · 2024-01-23T01:13:21Z

intellij_platform_sdk/BUILD

@@ -770,13 +807,15 @@ java_library(
        "intellij-2023.1": ["@jsr305_annotations//jar"],
        "intellij-2023.2": ["@jsr305_annotations//jar"],
        "intellij-2023.3": ["@jsr305_annotations//jar"],
+        "intellij-2024.1": ["@jsr305_annotations//jar"],


missing for clion, should we make this always export @jsr305_annotations//jar?

I'm not sure, but it seems that for clion we just don't need it. According to the comment above it's all about javax.annotation.Nullable class, which is included in CLion

Btw the last clion version here is 2022.3

third_party/javascript/BUILD

mai93 · 2024-01-23T17:45:13Z

intellij_platform_sdk/BUILD.clion241

+    ]),
+)
+
+java_library(name = "jsr305")  # not bundled


here it is marked as unmarked, so should we link it?

oh, you are right, so we reference an empty library here

so we could just add "clion-2024.1": [], to the select method and then remove java_library(name = "jsr305") # not bundled line - WDYT @mai93 ?

tpasternak changed the title ~~wip~~ wip: Support JetBarains IDEs 2024.1 Jan 18, 2024

tpasternak changed the title ~~wip: Support JetBarains IDEs 2024.1~~ wip: Support JetBrains IDEs 2024.1 Jan 18, 2024

tpasternak force-pushed the bump-241-1 branch 4 times, most recently from 293e185 to f2698ab Compare January 19, 2024 15:11

tpasternak force-pushed the bump-241-1 branch 3 times, most recently from 18b94f5 to 6c31065 Compare January 19, 2024 20:56

ahmedyarub reviewed Jan 19, 2024

View reviewed changes

common/util/BUILD Show resolved Hide resolved

tpasternak force-pushed the bump-241-1 branch from 282278d to f08b77d Compare January 19, 2024 21:26

agluszak mentioned this pull request Jan 20, 2024

It's trivial to update to 2024.1 EAP #5965

Closed

tpasternak force-pushed the bump-241-1 branch from cfba67b to 77b719c Compare January 22, 2024 11:21

tpasternak force-pushed the bump-241-1 branch from 77b719c to 4603287 Compare January 22, 2024 13:10

Bump JetBrains IDEs to 2024.1

f816ce1

tpasternak force-pushed the bump-241-1 branch from 4603287 to f816ce1 Compare January 22, 2024 13:24

tpasternak changed the title ~~wip: Support JetBrains IDEs 2024.1~~ Support JetBrains IDEs 2024.1 Jan 22, 2024

tpasternak marked this pull request as ready for review January 22, 2024 14:08

tpasternak requested review from mai93, jastice and agluszak as code owners January 22, 2024 14:08

github-actions bot added product: CLion CLion plugin product: IntelliJ IntelliJ plugin product: GoLand GoLand plugin awaiting-review Awaiting review from Bazel team on PRs labels Jan 22, 2024

github-actions bot assigned blorente Jan 22, 2024

github-actions bot assigned mai93 and tpasternak Jan 22, 2024

ujohnny reviewed Jan 22, 2024

View reviewed changes

ujohnny requested changes Jan 22, 2024

View reviewed changes

Tomasz Pasternak added 2 commits January 22, 2024 21:36

Apply formatting comments

bc6ee73

Include copyright headers in sdkcompat files

2366c1a

mai93 reviewed Jan 23, 2024

View reviewed changes

Apply review comments

b6491ad

ujohnny approved these changes Jan 23, 2024

View reviewed changes

mai93 reviewed Jan 23, 2024

View reviewed changes

Tomasz Pasternak added 2 commits January 23, 2024 22:14

Do not reference empty jsr library in CLion 2024.1 build

d9dd035

ab2cdf1

tpasternak linked an issue Jan 23, 2024 that may be closed by this pull request

It's trivial to update to 2024.1 EAP #5965

Closed

mai93 approved these changes Jan 23, 2024

View reviewed changes

tpasternak merged commit 6c40f3d into bazelbuild:master Jan 23, 2024
6 checks passed

github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Jan 23, 2024

tpasternak deleted the bump-241-1 branch January 23, 2024 23:09

mai93 mentioned this pull request Jan 30, 2024

Update CHANGELOG for 2024.01.30 #5990

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support JetBrains IDEs 2024.1 #5960

Support JetBrains IDEs 2024.1 #5960

tpasternak commented Jan 18, 2024 •

edited

Loading

tpasternak commented Jan 18, 2024

ahmedyarub commented Jan 19, 2024

tpasternak commented Jan 19, 2024 •

edited

Loading

tpasternak commented Jan 22, 2024 •

edited

Loading

ujohnny Jan 22, 2024

ujohnny left a comment

ujohnny Jan 22, 2024

ujohnny Jan 22, 2024

ujohnny Jan 22, 2024

ujohnny Jan 22, 2024

tpasternak commented Jan 22, 2024

tpasternak commented Jan 22, 2024

mai93 left a comment

mai93 Jan 23, 2024

tpasternak Jan 23, 2024

tpasternak Jan 23, 2024

mai93 Jan 23, 2024

tpasternak Jan 23, 2024

tpasternak Jan 23, 2024

mai93 Jan 23, 2024

tpasternak Jan 23, 2024

Support JetBrains IDEs 2024.1 #5960

Support JetBrains IDEs 2024.1 #5960

Conversation

tpasternak commented Jan 18, 2024 • edited Loading

Checklist

Discussion thread for this change

Description of this change

tpasternak commented Jan 18, 2024

ahmedyarub commented Jan 19, 2024

tpasternak commented Jan 19, 2024 • edited Loading

tpasternak commented Jan 22, 2024 • edited Loading

Choose a reason for hiding this comment

ujohnny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tpasternak commented Jan 22, 2024

tpasternak commented Jan 22, 2024

mai93 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tpasternak commented Jan 18, 2024 •

edited

Loading

tpasternak commented Jan 19, 2024 •

edited

Loading

tpasternak commented Jan 22, 2024 •

edited

Loading