Skip to content

Commit e8ef4c2

Browse files
sellophanesellophane
committed
Adding implementation for EssentialHighlightingRestarterDisablement
1 parent 1578ce8 commit e8ef4c2

File tree

4 files changed

+98
-54
lines changed

4 files changed

+98
-54
lines changed

‎base/BUILD‎

Lines changed: 55 additions & 47 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
],
@@ -68,11 +71,16 @@ intellij_plugin_library(
6871
"intellij-ue-2023.3": [],
6972
"intellij-2024.1": [],
7073
"intellij-ue-2024.1": [],
74+
"intellij-2024.2": [],
75+
"intellij-ue-2024.2": [],
76+
"intellij-2024.3": ["src/META-INF/blaze-base-243.xml"],
77+
"intellij-ue-2024.3": ["src/META-INF/blaze-base-243.xml"],
7178
"clion-2022.3": [],
7279
"clion-2023.1": [],
7380
"clion-2023.2": [],
7481
"clion-2023.3": [],
7582
"clion-2024.1": [],
83+
"clion-2024.3": ["src/META-INF/blaze-base-243.xml"],
7684
"default": ["src/META-INF/dependency-on-lvcs-impl.xml"],
7785
}),
7886
visibility = PLUGIN_PACKAGES_VISIBILITY,
@@ -93,9 +101,9 @@ java_library(
93101
deps = [
94102
":base",
95103
"//common/experiments",
96-
"//proto:proto_deps",
97-
"//intellij_platform_sdk:plugin_api",
98104
"//intellij_platform_sdk:jsr305",
105+
"//intellij_platform_sdk:plugin_api",
106+
"//proto:proto_deps",
99107
],
100108
)
101109

@@ -106,9 +114,9 @@ java_library(
106114
neverlink = 1,
107115
visibility = G3PLUGINS_VISIBILITY,
108116
deps = [
109-
"//sdkcompat",
110-
"//intellij_platform_sdk:plugin_api",
111117
"//intellij_platform_sdk:jsr305",
118+
"//intellij_platform_sdk:plugin_api",
119+
"//sdkcompat",
112120
],
113121
)
114122

@@ -119,8 +127,8 @@ java_library(
119127
srcs = glob(["src/com/google/idea/blaze/base/formatter/*.java"]),
120128
visibility = G3PLUGINS_VISIBILITY,
121129
deps = [
122-
"//intellij_platform_sdk:plugin_api",
123130
"//intellij_platform_sdk:jsr305", # unuseddeps: keep (b/146560321)
131+
"//intellij_platform_sdk:plugin_api",
124132
],
125133
)
126134

@@ -145,11 +153,11 @@ java_library(
145153
visibility = G3PLUGINS_VISIBILITY,
146154
deps = [
147155
":proto_wrapper",
156+
"//intellij_platform_sdk:jsr305",
157+
"//intellij_platform_sdk:plugin_api",
148158
"//proto:proto_deps",
149159
"//shared",
150160
"//third_party/java/auto_value",
151-
"//intellij_platform_sdk:plugin_api",
152-
"//intellij_platform_sdk:jsr305",
153161
"@error_prone_annotations//jar",
154162
],
155163
)
@@ -192,8 +200,8 @@ java_library(
192200
neverlink = 1,
193201
visibility = G3PLUGINS_VISIBILITY,
194202
deps = [
195-
"//intellij_platform_sdk:plugin_api",
196203
"//intellij_platform_sdk:jsr305",
204+
"//intellij_platform_sdk:plugin_api",
197205
],
198206
)
199207

@@ -207,8 +215,8 @@ java_library(
207215
visibility = G3PLUGINS_VISIBILITY,
208216
deps = [
209217
":vfs_api",
210-
"//intellij_platform_sdk:plugin_api",
211218
"//intellij_platform_sdk:jsr305",
219+
"//intellij_platform_sdk:plugin_api",
212220
],
213221
)
214222

@@ -228,9 +236,9 @@ java_library(
228236
visibility = G3PLUGINS_VISIBILITY,
229237
deps = [
230238
":proto_wrapper",
231-
"//proto:proto_deps",
232-
"//intellij_platform_sdk:plugin_api",
233239
"//intellij_platform_sdk:jsr305",
240+
"//intellij_platform_sdk:plugin_api",
241+
"//proto:proto_deps",
234242
],
235243
)
236244

