Skip to content

Commit

Permalink
Adding implementation for EssentialHighlightingRestarterDisablement
Browse files Browse the repository at this point in the history
  • Loading branch information
@sellophane
sellophane committed Jan 17, 2025
1 parent 0d97ae9 commit 8a6b88f
Show file tree
Hide file tree
Showing 7 changed files with 123 additions and 62 deletions.
104 changes: 56 additions & 48 deletions base/BUILD
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
load(
"//:build-visibility.bzl",
"DEFAULT_TEST_VISIBILITY",
Expand All @@ -18,13 +19,15 @@ load(
"intellij_integration_test_suite",
"intellij_unit_test_suite",
)
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")

kt_jvm_library(
name = "base",
srcs = glob(["src/**/*.java", "src/**/*.kt"]),
resources = glob(["src/resources/**/*"]),
srcs = glob([
"src/**/*.java",
"src/**/*.kt",
]),
resource_strip_prefix = "base/src",
resources = glob(["src/resources/**/*"]),
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
"//common/actions",
Expand All @@ -35,6 +38,8 @@ kt_jvm_library(
"//common/util:platform",
"//common/util:process",
"//common/util:transactions",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//querysync",
"//sdkcompat",
Expand All @@ -44,8 +49,6 @@ kt_jvm_library(
"//shared:proto",
"//shared:vcs",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"@error_prone_annotations//jar",
"@gson//jar",
],
Expand All @@ -56,7 +59,12 @@ intellij_plugin_library(
plugin_xmls = [
"src/META-INF/dependency-on-lvcs-impl.xml",
"src/META-INF/blaze-base.xml",
],
] + select_for_plugin_api({
"intellij-2024.3": ["src/META-INF/blaze-base-243.xml"],
"intellij-ue-2024.3": ["src/META-INF/blaze-base-243.xml"],
"clion-2024.3": ["src/META-INF/blaze-base-243.xml"],
"default": [],
}),
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
":base",
Expand All @@ -75,9 +83,9 @@ java_library(
deps = [
":base",
"//common/experiments",
"//proto:proto_deps",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
],
)

Expand All @@ -88,9 +96,9 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//sdkcompat",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//sdkcompat",
],
)

Expand All @@ -101,8 +109,8 @@ java_library(
srcs = glob(["src/com/google/idea/blaze/base/formatter/*.java"]),
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep (b/146560321)
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -127,11 +135,11 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand Down Expand Up @@ -174,8 +182,8 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -189,8 +197,8 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":vfs_api",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -210,9 +218,9 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//proto:proto_deps",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
],
)

Expand All @@ -225,8 +233,8 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -242,8 +250,8 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -259,9 +267,9 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//common/experiments",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//third_party/java/auto_value",
],
)

Expand All @@ -277,8 +285,8 @@ java_library(
deps = [
":label_api",
":proto_wrapper",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Immutable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -291,8 +299,8 @@ java_library(
neverlink = 1,
deps = [
":logging_api",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -312,10 +320,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -335,9 +343,9 @@ java_library(
],
deps = [
":base",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//third_party/java/auto_value",
"@error_prone_annotations//jar",
],
)
Expand All @@ -362,8 +370,8 @@ java_library(
],
neverlink = 1,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -383,10 +391,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand Down Expand Up @@ -417,10 +425,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -438,10 +446,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//shared",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -465,16 +473,16 @@ java_library(
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//shared:artifact",
"//shared:exception",
"//shared/java/com/google/idea/blaze/common",
"//testing:lib",
"//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
"//third_party/java/auto_value",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@com_google_guava_guava//jar",
"@error_prone_annotations//jar",
],
Expand All @@ -495,15 +503,15 @@ java_library(
deps = [
":base",
":unit_test_utils",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//sdkcompat",
"//shared:artifact",
"//shared:vcs",
"//testing:lib",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@bazel_tools//tools/java/runfiles",
"@com_google_guava_guava//jar",
],
Expand All @@ -521,6 +529,9 @@ intellij_unit_test_suite(
"//common/experiments",
"//common/experiments:unit_test_utils",
"//common/util:process",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//querysync",
"//querysync/javatests/com/google/idea/blaze/qsync:TestUtils",
Expand All @@ -533,9 +544,6 @@ intellij_unit_test_suite(
"//testing:lib",
"//third_party/java/auto_value",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@com_google_guava_guava//jar",
],
)
Expand Down Expand Up @@ -569,18 +577,18 @@ intellij_integration_test_suite(
":base",
":integration_test_utils",
":unit_test_utils",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//querysync",
"//querysync/javatests/com/google/idea/blaze/qsync/artifacts:mock_artifact_cache",
"//shared:exception",
"//shared/javatests/com/google/idea/blaze/common:test_utils",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
"//intellij_platform_sdk:test_libs",
"//third_party/java/junit",
"@org_opentest4j_opentest4j//jar",
"@com_google_guava_guava//jar",
"@error_prone_annotations//jar",
"@org_opentest4j_opentest4j//jar",
],
)
20 changes: 20 additions & 0 deletions base/src/META-INF/blaze-base-243.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!--
~ Copyright 2024 The Bazel Authors. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<daemon.essentialHighlightingRestarterDisablement implementation="com.google.idea.blaze.base.qsync.analysis.QuerySyncEssentialHighlightingRestarterDisablement"/>
</extensions>
</idea-plugin>
15 changes: 15 additions & 0 deletions ...le/idea/blaze/base/qsync/analysis/QuerySyncEssentialHighlightingRestarterDisablement.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.google.idea.blaze.base.qsync.analysis;

import com.google.idea.blaze.base.settings.Blaze;
import com.google.idea.blaze.base.settings.BlazeImportSettings;
import com.google.idea.sdkcompat.querysync.EssentialHighlightingRestarterDisablementAdapter;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;

public class QuerySyncEssentialHighlightingRestarterDisablement implements EssentialHighlightingRestarterDisablementAdapter {

@Override
public boolean shouldBeDisabledForProject(@NotNull Project project) {
return Blaze.getProjectType(project) == BlazeImportSettings.ProjectType.QUERY_SYNC;
}
}
Loading

0 comments on commit 8a6b88f

Please sign in to comment.