Skip to content

Commit acbf7fa

Browse files
sellophanesellophane
committed
Adding implementation for EssentialHighlightingRestarterDisablement
1 parent d3c1514 commit acbf7fa

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
"//aspect:aspect_lib",
@@ -38,6 +41,8 @@ kt_jvm_library(
3841
"//common/util:platform",
3942
"//common/util:process",
4043
"//common/util:transactions",
44+
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
45+
"//intellij_platform_sdk:plugin_api",
4146
"//proto:proto_deps",
4247
"//querysync",
4348
"//sdkcompat",
@@ -47,8 +52,6 @@ kt_jvm_library(
4752
"//shared:proto",
4853
"//shared:vcs",
4954
"//third_party/java/auto_value",
50-
"//intellij_platform_sdk:plugin_api",
51-
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
5255
"@error_prone_annotations//jar",
5356
"@gson//jar",
5457
],
@@ -59,7 +62,12 @@ intellij_plugin_library(
5962
plugin_xmls = [
6063
"src/META-INF/dependency-on-lvcs-impl.xml",
6164
"src/META-INF/blaze-base.xml",
62-
],
65+
] + select_for_plugin_api({
66+
"intellij-2024.3": ["src/META-INF/blaze-base-243.xml"],
67+
"intellij-ue-2024.3": ["src/META-INF/blaze-base-243.xml"],
68+
"clion-2024.3": ["src/META-INF/blaze-base-243.xml"],
69+
"default": [],
70+
}),
6371
visibility = PLUGIN_PACKAGES_VISIBILITY,
6472
deps = [
6573
":base",
@@ -78,9 +86,9 @@ java_library(
7886
deps = [
7987
":base",
8088
"//common/experiments",
81-
"//proto:proto_deps",
82-
"//intellij_platform_sdk:plugin_api",
8389
"//intellij_platform_sdk:jsr305",
90+
"//intellij_platform_sdk:plugin_api",
91+
"//proto:proto_deps",
8492
],
8593
)
8694

@@ -91,9 +99,9 @@ java_library(
9199
neverlink = 1,
92100
visibility = G3PLUGINS_VISIBILITY,
93101
deps = [
94-
"//sdkcompat",
95-
"//intellij_platform_sdk:plugin_api",
96102
"//intellij_platform_sdk:jsr305",
103+
"//intellij_platform_sdk:plugin_api",
104+
"//sdkcompat",
97105
],
98106
)
99107

@@ -104,8 +112,8 @@ java_library(
104112
srcs = glob(["src/com/google/idea/blaze/base/formatter/*.java"]),
105113
visibility = G3PLUGINS_VISIBILITY,
106114
deps = [
107-
"//intellij_platform_sdk:plugin_api",
108115
"//intellij_platform_sdk:jsr305", # unuseddeps: keep (b/146560321)
116+
"//intellij_platform_sdk:plugin_api",
109117
],
110118
)
111119

@@ -130,11 +138,11 @@ java_library(
130138
visibility = G3PLUGINS_VISIBILITY,
131139
deps = [
132140
":proto_wrapper",
141+
"//intellij_platform_sdk:jsr305",
142+
"//intellij_platform_sdk:plugin_api",
133143
"//proto:proto_deps",
134144
"//shared",
135145
"//third_party/java/auto_value",
136-
"//intellij_platform_sdk:plugin_api",
137-
"//intellij_platform_sdk:jsr305",
138146
"@error_prone_annotations//jar",
139147
],
140148
)
@@ -177,8 +185,8 @@ java_library(
177185
neverlink = 1,
178186
visibility = G3PLUGINS_VISIBILITY,
179187
deps = [
180-
"//intellij_platform_sdk:plugin_api",
181188
"//intellij_platform_sdk:jsr305",
189+
"//intellij_platform_sdk:plugin_api",
182190
],
183191
)
184192

@@ -192,8 +200,8 @@ java_library(
192200
visibility = G3PLUGINS_VISIBILITY,
193201
deps = [
194202
":vfs_api",
195-
"//intellij_platform_sdk:plugin_api",
196203
"//intellij_platform_sdk:jsr305",
204+
"//intellij_platform_sdk:plugin_api",
197205
],
198206
)
199207

@@ -213,9 +221,9 @@ java_library(
213221
visibility = G3PLUGINS_VISIBILITY,
214222
deps = [
215223
":proto_wrapper",
216-
"//proto:proto_deps",
217-
"//intellij_platform_sdk:plugin_api",
218224
"//intellij_platform_sdk:jsr305",
225+
"//intellij_platform_sdk:plugin_api",
226+
"//proto:proto_deps",
219227
],
220228
)
221229

@@ -228,8 +236,8 @@ java_library(
228236
neverlink = 1,
229237
visibility = G3PLUGINS_VISIBILITY,
230238
deps = [
231-
"//intellij_platform_sdk:plugin_api",
232239
"//intellij_platform_sdk:jsr305",
240+
"//intellij_platform_sdk:plugin_api",
233241
],
234242
)
235243

@@ -245,8 +253,8 @@ java_library(
245253
visibility = G3PLUGINS_VISIBILITY,
246254
deps = [
247255
":proto_wrapper",
248-
"//intellij_platform_sdk:plugin_api",
249256
"//intellij_platform_sdk:jsr305",
257+
"//intellij_platform_sdk:plugin_api",
250258
],
251259
)
252260

@@ -262,9 +270,9 @@ java_library(
262270
visibility = G3PLUGINS_VISIBILITY,
263271
deps = [
264272
"//common/experiments",
265-
"//third_party/java/auto_value",
266-
"//intellij_platform_sdk:plugin_api",
267273
"//intellij_platform_sdk:jsr305",
274+
"//intellij_platform_sdk:plugin_api",
275+
"//third_party/java/auto_value",
268276
],
269277
)
270278

@@ -280,8 +288,8 @@ java_library(
280288
deps = [
281289
":label_api",
282290
":proto_wrapper",
283-
"//intellij_platform_sdk:plugin_api",
284291
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Immutable
292+
"//intellij_platform_sdk:plugin_api",
285293
],
286294
)
287295

@@ -294,8 +302,8 @@ java_library(
294302
neverlink = 1,
295303
deps = [
296304
":logging_api",
297-
"//intellij_platform_sdk:plugin_api",
298305
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
306+
"//intellij_platform_sdk:plugin_api",
299307
],
300308
)
301309

@@ -315,10 +323,10 @@ java_library(
315323
visibility = G3PLUGINS_VISIBILITY,
316324
deps = [
317325
":base",
326+
"//intellij_platform_sdk:jsr305",
327+
"//intellij_platform_sdk:plugin_api",
318328
"//proto:proto_deps",
319329
"//shared",
320-
"//intellij_platform_sdk:plugin_api",
321-
"//intellij_platform_sdk:jsr305",
322330
"@error_prone_annotations//jar",
323331
],
324332
)
@@ -338,9 +346,9 @@ java_library(
338346
],
339347
deps = [
340348
":base",
341-
"//third_party/java/auto_value",
342-
"//intellij_platform_sdk:plugin_api",
343349
"//intellij_platform_sdk:jsr305",
350+
"//intellij_platform_sdk:plugin_api",
351+
"//third_party/java/auto_value",
344352
"@error_prone_annotations//jar",
345353
],
346354
)
@@ -365,8 +373,8 @@ java_library(
365373
],
366374
neverlink = 1,
367375
deps = [
368-
"//intellij_platform_sdk:plugin_api",
369376
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
377+
"//intellij_platform_sdk:plugin_api",
370378
],
371379
)
372380