@@ -243,8 +251,8 @@ java_library(
243251
neverlink = 1,
244252
visibility = G3PLUGINS_VISIBILITY,
245253
deps = [
246-
"//intellij_platform_sdk:plugin_api",
247254
"//intellij_platform_sdk:jsr305",
255+
"//intellij_platform_sdk:plugin_api",
248256
],
249257
)
250258

@@ -260,8 +268,8 @@ java_library(
260268
visibility = G3PLUGINS_VISIBILITY,
261269
deps = [
262270
":proto_wrapper",
263-
"//intellij_platform_sdk:plugin_api",
264271
"//intellij_platform_sdk:jsr305",
272+
"//intellij_platform_sdk:plugin_api",
265273
],
266274
)
267275

@@ -277,9 +285,9 @@ java_library(
277285
visibility = G3PLUGINS_VISIBILITY,
278286
deps = [
279287
"//common/experiments",
280-
"//third_party/java/auto_value",
281-
"//intellij_platform_sdk:plugin_api",
282288
"//intellij_platform_sdk:jsr305",
289+
"//intellij_platform_sdk:plugin_api",
290+
"//third_party/java/auto_value",
283291
],
284292
)
285293

@@ -295,8 +303,8 @@ java_library(
295303
deps = [
296304
":label_api",
297305
":proto_wrapper",
298-
"//intellij_platform_sdk:plugin_api",
299306
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Immutable
307+
"//intellij_platform_sdk:plugin_api",
300308
],
301309
)
302310

@@ -309,8 +317,8 @@ java_library(
309317
neverlink = 1,
310318
deps = [
311319
":logging_api",
312-
"//intellij_platform_sdk:plugin_api",
313320
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
321+
"//intellij_platform_sdk:plugin_api",
314322
],
315323
)
316324

@@ -330,10 +338,10 @@ java_library(
330338
visibility = G3PLUGINS_VISIBILITY,
331339
deps = [
332340
":base",
341+
"//intellij_platform_sdk:jsr305",
342+
"//intellij_platform_sdk:plugin_api",
333343
"//proto:proto_deps",
334344
"//shared",
335-
"//intellij_platform_sdk:plugin_api",
336-
"//intellij_platform_sdk:jsr305",
337345
"@error_prone_annotations//jar",
338346
],
339347
)
@@ -353,9 +361,9 @@ java_library(
353361
],
354362
deps = [
355363
":base",
356-
"//third_party/java/auto_value",
357-
"//intellij_platform_sdk:plugin_api",
358364
"//intellij_platform_sdk:jsr305",
365+
"//intellij_platform_sdk:plugin_api",
366+
"//third_party/java/auto_value",
359367
"@error_prone_annotations//jar",
360368
],
361369
)
@@ -380,8 +388,8 @@ java_library(
380388
],
381389
neverlink = 1,
382390
deps = [
383-
"//intellij_platform_sdk:plugin_api",
384391
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
392+
"//intellij_platform_sdk:plugin_api",
385393
],
386394
)
387395

