Skip to content

Commit 8a6b88f

Browse files
sellophanesellophane
committed
Adding implementation for EssentialHighlightingRestarterDisablement
1 parent 0d97ae9 commit 8a6b88f

File tree

7 files changed

+123
-62
lines changed

7 files changed

+123
-62
lines changed

‎base/BUILD‎

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_java//java:defs.bzl", "java_library")
2+
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
23
load(
34
"//:build-visibility.bzl",
45
"DEFAULT_TEST_VISIBILITY",
@@ -18,13 +19,15 @@ load(
1819
"intellij_integration_test_suite",
1920
"intellij_unit_test_suite",
2021
)
21-
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
2222

2323
kt_jvm_library(
2424
name = "base",
25-
srcs = glob(["src/**/*.java", "src/**/*.kt"]),
26-
resources = glob(["src/resources/**/*"]),
25+
srcs = glob([
26+
"src/**/*.java",
27+
"src/**/*.kt",
28+
]),
2729
resource_strip_prefix = "base/src",
30+
resources = glob(["src/resources/**/*"]),
2831
visibility = PLUGIN_PACKAGES_VISIBILITY,
2932
deps = [
3033
"//common/actions",
@@ -35,6 +38,8 @@ kt_jvm_library(
3538
"//common/util:platform",
3639
"//common/util:process",
3740
"//common/util:transactions",
41+
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
42+
"//intellij_platform_sdk:plugin_api",
3843
"//proto:proto_deps",
3944
"//querysync",
4045
"//sdkcompat",
@@ -44,8 +49,6 @@ kt_jvm_library(
4449
"//shared:proto",
4550
"//shared:vcs",
4651
"//third_party/java/auto_value",
47-
"//intellij_platform_sdk:plugin_api",
48-
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
4952
"@error_prone_annotations//jar",
5053
"@gson//jar",
5154
],
@@ -56,7 +59,12 @@ intellij_plugin_library(
5659
plugin_xmls = [
5760
"src/META-INF/dependency-on-lvcs-impl.xml",
5861
"src/META-INF/blaze-base.xml",
59-
],
62+
] + select_for_plugin_api({
63+
"intellij-2024.3": ["src/META-INF/blaze-base-243.xml"],
64+
"intellij-ue-2024.3": ["src/META-INF/blaze-base-243.xml"],
65+
"clion-2024.3": ["src/META-INF/blaze-base-243.xml"],
66+
"default": [],
67+
}),
6068
visibility = PLUGIN_PACKAGES_VISIBILITY,
6169
deps = [
6270
":base",
@@ -75,9 +83,9 @@ java_library(
7583
deps = [
7684
":base",
7785
"//common/experiments",
78-
"//proto:proto_deps",
79-
"//intellij_platform_sdk:plugin_api",
8086
"//intellij_platform_sdk:jsr305",
87+
"//intellij_platform_sdk:plugin_api",
88+
"//proto:proto_deps",
8189
],
8290
)
8391

@@ -88,9 +96,9 @@ java_library(
8896
neverlink = 1,
8997
visibility = G3PLUGINS_VISIBILITY,
9098
deps = [
91-
"//sdkcompat",
92-
"//intellij_platform_sdk:plugin_api",
9399
"//intellij_platform_sdk:jsr305",
100+
"//intellij_platform_sdk:plugin_api",
101+
"//sdkcompat",
94102
],
95103
)
96104

@@ -101,8 +109,8 @@ java_library(
101109
srcs = glob(["src/com/google/idea/blaze/base/formatter/*.java"]),
102110
visibility = G3PLUGINS_VISIBILITY,
103111
deps = [
104-
"//intellij_platform_sdk:plugin_api",
105112
"//intellij_platform_sdk:jsr305", # unuseddeps: keep (b/146560321)
113+
"//intellij_platform_sdk:plugin_api",
106114
],
107115
)
108116

@@ -127,11 +135,11 @@ java_library(
127135
visibility = G3PLUGINS_VISIBILITY,
128136
deps = [
129137
":proto_wrapper",
138+
"//intellij_platform_sdk:jsr305",
139+
"//intellij_platform_sdk:plugin_api",
130140
"//proto:proto_deps",
131141
"//shared",
132142
"//third_party/java/auto_value",
133-
"//intellij_platform_sdk:plugin_api",
134-
"//intellij_platform_sdk:jsr305",
135143
"@error_prone_annotations//jar",
136144
],
137145
)
@@ -174,8 +182,8 @@ java_library(
174182
neverlink = 1,
175183
visibility = G3PLUGINS_VISIBILITY,
176184
deps = [
177-
"//intellij_platform_sdk:plugin_api",
178185
"//intellij_platform_sdk:jsr305",
186+
"//intellij_platform_sdk:plugin_api",
179187
],
180188
)
181189

@@ -189,8 +197,8 @@ java_library(
189197
visibility = G3PLUGINS_VISIBILITY,
190198
deps = [
191199
":vfs_api",
192-
"//intellij_platform_sdk:plugin_api",
193200
"//intellij_platform_sdk:jsr305",
201+
"//intellij_platform_sdk:plugin_api",
194202
],
195203
)
196204

@@ -210,9 +218,9 @@ java_library(
210218
visibility = G3PLUGINS_VISIBILITY,
211219
deps = [
212220
":proto_wrapper",
213-
"//proto:proto_deps",
214-
"//intellij_platform_sdk:plugin_api",
215221
"//intellij_platform_sdk:jsr305",
222+
"//intellij_platform_sdk:plugin_api",
223+
"//proto:proto_deps",
216224
],
217225
)
218226

@@ -225,8 +233,8 @@ java_library(
225233
neverlink = 1,
226234
visibility = G3PLUGINS_VISIBILITY,
227235
deps = [
228-
"//intellij_platform_sdk:plugin_api",
229236
"//intellij_platform_sdk:jsr305",
237+
"//intellij_platform_sdk:plugin_api",
230238
],
231239
)
232240

@@ -242,8 +250,8 @@ java_library(
242250
visibility = G3PLUGINS_VISIBILITY,
243251
deps = [
244252
":proto_wrapper",
245-
"//intellij_platform_sdk:plugin_api",
246253
"//intellij_platform_sdk:jsr305",
254+
"//intellij_platform_sdk:plugin_api",
247255
],
248256
)
249257

@@ -259,9 +267,9 @@ java_library(
259267
visibility = G3PLUGINS_VISIBILITY,
260268
deps = [
261269
"//common/experiments",
262-
"//third_party/java/auto_value",
263-
"//intellij_platform_sdk:plugin_api",
264270
"//intellij_platform_sdk:jsr305",
271+
"//intellij_platform_sdk:plugin_api",
272+
"//third_party/java/auto_value",
265273
],
266274
)
267275

@@ -277,8 +285,8 @@ java_library(
277285
deps = [
278286
":label_api",
279287
":proto_wrapper",
280-
"//intellij_platform_sdk:plugin_api",
281288
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Immutable
289+
"//intellij_platform_sdk:plugin_api",
282290
],
283291
)
284292

@@ -291,8 +299,8 @@ java_library(
291299
neverlink = 1,
292300
deps = [
293301
":logging_api",
294-
"//intellij_platform_sdk:plugin_api",
295302
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
303+
"//intellij_platform_sdk:plugin_api",
296304
],
297305
)
298306

@@ -312,10 +320,10 @@ java_library(
312320
visibility = G3PLUGINS_VISIBILITY,
313321
deps = [
314322
":base",
323+
"//intellij_platform_sdk:jsr305",
324+
"//intellij_platform_sdk:plugin_api",
315325
"//proto:proto_deps",
316326
"//shared",
317-
"//intellij_platform_sdk:plugin_api",
318-
"//intellij_platform_sdk:jsr305",
319327
"@error_prone_annotations//jar",
320328
],
321329
)
@@ -335,9 +343,9 @@ java_library(
335343
],
336344
deps = [
337345
":base",
338-
"//third_party/java/auto_value",
339-
"//intellij_platform_sdk:plugin_api",
340346
"//intellij_platform_sdk:jsr305",
347+
"//intellij_platform_sdk:plugin_api",
348+
"//third_party/java/auto_value",
341349
"@error_prone_annotations//jar",
342350
],
343351
)
@@ -362,8 +370,8 @@ java_library(
362370
],
363371
neverlink = 1,
364372
deps = [
365-
"//intellij_platform_sdk:plugin_api",
366373
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
374+
"//intellij_platform_sdk:plugin_api",
367375
],
368376
)
369377

@@ -383,10 +391,10 @@ java_library(
383391
visibility = G3PLUGINS_VISIBILITY,
384392
deps = [
385393
":base",
394+
"//intellij_platform_sdk:jsr305",
395+
"//intellij_platform_sdk:plugin_api",
386396
"//proto:proto_deps",
387397
"//shared:artifact",
388-
"//intellij_platform_sdk:plugin_api",
389-
"//intellij_platform_sdk:jsr305",
390398
"@error_prone_annotations//jar",
391399
],
392400
)
@@ -417,10 +425,10 @@ java_library(
417425
visibility = G3PLUGINS_VISIBILITY,
418426
deps = [
419427
":base",
428+
"//intellij_platform_sdk:jsr305",
429+
"//intellij_platform_sdk:plugin_api",
420430
"//proto:proto_deps",
421431
"//shared:artifact",
422-
"//intellij_platform_sdk:plugin_api",
423-
"//intellij_platform_sdk:jsr305",
424432
"@error_prone_annotations//jar",
425433
],
426434
)
@@ -438,10 +446,10 @@ java_library(
438446
visibility = G3PLUGINS_VISIBILITY,
439447
deps = [
440448
":base",
449+
"//intellij_platform_sdk:jsr305",
450+
"//intellij_platform_sdk:plugin_api",
441451
"//shared",
442452
"//shared:artifact",
443-
"//intellij_platform_sdk:plugin_api",
444-
"//intellij_platform_sdk:jsr305",
445453
"@error_prone_annotations//jar",
446454
],
447455
)
@@ -465,16 +473,16 @@ java_library(
465473
visibility = PLUGIN_PACKAGES_VISIBILITY,
466474
deps = [
467475
":base",
476+
"//intellij_platform_sdk:jsr305",
477+
"//intellij_platform_sdk:plugin_api_for_tests",
478+
"//intellij_platform_sdk:test_libs",
468479
"//shared:artifact",
469480
"//shared:exception",
470481
"//shared/java/com/google/idea/blaze/common",
471482
"//testing:lib",
472483
"//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
473484
"//third_party/java/auto_value",
474485
"//third_party/java/junit",
475-
"//intellij_platform_sdk:jsr305",
476-
"//intellij_platform_sdk:plugin_api_for_tests",
477-
"//intellij_platform_sdk:test_libs",
478486
"@com_google_guava_guava//jar",
479487
"@error_prone_annotations//jar",
480488
],
@@ -495,15 +503,15 @@ java_library(
495503
deps = [
496504
":base",
497505
":unit_test_utils",
506+
"//intellij_platform_sdk:jsr305",
507+
"//intellij_platform_sdk:plugin_api_for_tests",
508+
"//intellij_platform_sdk:test_libs",
498509
"//proto:proto_deps",
499510
"//sdkcompat",
500511
"//shared:artifact",
501512
"//shared:vcs",
502513
"//testing:lib",
503514
"//third_party/java/junit",
504-
"//intellij_platform_sdk:jsr305",
505-
"//intellij_platform_sdk:plugin_api_for_tests",
506-
"//intellij_platform_sdk:test_libs",
507515
"@bazel_tools//tools/java/runfiles",
508516
"@com_google_guava_guava//jar",
509517
],
@@ -521,6 +529,9 @@ intellij_unit_test_suite(
521529
"//common/experiments",
522530
"//common/experiments:unit_test_utils",
523531
"//common/util:process",
532+
"//intellij_platform_sdk:jsr305",
533+
"//intellij_platform_sdk:plugin_api_for_tests",
534+
"//intellij_platform_sdk:test_libs",
524535
"//proto:proto_deps",
525536
"//querysync",
526537
"//querysync/javatests/com/google/idea/blaze/qsync:TestUtils",
@@ -533,9 +544,6 @@ intellij_unit_test_suite(
533544
"//testing:lib",
534545
"//third_party/java/auto_value",
535546
"//third_party/java/junit",
536-
"//intellij_platform_sdk:jsr305",
537-
"//intellij_platform_sdk:plugin_api_for_tests",
538-
"//intellij_platform_sdk:test_libs",
539547
"@com_google_guava_guava//jar",
540548
],
541549
)
@@ -569,18 +577,18 @@ intellij_integration_test_suite(
569577
":base",
570578
":integration_test_utils",
571579
":unit_test_utils",
580+
"//intellij_platform_sdk:jsr305",
581+
"//intellij_platform_sdk:plugin_api",
582+
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
583+
"//intellij_platform_sdk:test_libs",
572584
"//proto:proto_deps",
573585
"//querysync",
574586
"//querysync/javatests/com/google/idea/blaze/qsync/artifacts:mock_artifact_cache",
575587
"//shared:exception",
576588
"//shared/javatests/com/google/idea/blaze/common:test_utils",
577-
"//intellij_platform_sdk:plugin_api",
578-
"//intellij_platform_sdk:jsr305",
579-
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
580-
"//intellij_platform_sdk:test_libs",
581589
"//third_party/java/junit",
582-
"@org_opentest4j_opentest4j//jar",
583590
"@com_google_guava_guava//jar",
584591
"@error_prone_annotations//jar",
592+
"@org_opentest4j_opentest4j//jar",
585593
],
586594
)

‎base/src/META-INF/blaze-base-243.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
~ Copyright 2024 The Bazel Authors. All rights reserved.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
<idea-plugin>
17+
<extensions defaultExtensionNs="com.intellij">
18+
<daemon.essentialHighlightingRestarterDisablement implementation="com.google.idea.blaze.base.qsync.analysis.QuerySyncEssentialHighlightingRestarterDisablement"/>
19+
</extensions>
20+
</idea-plugin>

‎base/src/com/google/idea/blaze/base/qsync/analysis/QuerySyncEssentialHighlightingRestarterDisablement.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.google.idea.blaze.base.qsync.analysis;
2+
3+
import com.google.idea.blaze.base.settings.Blaze;
4+
import com.google.idea.blaze.base.settings.BlazeImportSettings;
5+
import com.google.idea.sdkcompat.querysync.EssentialHighlightingRestarterDisablementAdapter;
6+
import com.intellij.openapi.project.Project;
7+
import org.jetbrains.annotations.NotNull;
8+
9+
public class QuerySyncEssentialHighlightingRestarterDisablement implements EssentialHighlightingRestarterDisablementAdapter {
10+
11+
@Override
12+
public boolean shouldBeDisabledForProject(@NotNull Project project) {
13+
return Blaze.getProjectType(project) == BlazeImportSettings.ProjectType.QUERY_SYNC;
14+
}
15+
}

0 commit comments

Comments
 (0)