@@ -386,10 +394,10 @@ java_library(
386394
visibility = G3PLUGINS_VISIBILITY,
387395
deps = [
388396
":base",
397+
"//intellij_platform_sdk:jsr305",
398+
"//intellij_platform_sdk:plugin_api",
389399
"//proto:proto_deps",
390400
"//shared:artifact",
391-
"//intellij_platform_sdk:plugin_api",
392-
"//intellij_platform_sdk:jsr305",
393401
"@error_prone_annotations//jar",
394402
],
395403
)
@@ -420,10 +428,10 @@ java_library(
420428
visibility = G3PLUGINS_VISIBILITY,
421429
deps = [
422430
":base",
431+
"//intellij_platform_sdk:jsr305",
432+
"//intellij_platform_sdk:plugin_api",
423433
"//proto:proto_deps",
424434
"//shared:artifact",
425-
"//intellij_platform_sdk:plugin_api",
426-
"//intellij_platform_sdk:jsr305",
427435
"@error_prone_annotations//jar",
428436
],
429437
)
@@ -441,10 +449,10 @@ java_library(
441449
visibility = G3PLUGINS_VISIBILITY,
442450
deps = [
443451
":base",
452+
"//intellij_platform_sdk:jsr305",
453+
"//intellij_platform_sdk:plugin_api",
444454
"//shared",
445455
"//shared:artifact",
446-
"//intellij_platform_sdk:plugin_api",
447-
"//intellij_platform_sdk:jsr305",
448456
"@error_prone_annotations//jar",
449457
],
450458
)
@@ -468,16 +476,16 @@ java_library(
468476
visibility = PLUGIN_PACKAGES_VISIBILITY,
469477
deps = [
470478
":base",
479+
"//intellij_platform_sdk:jsr305",
480+
"//intellij_platform_sdk:plugin_api_for_tests",
481+
"//intellij_platform_sdk:test_libs",
471482
"//shared:artifact",
472483
"//shared:exception",
473484
"//shared/java/com/google/idea/blaze/common",
474485
"//testing:lib",
475486
"//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
476487
"//third_party/java/auto_value",
477488
"//third_party/java/junit",
478-
"//intellij_platform_sdk:jsr305",
479-
"//intellij_platform_sdk:plugin_api_for_tests",
480-
"//intellij_platform_sdk:test_libs",
481489
"@com_google_guava_guava//jar",
482490
"@error_prone_annotations//jar",
483491
],
@@ -498,15 +506,15 @@ java_library(
498506
deps = [
499507
":base",
500508
":unit_test_utils",
509+
"//intellij_platform_sdk:jsr305",
510+
"//intellij_platform_sdk:plugin_api_for_tests",
511+
"//intellij_platform_sdk:test_libs",
501512
"//proto:proto_deps",
502513
"//sdkcompat",
503514
"//shared:artifact",
504515
"//shared:vcs",
505516
"//testing:lib",
506517
"//third_party/java/junit",
507-
"//intellij_platform_sdk:jsr305",
508-
"//intellij_platform_sdk:plugin_api_for_tests",
509-
"//intellij_platform_sdk:test_libs",
510518
"@bazel_tools//tools/java/runfiles",
511519
"@com_google_guava_guava//jar",
512520
],
@@ -524,6 +532,9 @@ intellij_unit_test_suite(
524532
"//common/experiments",
525533
"//common/experiments:unit_test_utils",
526534
"//common/util:process",
535+
"//intellij_platform_sdk:jsr305",
536+
"//intellij_platform_sdk:plugin_api_for_tests",
537+
"//intellij_platform_sdk:test_libs",
527538
"//proto:proto_deps",
528539
"//querysync",
529540
"//querysync/javatests/com/google/idea/blaze/qsync:TestUtils",
@@ -536,9 +547,6 @@ intellij_unit_test_suite(
536547
"//testing:lib",
537548
"//third_party/java/auto_value",
538549
"//third_party/java/junit",
539-
"//intellij_platform_sdk:jsr305",
540-
"//intellij_platform_sdk:plugin_api_for_tests",
541-
"//intellij_platform_sdk:test_libs",
542550
"@com_google_guava_guava//jar",
543551
],
544552
)
@@ -572,18 +580,18 @@ intellij_integration_test_suite(
572580
":base",
573581
":integration_test_utils",
574582
":unit_test_utils",
583+
"//intellij_platform_sdk:jsr305",
584+
"//intellij_platform_sdk:plugin_api",
585+
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
586+
"//intellij_platform_sdk:test_libs",
575587
"//proto:proto_deps",
576588
"//querysync",
577589
"//querysync/javatests/com/google/idea/blaze/qsync/artifacts:mock_artifact_cache",
578590
"//shared:exception",
579591
"//shared/javatests/com/google/idea/blaze/common:test_utils",
580-
"//intellij_platform_sdk:plugin_api",
581-
"//intellij_platform_sdk:jsr305",
582-
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
583-
"//intellij_platform_sdk:test_libs",
584592
"//third_party/java/junit",
585-
"@org_opentest4j_opentest4j//jar",
586593
"@com_google_guava_guava//jar",
587594
"@error_prone_annotations//jar",
595+
"@org_opentest4j_opentest4j//jar",
588596
],
589597
)

‎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)