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

Allow to boost .ijwb over BSP and .idea folder. #7201

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Allow to boost .ijwb over BSP and .idea folder. #7201

merged 3 commits into from
Dec 20, 2024

Conversation

dkashyn-sfdc
Copy link
Contributor

@dkashyn-sfdc dkashyn-sfdc commented Dec 19, 2024 •
edited
Loading

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: 7200

Description of this change

@github-actions 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 Dec 19, 2024
jastice
jastice reviewed Dec 20, 2024
View reviewed changes
base/src/META-INF/blaze-base.xml
@@ -412,6 +412,9 @@
<registryKey defaultValue="true"
description="By default Bazel plugin takes control and opens project if .ijwb folder is present. This property can be used to disable this behavior to allow to open .idea or other project models if they are exists."
key="bazel.project.auto.open.if.present"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't we just reuse this one and set it false by default?

Copy link
Contributor Author

@dkashyn-sfdc dkashyn-sfdc Dec 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

present is mutually exclusive of auto-import since there is no need to import then, so no

ujohnny
ujohnny approved these changes Dec 20, 2024
View reviewed changes
Copy link
Collaborator

@ujohnny ujohnny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for this particular implementation is the goal to avoid "select project" dialog in headless mode if BSP plugin is installed. The additional check for BSP plugin existence is just for backward compatibility.

@ujohnny ujohnny merged commit d407fab into bazelbuild:master Dec 20, 2024
5 checks passed
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Dec 20, 2024
ujohnny added a commit that referenced this pull request Dec 20, 2024
@ujohnny
Allow to boost .ijwb over BSP and .idea folder. (#7201)
a4dc054 
* Allow to boost `.ijwb` over BSP and .idea folder.

* Smarter default in case BSP not installed

* Google plugin has no priority by default and used if JetBrains Bazel is not installed. If BSP is there then registry key value is used.

fixes #7200

(cherry picked from commit d407fab)
mai93 pushed a commit that referenced this pull request Dec 20, 2024
@ujohnny
Allow to boost .ijwb over BSP and .idea folder. (#7201) (#7203)
6398581 
* Allow to boost `.ijwb` over BSP and .idea folder.

* Smarter default in case BSP not installed

* Google plugin has no priority by default and used if JetBrains Bazel is not installed. If BSP is there then registry key value is used.

fixes #7200

(cherry picked from commit d407fab)
@mai93 mai93 mentioned this pull request Jan 6, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jastice jastice jastice left review comments

@ujohnny ujohnny ujohnny approved these changes

@mai93 mai93 Awaiting requested review from mai93 mai93 is a code owner

@agluszak agluszak Awaiting requested review from agluszak agluszak is a code owner

Assignees

@ujohnny ujohnny

@sellophane sellophane

@iliakondratev iliakondratev

Labels
product: CLion CLion plugin product: GoLand GoLand plugin product: IntelliJ IntelliJ plugin
Projects
Bazel IntelliJ Plugin
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dkashyn-sfdc @ujohnny @jastice @sellophane @iliakondratev