@@ -401,10 +409,10 @@ java_library(
401409
visibility = G3PLUGINS_VISIBILITY,
402410
deps = [
403411
":base",
412+
"//intellij_platform_sdk:jsr305",
413+
"//intellij_platform_sdk:plugin_api",
404414
"//proto:proto_deps",
405415
"//shared:artifact",
406-
"//intellij_platform_sdk:plugin_api",
407-
"//intellij_platform_sdk:jsr305",
408416
"@error_prone_annotations//jar",
409417
],
410418
)
@@ -435,10 +443,10 @@ java_library(
435443
visibility = G3PLUGINS_VISIBILITY,
436444
deps = [
437445
":base",
446+
"//intellij_platform_sdk:jsr305",
447+
"//intellij_platform_sdk:plugin_api",
438448
"//proto:proto_deps",
439449
"//shared:artifact",
440-
"//intellij_platform_sdk:plugin_api",
441-
"//intellij_platform_sdk:jsr305",
442450
"@error_prone_annotations//jar",
443451
],
444452
)
@@ -456,10 +464,10 @@ java_library(
456464
visibility = G3PLUGINS_VISIBILITY,
457465
deps = [
458466
":base",
467+
"//intellij_platform_sdk:jsr305",
468+
"//intellij_platform_sdk:plugin_api",
459469
"//shared",
460470
"//shared:artifact",
461-
"//intellij_platform_sdk:plugin_api",
462-
"//intellij_platform_sdk:jsr305",
463471
"@error_prone_annotations//jar",
464472
],
465473
)
@@ -483,15 +491,15 @@ java_library(
483491
visibility = PLUGIN_PACKAGES_VISIBILITY,
484492
deps = [
485493
":base",
494+
"//intellij_platform_sdk:jsr305",
495+
"//intellij_platform_sdk:plugin_api_for_tests",
496+
"//intellij_platform_sdk:test_libs",
486497
"//shared:artifact",
487498
"//shared:exception",
488499
"//testing:lib",
489500
"//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
490501
"//third_party/java/auto_value",
491502
"//third_party/java/junit",
492-
"//intellij_platform_sdk:jsr305",
493-
"//intellij_platform_sdk:plugin_api_for_tests",
494-
"//intellij_platform_sdk:test_libs",
495503
"@com_google_guava_guava//jar",
496504
"@error_prone_annotations//jar",
497505
],
@@ -512,15 +520,15 @@ java_library(
512520
deps = [
513521
":base",
514522
":unit_test_utils",
523+
"//intellij_platform_sdk:jsr305",
524+
"//intellij_platform_sdk:plugin_api_for_tests",
525+
"//intellij_platform_sdk:test_libs",
515526
"//proto:proto_deps",
516527
"//sdkcompat",
517528
"//shared:artifact",
518529
"//shared:vcs",
519530
"//testing:lib",
520531
"//third_party/java/junit",
521-
"//intellij_platform_sdk:jsr305",
522-
"//intellij_platform_sdk:plugin_api_for_tests",
523-
"//intellij_platform_sdk:test_libs",
524532
"@bazel_tools//tools/java/runfiles",
525533
"@com_google_guava_guava//jar",
526534
],
@@ -538,6 +546,9 @@ intellij_unit_test_suite(
538546
"//common/experiments",
539547
"//common/experiments:unit_test_utils",
540548
"//common/util:process",
549+
"//intellij_platform_sdk:jsr305",
550+
"//intellij_platform_sdk:plugin_api_for_tests",
551+
"//intellij_platform_sdk:test_libs",
541552
"//proto:proto_deps",
542553
"//querysync",
543554
"//querysync/javatests/com/google/idea/blaze/qsync:TestUtils",
@@ -549,9 +560,6 @@ intellij_unit_test_suite(
549560
"//testing:lib",
550561
"//third_party/java/auto_value",
551562
"//third_party/java/junit",
552-
"//intellij_platform_sdk:jsr305",
553-
"//intellij_platform_sdk:plugin_api_for_tests",
554-
"//intellij_platform_sdk:test_libs",
555563
"@com_google_guava_guava//jar",
556564
],
557565
)
@@ -585,18 +593,18 @@ intellij_integration_test_suite(
585593
":base",
586594
":integration_test_utils",
587595
":unit_test_utils",
596+
"//intellij_platform_sdk:jsr305",
597+
"//intellij_platform_sdk:plugin_api",
598+
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
599+
"//intellij_platform_sdk:test_libs",
588600
"//proto:proto_deps",
589601
"//querysync",
590602
"//querysync/javatests/com/google/idea/blaze/qsync/artifacts:mock_artifact_cache",
591603
"//shared:exception",
592604
"//shared/javatests/com/google/idea/blaze/common:test_utils",
593-
"//intellij_platform_sdk:plugin_api",
594-
"//intellij_platform_sdk:jsr305",
595-
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
596-
"//intellij_platform_sdk:test_libs",
597605
"//third_party/java/junit",
598-
"@org_opentest4j_opentest4j//jar",
599606
"@com_google_guava_guava//jar",
600607
"@error_prone_annotations//jar",
608+
"@org_opentest4j_opentest4j//jar",
601609
],
602610
)

‎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.QuerySyncEssentialHighlightingRestarterDisablement"/>
19+
</extensions>
20+
</idea-plugin>

0 commit comments

Comments
 (0)