bazel - fix JPMS, exports and internal

GitOrigin-RevId: 3dc80a9ee01e1900c0cebc24b2d08f04f93ddeff
This commit is contained in:
Vladimir Krivosheev
2024-09-25 19:05:37 +00:00
committed by intellij-monorepo-bot
parent 311cc92f74
commit a1210118c0
164 changed files with 520 additions and 265 deletions
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.aetherDependencyResolver",
module_name = "intellij.java.aetherDependencyResolver",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -20,14 +21,14 @@ kt_jvm_library(
"@libraries//:commons-lang3",
"@libraries//:plexus-utils",
"@libraries//:commons-codec",
"@community//platform/util:intellij.platform.util"
"@community//platform/util:intellij.platform.util",
],
exports = [
"@libraries//:httpmime",
"@libraries//:commons-logging",
"@libraries//:slf4j-api",
"@libraries//:slf4j-jdk14",
"@libraries//:maven-resolver-provider"
"@libraries//:maven-resolver-provider",
]
)
### auto-generated section `build` end
+2
View File
@@ -13,6 +13,7 @@ def create_kotlinc_options(name, jvm_target, x_optin = []):
kt_kotlinc_options(
name = name,
jvm_target = jvm_target,
x_enable_incremental_compilation = True,
x_optin = [
"com.intellij.openapi.util.IntellijInternalApi",
# it is unusual to have such opt-ins for the entire monorepo,
@@ -22,6 +23,7 @@ def create_kotlinc_options(name, jvm_target, x_optin = []):
#"org.jetbrains.kotlin.analysis.api.KaNonPublicApi",
] + x_optin,
x_jvm_default = "all",
warn = "off",
visibility=["//visibility:public"],
include_stdlibs = "none",
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.idea.community.build.dependencies",
module_name = "intellij.idea.community.build.dependencies",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:annotations",
"@community//platform/build-scripts/downloader:intellij.platform.buildScripts.downloader",
"@libraries//:kotlin-stdlib",
"@libraries//:kotlinx-coroutines-core-jvm"
"@libraries//:kotlinx-coroutines-core-jvm",
]
)
### auto-generated section `build` end
+45 -14
View File
@@ -1,6 +1,8 @@
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_java//java:defs.bzl", "java_library", "java_binary", "java_import")
load("@rules_kotlin//kotlin:kotlin.bzl", "kt_compiler_plugin")
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_import")
load("@bazel_skylib//rules:run_binary.bzl", "run_binary")
kt_compiler_plugin(
name = "serialization_plugin",
@@ -11,6 +13,47 @@ kt_compiler_plugin(
visibility = ["//visibility:public"]
)
java_binary(
name = "manifest_updater",
srcs = ["ManifestUpdater.java"],
main_class = "org.jetbrains.intellij.build.ManifestUpdater",
visibility = ["//visibility:public"],
)
run_binary(
name = "kotlinx-collections-immutable-jvm-source",
tool = ":manifest_updater",
srcs = ["@maven//:org_jetbrains_kotlinx_kotlinx_collections_immutable_jvm"],
outs = ["kotlinx.collections.immutable.jvm.jar"],
args = [
"$(location @maven//:org_jetbrains_kotlinx_kotlinx_collections_immutable_jvm)",
"$(location :kotlinx.collections.immutable.jvm.jar)",
],
)
run_binary(
name = "bifurcan-source",
tool = ":manifest_updater",
srcs = ["@maven//:io_lacuna_bifurcan"],
outs = ["bifurcan.jar"],
args = [
"$(location @maven//:io_lacuna_bifurcan)",
"$(location :bifurcan.jar)",
],
)
kt_jvm_import(
name = "kotlinx-collections-immutable-jvm",
jars = ["kotlinx.collections.immutable.jvm.jar"],
visibility = ["//visibility:public"],
)
kt_jvm_import(
name = "bifurcan",
jars = ["bifurcan.jar"],
visibility = ["//visibility:public"]
)
### auto-generated section `maven-libraries` start
java_library(
name = "HdrHistogram",
@@ -73,12 +116,6 @@ java_library(
visibility = ["//visibility:public"]
)
java_library(
name = "bifurcan",
exports = ["@maven//:io_lacuna_bifurcan"],
visibility = ["//visibility:public"]
)
java_library(
name = "blockmap",
exports = ["@maven//:org_jetbrains_intellij_blockmap"],
@@ -456,12 +493,6 @@ java_library(
visibility = ["//visibility:public"]
)
java_library(
name = "kotlinx-collections-immutable-jvm",
exports = ["@maven//:org_jetbrains_kotlinx_kotlinx_collections_immutable_jvm"],
visibility = ["//visibility:public"]
)
java_library(
name = "kotlinx-coroutines-core-jvm",
exports = ["@maven//:com_intellij_platform_kotlinx_coroutines_core_jvm"],
+9 -8
View File
@@ -3,6 +3,7 @@ module(name = "libraries")
bazel_dep(name = "rules_kotlin", version = "2.0.0")
bazel_dep(name = "rules_java", version = "7.11.1")
bazel_dep(name = "rules_jvm_external", version = "6.4")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
@@ -43,9 +44,9 @@ maven.install(
"com.googlecode.plist:dd-plist:1.28",
"com.h2database:h2-mvstore:2.3.232",
"com.ibm.icu:icu4j:73.2",
"com.intellij.platform:kotlinx-coroutines-core-jvm:1.8.0-intellij-10",
"com.intellij.platform:kotlinx-coroutines-debug:1.8.0-intellij-10",
"com.intellij.platform:kotlinx-coroutines-slf4j:1.8.0-intellij-10",
"com.intellij.platform:kotlinx-coroutines-core-jvm:1.8.0-intellij-11",
"com.intellij.platform:kotlinx-coroutines-debug:1.8.0-intellij-11",
"com.intellij.platform:kotlinx-coroutines-slf4j:1.8.0-intellij-11",
"com.jetbrains.fleet:rpc-compiler-plugin:2.0.20-0.1",
"com.jetbrains.format-ripper:format-ripper:1.1.1",
"com.jetbrains.fus.reporting:ap-validation:76",
@@ -98,10 +99,10 @@ maven.install(
"org.apache.commons:commons-compress:1.26.1",
"org.apache.commons:commons-lang3:3.17.0",
"org.apache.httpcomponents:httpmime:4.5.14",
"org.apache.maven.resolver:maven-resolver-connector-basic:1.4.2",
"org.apache.maven.resolver:maven-resolver-transport-file:1.4.2",
"org.apache.maven.resolver:maven-resolver-transport-http:1.4.2",
"org.apache.maven:maven-resolver-provider:3.8.8",
"org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22",
"org.apache.maven.resolver:maven-resolver-transport-file:1.9.22",
"org.apache.maven.resolver:maven-resolver-transport-http:1.9.22",
"org.apache.maven:maven-resolver-provider:3.9.9",
"org.bidib.com.github.markusbernhardt:proxy-vole:1.1.5",
"org.bouncycastle:bcpkix-jdk18on:1.78.1",
"org.codehaus.groovy:groovy-json:3.0.19",
@@ -152,7 +153,7 @@ maven.install(
"org.spdx:tools-java:1.1.8",
"org.swinglabs:swingx-core:1.6.2-2",
"org.yaml:snakeyaml:2.3",
"oro:oro:2.0.8"
"oro:oro:2.0.8",
]
### auto-generated section `artifacts` end
)
+72
View File
@@ -0,0 +1,72 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.jar.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
@SuppressWarnings("UseOfSystemOutOrSystemErr")
public final class ManifestUpdater {
public static void main(String[] args) throws IOException {
if (args.length < 2) {
System.out.println("Usage: <input-jar> <module name> <output-jar>, but got: " + Arrays.toString(args) + " arguments.");
return;
}
Path inputJar = Path.of(args[0]);
Path outputFile = Path.of(args[1]);
String moduleName = outputFile.getFileName().toString();
moduleName = moduleName.substring(0, moduleName.length() - 4);
Manifest manifest = new Manifest();
Attributes attributes = manifest.getMainAttributes();
attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
attributes.put(new Attributes.Name("Automatic-Module-Name"), moduleName);
try (ZipOutputStream outputStream = new ZipOutputStream(Files.newOutputStream(outputFile))) {
outputStream.setLevel(ZipOutputStream.STORED);
ZipEntry manifestEntry = new ZipEntry(JarFile.MANIFEST_NAME);
outputStream.putNextEntry(manifestEntry);
manifest.write(new BufferedOutputStream(outputStream));
outputStream.closeEntry();
// Copy entries from original JAR to new JAR
try (ZipFile jar = new ZipFile(inputJar.toFile())) {
Enumeration<? extends ZipEntry> entries = jar.entries();
byte[] buffer = new byte[8192];
while (entries.hasMoreElements()) {
ZipEntry jarEntry = entries.nextElement();
// ignore existing manifest
String entryName = jarEntry.getName();
if (entryName.equals("META-INF/MANIFEST.MF")) {
continue;
}
try {
outputStream.putNextEntry(new ZipEntry(entryName));
if (!jarEntry.isDirectory()) {
InputStream entryStream = jar.getInputStream(jarEntry);
int bytesRead;
while ((bytesRead = entryStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead);
}
}
outputStream.closeEntry();
}
catch (IOException e) {
throw new UncheckedIOException(e);
}
}
}
}
}
}
+8 -8
View File
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1808679147,
"__RESOLVED_ARTIFACTS_HASH": -1516944535,
"__INPUT_ARTIFACTS_HASH": 1982492278,
"__RESOLVED_ARTIFACTS_HASH": -778906614,
"conflict_resolution": {
"com.fasterxml.jackson.core:jackson-core:2.17.0": "com.fasterxml.jackson.core:jackson-core:2.17.2",
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
@@ -322,21 +322,21 @@
},
"com.intellij.platform:kotlinx-coroutines-core-jvm": {
"shasums": {
"jar": "45cb7601fd1fa844d8da6433b77a59fb68712e17dbac9bf30682677bd5b18b26"
"jar": "e7acf96587bc3148db64b5e0adc988fa743f9820a99eb118acb905935ead1bc6"
},
"version": "1.8.0-intellij-10"
"version": "1.8.0-intellij-11"
},
"com.intellij.platform:kotlinx-coroutines-debug": {
"shasums": {
"jar": "f9502d5d5f050df57c4f65d6d7bc2389bb3d78d6a40f140f62d5b9b6fba29c51"
"jar": "c142a8fd37fddb317df6ba14bb781a874b110e56d39ba1f8b2e8a58c9d957106"
},
"version": "1.8.0-intellij-10"
"version": "1.8.0-intellij-11"
},
"com.intellij.platform:kotlinx-coroutines-slf4j": {
"shasums": {
"jar": "61e387cb24151c2273afdf2970d8033f8109ea7fdf985233d2ac0178e59e5b36"
"jar": "840478a0983ef57e81d0e4089e73fa9337bd777da57474e12bd20b0000966d0d"
},
"version": "1.8.0-intellij-10"
"version": "1.8.0-intellij-11"
},
"com.jetbrains.fleet:rpc-compiler-plugin": {
"shasums": {
+4
View File
@@ -0,0 +1,4 @@
Update and re-pin libraries:
```shell
bazelisk run @maven//:pin
```
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.idea.community.build.tasks",
module_name = "intellij.idea.community.build.tasks",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -31,12 +32,12 @@ kt_jvm_library(
"@libraries//:hash4j",
"@libraries//:serviceMessages",
"@libraries//:opentelemetry-extension-kotlin",
"@libraries//:netty-buffer"
"@libraries//:netty-buffer",
],
runtime_deps = [
"@libraries//:slf4j-api",
"@libraries//:slf4j-jdk14",
"@libraries//:bcpkix-jdk18on"
"@libraries//:bcpkix-jdk18on",
]
)
### auto-generated section `build` end
+4 -3
View File
@@ -7,12 +7,13 @@ create_kotlinc_options(
jvm_target = "17",
x_optin = [
"kotlinx.coroutines.ExperimentalCoroutinesApi",
"kotlin.ExperimentalStdlibApi"
"kotlin.ExperimentalStdlibApi",
]
)
kt_jvm_library(
name = "fleet.kernel",
module_name = "fleet.kernel",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -28,7 +29,7 @@ kt_jvm_library(
"@community//fleet/rpc:fleet.rpc",
"@libraries//:kotlinx-coroutines-core-jvm",
"@community//fleet/preferences:fleet.preferences",
"@community//fleet/reporting/api:fleet.reporting.api"
"@community//fleet/reporting/api:fleet.reporting.api",
],
exports = [
"@community//fleet/rhizomedb:fleet.rhizomedb",
@@ -36,7 +37,7 @@ kt_jvm_library(
"@libraries//:kotlinx-serialization-json-jvm",
"@community//fleet/util/core:fleet.util.core",
"@community//fleet/rpc:fleet.rpc",
"@libraries//:kotlinx-coroutines-core-jvm"
"@libraries//:kotlinx-coroutines-core-jvm",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "fleet.preferences",
module_name = "fleet.preferences",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
kotlinc_opts = "//:k17",
deps = [
"@libraries//:kotlin-stdlib",
"@community//fleet/util/os:fleet.util.os"
"@community//fleet/util/os:fleet.util.os",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "fleet.reporting.api",
module_name = "fleet.reporting.api",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:kotlinx-coroutines-core-jvm",
"@libraries//:opentelemetry-sdk",
"@libraries//:opentelemetry-semconv"
"@libraries//:opentelemetry-semconv",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "fleet.rhizomedb",
module_name = "fleet.rhizomedb",
visibility = ["//visibility:public"],
srcs = glob(["src/main/kotlin/**/*.kt", "src/main/kotlin/**/*.java"]),
javac_opts = "//:j17",
@@ -19,7 +20,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:kotlin-reflect",
"@libraries//:intellij-deps-fastutil",
"@libraries//:kotlinx-collections-immutable-jvm"
"@libraries//:kotlinx-collections-immutable-jvm",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -7,12 +7,13 @@ create_kotlinc_options(
jvm_target = "17",
x_optin = [
"kotlinx.coroutines.ExperimentalCoroutinesApi",
"kotlin.ExperimentalStdlibApi"
"kotlin.ExperimentalStdlibApi",
]
)
kt_jvm_library(
name = "fleet.rpc",
module_name = "fleet.rpc",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -31,7 +32,7 @@ kt_jvm_library(
"@libraries//:rpc-compiler-plugin.provided",
"@community//fleet/util/core:fleet.util.core",
"@libraries//:opentelemetry-sdk",
"@libraries//:opentelemetry-semconv"
"@libraries//:opentelemetry-semconv",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "fleet.util.core",
module_name = "fleet.util.core",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -21,7 +22,7 @@ kt_jvm_library(
"@community//fleet/reporting/api:fleet.reporting.api",
"@community//fleet/preferences:fleet.preferences",
"@community//fleet/util/os:fleet.util.os",
"@libraries//:slf4j-api"
"@libraries//:slf4j-api",
],
exports = [
"@libraries//:bifurcan",
@@ -29,7 +30,7 @@ kt_jvm_library(
"@libraries//:kotlinx-serialization-json-jvm",
"@community//fleet/util/logging/api:fleet.util.logging.api",
"@libraries//:intellij-deps-fastutil",
"@libraries//:kotlinx-collections-immutable-jvm"
"@libraries//:kotlinx-collections-immutable-jvm",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "fleet.util.logging.api",
module_name = "fleet.util.logging.api",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -11,11 +12,11 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:slf4j-api",
"@libraries//:kotlinx-coroutines-slf4j",
"@libraries//:kotlinx-coroutines-core-jvm"
"@libraries//:kotlinx-coroutines-core-jvm",
],
exports = [
"@libraries//:slf4j-api",
"@libraries//:kotlinx-coroutines-slf4j"
"@libraries//:kotlinx-coroutines-slf4j",
]
)
### auto-generated section `build` end
+1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "fleet.util.os",
module_name = "fleet.util.os",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.guiForms.compiler",
module_name = "intellij.java.guiForms.compiler",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -13,7 +14,7 @@ kt_jvm_library(
"@libraries//:asm-all",
"@libraries//:forms",
"@community//java/compiler/instrumentation-util:intellij.java.compiler.instrumentationUtil",
"@libraries//:annotations"
"@libraries//:annotations",
],
exports = ["@community//java/compiler/instrumentation-util:intellij.java.compiler.instrumentationUtil"]
)
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.compiler.instrumentationUtil.java8",
module_name = "intellij.java.compiler.instrumentationUtil.java8",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.compiler.instrumentationUtil",
module_name = "intellij.java.compiler.instrumentationUtil",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.rt",
module_name = "intellij.java.rt",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
kotlinc_opts = "//:k8",
deps = [
"@libraries//:ant.provided",
"@libraries//:junit"
"@libraries//:junit",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jps.build.javac.rt",
module_name = "intellij.platform.jps.build.javac.rt",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "gen/**/*.kt", "gen/**/*.java"]),
javac_opts = "//:j8",
@@ -15,7 +16,7 @@ kt_jvm_library(
"@libraries//:jps-javac-extension",
"@libraries//:netty-buffer",
"@libraries//:protobuf-java",
"@libraries//:netty-codec-protobuf"
"@libraries//:netty-codec-protobuf",
]
)
### auto-generated section `build` end
+4 -3
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jps.build",
module_name = "intellij.platform.jps.build",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java", "gen/**/*.kt", "gen/**/*.java"]),
javac_opts = "//:j11",
@@ -38,16 +39,16 @@ kt_jvm_library(
"@libraries//:hash4j",
"@libraries//:netty-codec-protobuf",
"@libraries//:annotations",
"@libraries//:h2-mvstore"
"@libraries//:h2-mvstore",
],
exports = [
"@community//platform/util:intellij.platform.util",
"@community//jps/jps-builders-6:intellij.platform.jps.build.javac.rt",
"@community//platform/tracing:intellij.platform.tracing.rt"
"@community//platform/tracing:intellij.platform.tracing.rt",
],
runtime_deps = [
"@community//java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8",
"@community//java/java-runtime:intellij.java.rt"
"@community//java/java-runtime:intellij.java.rt",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jps.model",
module_name = "intellij.platform.jps.model",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
kotlinc_opts = "//:k11",
deps = [
"@community//platform/util:intellij.platform.util",
"@libraries//:annotations"
"@libraries//:annotations",
],
exports = ["@libraries//:annotations"]
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jps.model.impl",
module_name = "intellij.platform.jps.model.impl",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -10,7 +11,7 @@ kt_jvm_library(
deps = [
"@community//platform/util:intellij.platform.util",
"@community//jps/model-api:intellij.platform.jps.model",
"@libraries//:intellij-deps-fastutil"
"@libraries//:intellij-deps-fastutil",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jps.model.serialization",
module_name = "intellij.platform.jps.model.serialization",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -13,7 +14,7 @@ kt_jvm_library(
"@libraries//:intellij-deps-fastutil",
"@community//platform/util/jdom:intellij.platform.util.jdom",
"@libraries//:opentelemetry-sdk",
"@libraries//:opentelemetry-semconv"
"@libraries//:opentelemetry-semconv",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.tools.jps.build.standalone",
module_name = "intellij.tools.jps.build.standalone",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -13,11 +14,11 @@ kt_jvm_library(
"@community//jps/model-api:intellij.platform.jps.model",
"@libraries//:cli-parser",
"@community//jps/model-serialization:intellij.platform.jps.model.serialization",
"@libraries//:protobuf-java"
"@libraries//:protobuf-java",
],
exports = [
"@community//jps/jps-builders:intellij.platform.jps.build",
"@community//jps/model-serialization:intellij.platform.jps.model.serialization"
"@community//jps/model-serialization:intellij.platform.jps.model.serialization",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.analysis",
module_name = "intellij.platform.analysis",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -18,7 +19,7 @@ kt_jvm_library(
"@community//platform/core-ui:intellij.platform.core.ui",
"@community//platform/util-ex:intellij.platform.util.ex",
"@community//platform/platform-util-io:intellij.platform.ide.util.io",
"@libraries//:kotlin-stdlib"
"@libraries//:kotlin-stdlib",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.analysis.impl",
module_name = "intellij.platform.analysis.impl",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "gen/**/*.kt", "gen/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -34,12 +35,12 @@ kt_jvm_library(
"@libraries//:jackson-databind",
"@libraries//:jackson-core",
"@libraries//:jackson-module-kotlin",
"@community//platform/util-class-loader:intellij.platform.util.classLoader"
"@community//platform/util-class-loader:intellij.platform.util.classLoader",
],
exports = [
"@community//platform/analysis-api:intellij.platform.analysis",
"@community//platform/core-impl:intellij.platform.core.impl",
"@community//platform/projectModel-impl:intellij.platform.projectModel.impl"
"@community//platform/projectModel-impl:intellij.platform.projectModel.impl",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.backend.observation",
module_name = "intellij.platform.backend.observation",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
kotlinc_opts = "//:k17",
deps = [
"@libraries//:kotlin-stdlib",
"@community//platform/core-api:intellij.platform.core"
"@community//platform/core-api:intellij.platform.core",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "intellij.platform.backend.workspace",
module_name = "intellij.platform.backend.workspace",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -17,7 +18,7 @@ kt_jvm_library(
deps = [
"@libraries//:kotlin-stdlib",
"@community//platform/workspace/storage:intellij.platform.workspace.storage",
"@community//platform/core-api:intellij.platform.core"
"@community//platform/core-api:intellij.platform.core",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.boot",
module_name = "intellij.platform.boot",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -10,7 +11,7 @@ kt_jvm_library(
deps = [
"@community//platform/util-class-loader:intellij.platform.util.classLoader",
"@libraries//:annotations",
"@community//platform/util/zip:intellij.platform.util.zip"
"@community//platform/util/zip:intellij.platform.util.zip",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.bootstrap.coroutine",
module_name = "intellij.platform.bootstrap.coroutine",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:kotlinx-coroutines-core-jvm",
"@libraries//:kotlinx-coroutines-debug",
"@libraries//:annotations"
"@libraries//:annotations",
]
)
### auto-generated section `build` end
+4 -3
View File
@@ -8,12 +8,13 @@ create_kotlinc_options(
x_optin = [
"kotlin.RequiresOptIn",
"kotlinx.serialization.ExperimentalSerializationApi",
"kotlinx.coroutines.ExperimentalCoroutinesApi"
"kotlinx.coroutines.ExperimentalCoroutinesApi",
]
)
kt_jvm_library(
name = "intellij.platform.buildScripts",
module_name = "intellij.platform.buildScripts",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -83,7 +84,7 @@ kt_jvm_library(
"@libraries//:ktor-client-core-jvm",
"@libraries//:netty-all",
"@libraries//:netty-tcnative-boringssl-static",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
],
runtime_deps = [
"@libraries//:commons-cli",
@@ -95,7 +96,7 @@ kt_jvm_library(
"@libraries//:javax.activation",
"@libraries//:kotlin-reflect",
"@libraries//:jackson-module-kotlin",
"@libraries//:snakeyaml"
"@libraries//:snakeyaml",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.buildScripts.bazel",
module_name = "intellij.platform.buildScripts.bazel",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -12,7 +13,7 @@ kt_jvm_library(
"@community//jps/model-serialization:intellij.platform.jps.model.serialization",
"@community//jps/model-api:intellij.platform.jps.model",
"@community//platform/projectModel-api:intellij.platform.projectModel",
"@libraries//:kotlin-jps-plugin-classpath"
"@libraries//:kotlin-jps-plugin-classpath",
],
runtime_deps = ["@community//jps/model-impl:intellij.platform.jps.model.impl"]
)
@@ -56,6 +56,10 @@ private fun generateCommunityLibraryBuild(projectDir: Path, generator: BazelBuil
val bazelFileUpdater = BazelFileUpdater(projectDir.resolve("community/build/libraries/BUILD.bazel"))
buildFile(bazelFileUpdater, "maven-libraries") {
for (lib in generator.libs.sortedBy { it.targetName }) {
if (lib.targetName == "bifurcan" || lib.targetName == "kotlinx-collections-immutable-jvm") {
continue
}
target("java_library") {
option("name", lib.targetName)
option("exports", arrayOf(lib.bazelLabel))
@@ -147,6 +151,7 @@ private class BazelBuildFileGenerator(
target("kt_jvm_library") {
option("name", module.name)
option("module_name", module.name)
visibility(arrayOf("//visibility:public"))
option("srcs", glob(computeSources(module, contentRoot)))
@@ -171,7 +176,7 @@ private class BazelBuildFileGenerator(
val regex = Regex("""--add-exports\s+([^=]+)=\S+""")
val matches = regex.findAll(extraJavacOptions)
for (match in matches) {
exports.add(match.groupValues[1])
exports.add(match.groupValues[1] + "=ALL-UNNAMED")
}
if (exports.isEmpty()) {
@@ -182,8 +187,11 @@ private class BazelBuildFileGenerator(
val customJavacOptionsName = "custom-javac-options"
target("kt_javac_options") {
option("name", customJavacOptionsName)
option("release", jvmTarget)
// release is not compatible with --add-exports (*** java)
require(jvmTarget == "17")
option("x_ep_disable_all_checks", true)
option("x_enable_incremental_compilation", true)
option("warn", "off")
option("add_exports", exports)
}
return ":$customJavacOptionsName"
@@ -83,7 +83,7 @@ private fun formatValue(value: Any?): String {
return when (value) {
is List<*> -> {
if (value.size > 1) {
value.joinToString(separator = ",\n ", prefix = "[\n ", postfix = "\n ]") { formatValue(it) }
value.joinToString(separator = ",\n ", prefix = "[\n ", postfix = ",\n ]") { formatValue(it) }
}
else {
value.joinToString(separator = ", ", prefix = "[", postfix = "]") { formatValue(it) }
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "intellij.platform.buildScripts.downloader",
module_name = "intellij.platform.buildScripts.downloader",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -31,7 +32,7 @@ kt_jvm_library(
"@libraries//:ktor-client-okhttp-jvm",
"@libraries//:okhttp",
"@libraries//:ktor-client-core-jvm",
"@libraries//:hash4j"
"@libraries//:hash4j",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.builtInServer",
module_name = "intellij.platform.builtInServer",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -14,7 +15,7 @@ kt_jvm_library(
"@community//platform/util-ex:intellij.platform.util.ex",
"@community//platform/platform-util-io:intellij.platform.ide.util.io",
"@community//platform/ide-core:intellij.platform.ide.core",
"@community//platform/analysis-api:intellij.platform.analysis"
"@community//platform/analysis-api:intellij.platform.analysis",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.codeStyle",
module_name = "intellij.platform.codeStyle",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -14,7 +15,7 @@ kt_jvm_library(
"@community//platform/projectModel-api:intellij.platform.projectModel",
"@libraries//:kotlin-stdlib",
"@community//platform/util/jdom:intellij.platform.util.jdom",
"@community//platform/util/concurrency:intellij.platform.concurrency"
"@community//platform/util/concurrency:intellij.platform.concurrency",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.codeStyle.impl",
module_name = "intellij.platform.codeStyle.impl",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -15,7 +16,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:streamex",
"@libraries//:intellij-deps-fastutil",
"@community//platform/editor-ui-api:intellij.platform.editor"
"@community//platform/editor-ui-api:intellij.platform.editor",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.core",
module_name = "intellij.platform.core",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j8",
@@ -18,12 +19,12 @@ kt_jvm_library(
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@libraries//:kotlinx-collections-immutable-jvm",
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
"@libraries//:annotations"
"@libraries//:annotations",
],
exports = [
"@community//platform/util:intellij.platform.util",
"@community//platform/extensions:intellij.platform.extensions",
"@community//platform/util/progress:intellij.platform.util.progress"
"@community//platform/util/progress:intellij.platform.util.progress",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.core.impl",
module_name = "intellij.platform.core.impl",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j8",
@@ -23,11 +24,11 @@ kt_jvm_library(
"@community//platform/diagnostic/telemetry:intellij.platform.diagnostic.telemetry",
"@libraries//:opentelemetry-sdk",
"@libraries//:opentelemetry-semconv",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
],
exports = [
"@community//platform/core-api:intellij.platform.core",
"@libraries//:kotlin-stdlib"
"@libraries//:kotlin-stdlib",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.core.ui",
module_name = "intellij.platform.core.ui",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -12,7 +13,7 @@ kt_jvm_library(
"@community//platform/core-api:intellij.platform.core",
"@community//platform/util/ui:intellij.platform.util.ui",
"@libraries//:kotlin-stdlib",
"@libraries//:hash4j"
"@libraries//:hash4j",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.credentialStore",
module_name = "intellij.platform.credentialStore",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -12,7 +13,7 @@ kt_jvm_library(
"@community//platform/util/base:intellij.platform.util.base",
"@community//platform/util:intellij.platform.util",
"@libraries//:kotlin-stdlib",
"@community//platform/core-api:intellij.platform.core"
"@community//platform/core-api:intellij.platform.core",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.diagnostic",
module_name = "intellij.platform.diagnostic",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:kotlinx-coroutines-core-jvm",
"@libraries//:annotations",
"@libraries//:intellij-deps-fastutil"
"@libraries//:intellij-deps-fastutil",
]
)
### auto-generated section `build` end
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "intellij.platform.diagnostic.startUpPerformanceReporter",
module_name = "intellij.platform.diagnostic.startUpPerformanceReporter",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -31,7 +32,7 @@ kt_jvm_library(
"@libraries//:kotlinx-serialization-protobuf-jvm",
"@community//platform/diagnostic/telemetry-impl:intellij.platform.diagnostic.telemetry.impl",
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@community//platform/diagnostic/telemetry:intellij.platform.diagnostic.telemetry"
"@community//platform/diagnostic/telemetry:intellij.platform.diagnostic.telemetry",
]
)
### auto-generated section `build` end
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "intellij.platform.diagnostic.telemetry.impl",
module_name = "intellij.platform.diagnostic.telemetry.impl",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -32,7 +33,7 @@ kt_jvm_library(
"@libraries//:kotlinx-serialization-core-jvm",
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@community//platform/diagnostic/telemetry.exporters:intellij.platform.diagnostic.telemetry.exporters",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
],
exports = ["@community//platform/diagnostic/telemetry.exporters:intellij.platform.diagnostic.telemetry.exporters"]
)
@@ -10,6 +10,7 @@ create_kotlinc_options(
kt_jvm_library(
name = "intellij.platform.diagnostic.telemetry.exporters",
module_name = "intellij.platform.diagnostic.telemetry.exporters",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j11",
@@ -29,7 +30,7 @@ kt_jvm_library(
"@libraries//:jackson-databind",
"@libraries//:jackson-module-kotlin",
"@libraries//:kotlinx-serialization-core-jvm",
"@libraries//:kotlinx-serialization-protobuf-jvm"
"@libraries//:kotlinx-serialization-protobuf-jvm",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.diagnostic.telemetry",
module_name = "intellij.platform.diagnostic.telemetry",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -14,7 +15,7 @@ kt_jvm_library(
"@libraries//:opentelemetry-semconv.provided",
"@libraries//:opentelemetry-extension-kotlin.provided",
"@community//platform/util:intellij.platform.util",
"@community//platform/diagnostic:intellij.platform.diagnostic"
"@community//platform/diagnostic:intellij.platform.diagnostic",
],
exports = ["@community//platform/diagnostic:intellij.platform.diagnostic"]
)
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.diff",
module_name = "intellij.platform.diff",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -16,11 +17,11 @@ kt_jvm_library(
"@community//platform/editor-ui-api:intellij.platform.editor",
"@community//platform/analysis-api:intellij.platform.analysis",
"@community//platform/projectModel-api:intellij.platform.projectModel",
"@libraries//:kotlin-stdlib"
"@libraries//:kotlin-stdlib",
],
exports = [
"@community//platform/util/diff:intellij.platform.util.diff",
"@community//platform/ide-core:intellij.platform.ide.core"
"@community//platform/ide-core:intellij.platform.ide.core",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.editor",
module_name = "intellij.platform.editor",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -18,7 +19,7 @@ kt_jvm_library(
"@community//platform/util/concurrency:intellij.platform.concurrency",
"@community//platform/util/ui:intellij.platform.util.ui",
"@community//platform/core-ui:intellij.platform.core.ui",
"@community//platform/diagnostic:intellij.platform.diagnostic"
"@community//platform/diagnostic:intellij.platform.diagnostic",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.editor.ex",
module_name = "intellij.platform.editor.ex",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -18,12 +19,12 @@ kt_jvm_library(
"@libraries//:intellij-deps-fastutil",
"@community//platform/core-ui:intellij.platform.core.ui",
"@community//platform/util/jdom:intellij.platform.util.jdom",
"@community//platform/statistics:intellij.platform.statistics"
"@community//platform/statistics:intellij.platform.statistics",
],
exports = [
"@community//platform/editor-ui-api:intellij.platform.editor",
"@community//platform/util:intellij.platform.util",
"@community//platform/core-impl:intellij.platform.core.impl"
"@community//platform/core-impl:intellij.platform.core.impl",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.eel",
module_name = "intellij.platform.eel",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -10,7 +11,7 @@ kt_jvm_library(
deps = [
"@libraries//:kotlin-stdlib",
"@libraries//:annotations",
"@libraries//:kotlinx-coroutines-core-jvm"
"@libraries//:kotlinx-coroutines-core-jvm",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.eel.provider",
module_name = "intellij.platform.eel.provider",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -19,7 +20,7 @@ kt_jvm_library(
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
"@community//platform/core-api:intellij.platform.core",
"@libraries//:jna-platform",
"@libraries//:pty4j"
"@libraries//:pty4j",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.execution",
module_name = "intellij.platform.execution",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -20,7 +21,7 @@ kt_jvm_library(
"@community//platform/editor-ui-api:intellij.platform.editor",
"@community//platform/core-ui:intellij.platform.core.ui",
"@community//platform/analysis-api:intellij.platform.analysis",
"@libraries//:kotlinx-coroutines-core-jvm"
"@libraries//:kotlinx-coroutines-core-jvm",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.extensions",
module_name = "intellij.platform.extensions",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
@@ -16,7 +17,7 @@ kt_jvm_library(
"@libraries//:kotlinx-coroutines-core-jvm",
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@libraries//:kotlinx-collections-immutable-jvm",
"@libraries//:annotations"
"@libraries//:annotations",
],
exports = ["@libraries//:kotlinx-coroutines-core-jvm"]
)
+1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.java.guiForms.rt",
module_name = "intellij.java.guiForms.rt",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j8",
+1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.icons",
module_name = "intellij.platform.icons",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ide.core.impl",
module_name = "intellij.platform.ide.core.impl",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -26,7 +27,7 @@ kt_jvm_library(
"@community//platform/backend/workspace:intellij.platform.backend.workspace",
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@libraries//:hash4j",
"@community//platform/backend/observation:intellij.platform.backend.observation"
"@community//platform/backend/observation:intellij.platform.backend.observation",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ide.core",
module_name = "intellij.platform.ide.core",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -25,7 +26,7 @@ kt_jvm_library(
"@libraries//:kotlinx-coroutines-core-jvm",
"@community//platform/diagnostic:intellij.platform.diagnostic",
"@community//platform/settings:intellij.platform.settings",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
],
exports = ["@community//platform/core-api:intellij.platform.core"]
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ijent",
module_name = "intellij.platform.ijent",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@community//platform/core-api:intellij.platform.core",
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
"@community//platform/eel:intellij.platform.eel"
"@community//platform/eel:intellij.platform.eel",
],
exports = ["@community//platform/eel:intellij.platform.eel"]
)
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ijent.community.buildConstants",
module_name = "intellij.platform.ijent.community.buildConstants",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
kotlinc_opts = "//:k17",
deps = [
"@libraries//:kotlin-stdlib",
"@libraries//:annotations"
"@libraries//:annotations",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ijent.community.impl",
module_name = "intellij.platform.ijent.community.impl",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -15,7 +16,7 @@ kt_jvm_library(
"@community//platform/core-nio-fs:intellij.platform.core.nio.fs",
"@community//platform/diagnostic/telemetry:intellij.platform.diagnostic.telemetry",
"@community//platform/ijent:intellij.platform.ijent",
"@community//platform/eel:intellij.platform.eel"
"@community//platform/eel:intellij.platform.eel",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.indexing",
module_name = "intellij.platform.indexing",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -13,7 +14,7 @@ kt_jvm_library(
"@community//platform/projectModel-api:intellij.platform.projectModel",
"@community//platform/util/jdom:intellij.platform.util.jdom",
"@community//platform/util/concurrency:intellij.platform.concurrency",
"@libraries//:kotlin-stdlib"
"@libraries//:kotlin-stdlib",
],
exports = ["@community//platform/core-api:intellij.platform.core"]
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.indexing.impl",
module_name = "intellij.platform.indexing.impl",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -27,7 +28,7 @@ kt_jvm_library(
"@libraries//:caffeine",
"@community//platform/util/nanoxml:intellij.platform.util.nanoxml",
"@libraries//:aalto-xml",
"@community//platform/util/xmlDom:intellij.platform.util.xmlDom"
"@community//platform/util/xmlDom:intellij.platform.util.xmlDom",
],
exports = ["@community//platform/indexing-api:intellij.platform.indexing"]
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.instanceContainer",
module_name = "intellij.platform.instanceContainer",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -12,7 +13,7 @@ kt_jvm_library(
"@libraries//:kotlinx-coroutines-core-jvm",
"@libraries//:kotlinx-collections-immutable-jvm",
"@community//platform/util:intellij.platform.util",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.jbr",
module_name = "intellij.platform.jbr",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -10,7 +11,7 @@ kt_jvm_library(
deps = [
"@libraries//:annotations",
"@community//platform/util:intellij.platform.util",
"@community//platform/core-ui:intellij.platform.core.ui"
"@community//platform/core-ui:intellij.platform.core.ui",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.rpc",
module_name = "intellij.platform.rpc",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -12,11 +13,11 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@community//fleet/util/logging/api:fleet.util.logging.api",
"@community//fleet/rpc:fleet.rpc",
"@community//platform/core-api:intellij.platform.core"
"@community//platform/core-api:intellij.platform.core",
],
exports = [
"@libraries//:kotlin-stdlib",
"@community//fleet/rpc:fleet.rpc"
"@community//fleet/rpc:fleet.rpc",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.kernel",
module_name = "intellij.platform.kernel",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -19,14 +20,14 @@ kt_jvm_library(
"@libraries//:intellij-deps-fastutil",
"@community//platform/core-api:intellij.platform.core",
"@community//platform/ide-core:intellij.platform.ide.core",
"@community//platform/util/coroutines:intellij.platform.util.coroutines"
"@community//platform/util/coroutines:intellij.platform.util.coroutines",
],
exports = [
"@libraries//:kotlin-stdlib",
"@community//platform/kernel/rpc:intellij.platform.rpc",
"@community//fleet/kernel:fleet.kernel",
"@libraries//:kotlinx-coroutines-core-jvm",
"@libraries//:kotlinx-serialization-core-jvm"
"@libraries//:kotlinx-serialization-core-jvm",
]
)
### auto-generated section `build` end
+3 -2
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.lang",
module_name = "intellij.platform.lang",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -25,7 +26,7 @@ kt_jvm_library(
"@community//platform/platform-util-io:intellij.platform.ide.util.io",
"@community//platform/execution:intellij.platform.execution",
"@community//platform/refactoring:intellij.platform.refactoring",
"@community//platform/ml-api:intellij.platform.ml"
"@community//platform/ml-api:intellij.platform.ml",
],
exports = [
"@community//platform/platform-api:intellij.platform.ide",
@@ -36,7 +37,7 @@ kt_jvm_library(
"@community//platform/analysis-api:intellij.platform.analysis",
"@community//platform/code-style-api:intellij.platform.codeStyle",
"@community//platform/execution:intellij.platform.execution",
"@community//platform/refactoring:intellij.platform.refactoring"
"@community//platform/refactoring:intellij.platform.refactoring",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.lang.core",
module_name = "intellij.platform.lang.core",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = "//:j17",
@@ -22,7 +23,7 @@ kt_jvm_library(
"@community//platform/projectModel-api:intellij.platform.projectModel",
"@community//platform/editor-ui-api:intellij.platform.editor",
"@community//platform/analysis-api:intellij.platform.analysis",
"@community//platform/usageView:intellij.platform.usageView"
"@community//platform/usageView:intellij.platform.usageView",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,13 +3,14 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.lvcs",
module_name = "intellij.platform.lvcs",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
kotlinc_opts = "//:k17",
deps = [
"@community//platform/core-api:intellij.platform.core",
"@libraries//:kotlin-stdlib"
"@libraries//:kotlin-stdlib",
]
)
### auto-generated section `build` end
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.ml",
module_name = "intellij.platform.ml",
visibility = ["//visibility:public"],
srcs = glob(["resources/**/*.kt", "resources/**/*.java", "src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -11,7 +12,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@libraries//:kotlinx-coroutines-core-jvm",
"@community//platform/core-api:intellij.platform.core",
"@libraries//:extension"
"@libraries//:extension",
],
exports = ["@libraries//:extension"]
)
+2 -1
View File
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.objectSerializer",
module_name = "intellij.platform.objectSerializer",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java"]),
javac_opts = "//:j17",
@@ -23,7 +24,7 @@ kt_jvm_library(
"@libraries//:kotlinx-serialization-core-jvm",
"@libraries//:kotlinx-serialization-json-jvm",
"@community//platform/util/xmlDom:intellij.platform.util.xmlDom",
"@community//platform/settings:intellij.platform.settings"
"@community//platform/settings:intellij.platform.settings",
]
)
### auto-generated section `build` end
@@ -3,6 +3,7 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
kt_jvm_library(
name = "intellij.platform.objectSerializer.annotations",
module_name = "intellij.platform.objectSerializer.annotations",
visibility = ["//visibility:public"],
srcs = glob(["**/*.kt", "**/*.java"]),
javac_opts = "//:j8",
+7 -5
View File
@@ -4,16 +4,18 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_javac_options")
kt_javac_options(
name = "custom-javac-options",
release = "17",
x_ep_disable_all_checks = True,
x_enable_incremental_compilation = True,
warn = "off",
add_exports = [
"java.desktop/sun.swing",
"java.desktop/sun.awt"
"java.desktop/sun.swing=ALL-UNNAMED",
"java.desktop/sun.awt=ALL-UNNAMED",
]
)
kt_jvm_library(
name = "intellij.platform.ide",
module_name = "intellij.platform.ide",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = ":custom-javac-options",
@@ -47,7 +49,7 @@ kt_jvm_library(
"@libraries//:jackson-core",
"@libraries//:caffeine",
"@community//platform/progress/shared:intellij.platform.ide.progress",
"@community//platform/util/diff:intellij.platform.util.diff"
"@community//platform/util/diff:intellij.platform.util.diff",
],
exports = [
"@community//platform/util:intellij.platform.util",
@@ -60,7 +62,7 @@ kt_jvm_library(
"@community//platform/credential-store:intellij.platform.credentialStore",
"@community//platform/remote-core:intellij.platform.remote.core",
"@community//platform/ide-core:intellij.platform.ide.core",
"@community//platform/progress/shared:intellij.platform.ide.progress"
"@community//platform/progress/shared:intellij.platform.ide.progress",
]
)
### auto-generated section `build` end
+15 -12
View File
@@ -4,22 +4,24 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_javac_options")
kt_javac_options(
name = "custom-javac-options",
release = "17",
x_ep_disable_all_checks = True,
x_enable_incremental_compilation = True,
warn = "off",
add_exports = [
"java.desktop/sun.awt",
"java.desktop/sun.font",
"java.desktop/java.awt.peer",
"jdk.attach/sun.tools.attach",
"java.desktop/sun.awt.image",
"java.desktop/sun.awt.datatransfer",
"java.desktop/sun.swing",
"java.base/sun.nio.fs"
"java.desktop/sun.awt=ALL-UNNAMED",
"java.desktop/sun.font=ALL-UNNAMED",
"java.desktop/java.awt.peer=ALL-UNNAMED",
"jdk.attach/sun.tools.attach=ALL-UNNAMED",
"java.desktop/sun.awt.image=ALL-UNNAMED",
"java.desktop/sun.awt.datatransfer=ALL-UNNAMED",
"java.desktop/sun.swing=ALL-UNNAMED",
"java.base/sun.nio.fs=ALL-UNNAMED",
]
)
kt_jvm_library(
name = "intellij.platform.ide.impl",
module_name = "intellij.platform.ide.impl",
visibility = ["//visibility:public"],
srcs = glob(["src/**/*.kt", "src/**/*.java", "resources/**/*.kt", "resources/**/*.java"]),
javac_opts = ":custom-javac-options",
@@ -123,7 +125,7 @@ kt_jvm_library(
"@community//platform/jbr:intellij.platform.jbr",
"@community//platform/ui.jcef:intellij.platform.ui.jcef",
"@community//fleet/util/core:fleet.util.core",
"@community//platform/eelProvider:intellij.platform.eel.provider"
"@community//platform/eelProvider:intellij.platform.eel.provider",
],
exports = [
"@community//platform/platform-api:intellij.platform.ide",
@@ -133,7 +135,7 @@ kt_jvm_library(
"@libraries//:kotlin-stdlib",
"@community//platform/util/ui:intellij.platform.util.ui",
"@community//platform/remote-core:intellij.platform.remote.core",
"@community//platform/ide-core-impl:intellij.platform.ide.core.impl"
"@community//platform/ide-core-impl:intellij.platform.ide.core.impl",
],
runtime_deps = [
"@libraries//:slf4j-api",
@@ -146,7 +148,8 @@ kt_jvm_library(
"@libraries//:protobuf-java",
"@libraries//:jgoodies-common",
"@libraries//:forms",
"@community//platform/settings-local:intellij.platform.settings.local"
"@community//platform/settings-local:intellij.platform.settings.local",
"@libraries//:bcpkix-jdk18on",
]
)
### auto-generated section `build` end
@@ -62,8 +62,6 @@ import java.util.concurrent.atomic.LongAdder
import javax.swing.Icon
import javax.swing.JFrame
import kotlin.collections.Map.Entry
import kotlin.collections.component1
import kotlin.collections.component2
import kotlin.io.path.invariantSeparatorsPathString
import kotlin.time.Duration.Companion.milliseconds
@@ -85,6 +83,7 @@ open class RecentProjectsManagerBase(coroutineScope: CoroutineScope) :
@JvmStatic
fun getInstanceEx(): RecentProjectsManagerBase = RecentProjectsManager.getInstance() as RecentProjectsManagerBase
@JvmName("isFileSystemPath")
internal fun isFileSystemPath(path: String): Boolean = path.indexOf('/') != -1 || path.indexOf('\\') != -1
/**
@@ -41,7 +41,7 @@ public abstract class SplitAction extends AnAction implements DumbAware, ActionR
VirtualFile file = window.getContextFile();
if (closeSource && file != null) {
file.putUserData(EditorWindow.Companion.getDRAG_START_PINNED_KEY$intellij_platform_ide_impl(), window.isFilePinned(file));
file.putUserData(EditorWindow.DRAG_START_PINNED_KEY, window.isFilePinned(file));
window.closeFile(file, false, false);
}
@@ -71,7 +71,7 @@ public abstract class SplitterAction extends DumbAwareAction implements ActionRe
static final class Unsplit extends SplitterAction {
@Override
void actionPerformed(@NotNull EditorWindow window) {
window.unsplit$intellij_platform_ide_impl(true);
window.unsplit(true);
}
}
@@ -36,7 +36,7 @@ final class PlatformDataValidators extends DataValidators {
registry.register(PlatformCoreDataKeys.SELECTED_ITEMS, arrayValidator(objectValidator));
registry.register(PlatformDataKeys.LAST_ACTIVE_TOOL_WINDOWS, arrayValidator(objectValidator));
Validator<EditorWindow> editorWindowValidator = (data, dataId, source) -> data.isValid$intellij_platform_ide_impl();
Validator<EditorWindow> editorWindowValidator = (data, dataId, source) -> data.isValid();
registry.register(EditorWindow.DATA_KEY, editorWindowValidator);
}
}
@@ -1400,7 +1400,7 @@ public class MyPluginModel extends InstalledPluginsTableModel implements PluginE
Icon icon = myIcons.get(key);
if (icon == null) {
icon = PluginLogo.getIcon(descriptor, big, error, disabled);
if (icon != PluginLogo.INSTANCE.getDefault$intellij_platform_ide_impl().getIcon(big, error, disabled)) {
if (icon != PluginLogo.INSTANCE.getDefault().getIcon(big, error, disabled)) {
myIcons.put(key, icon);
}
}
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("ReplacePutWithAssignment", "ReplaceGetOrSet")
package com.intellij.ide.plugins.newui
@@ -96,6 +96,7 @@ object PluginLogo {
service<PluginLogoLoader>().endBatchMode()
}
@JvmName("getDefault")
internal fun getDefault(): PluginLogoIconProvider {
if (Default == null) {
Default = if (AllIcons.Plugins.PluginLogo is CachedImageIcon) {
@@ -137,6 +137,7 @@ class UITheme internal constructor(
_providerClassLoader = value
}
@JvmName("describe")
internal fun describe(): UIThemeExportableBean {
val iconMap = bean.icons?.let {
val iconMap = LinkedHashMap<String, String>(it.size)
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.ide.ui.laf;
import com.intellij.ide.ui.UITheme;
@@ -176,7 +176,7 @@ public class UIThemeLookAndFeelInfoImpl extends UIManager.LookAndFeelInfo implem
@Override
public @NotNull UIThemeExportableBean describe() {
return theme.describe$intellij_platform_ide_impl();
return theme.describe();
}
private static <T extends Enum<T>> String parseEnumValue(Object value, T defaultValue) {
@@ -294,7 +294,7 @@ public final class ComponentPropertiesCollector {
ToolWindowImpl window;
if (component instanceof StripeButton stripeButton) {
// old UI
window = stripeButton.getToolWindow$intellij_platform_ide_impl();
window = stripeButton.toolWindow;
}
else if (component instanceof SquareStripeButton stripeButton) {
// new UI
@@ -39,8 +39,6 @@ import com.intellij.platform.diagnostic.telemetry.impl.span
import com.intellij.platform.fileEditor.FileEntry
import com.intellij.platform.fileEditor.FileEntryTab
import com.intellij.ui.*
import com.intellij.ui.SideBorder.BOTTOM
import com.intellij.ui.SideBorder.TOP
import com.intellij.ui.components.panels.NonOpaquePanel
import com.intellij.ui.components.panels.Wrapper
import com.intellij.ui.tabs.JBTabs
@@ -487,7 +485,7 @@ open class EditorComposite internal constructor(
get() {
val editorWithProvider = selectedEditorWithProvider.value ?: return null
val component = focusWatcher.focusedComponent
if (component !is JComponent || !component.isShowing() || !component.isEnabled() || !component.isFocusable()) {
if (component !is JComponent || !component.isShowing() || !component.isEnabled || !component.isFocusable) {
return editorWithProvider.fileEditor.preferredFocusedComponent
}
else {
@@ -724,6 +722,7 @@ open class EditorComposite internal constructor(
dispatcher.multicaster.editorRemoved(editorTypeId)
}
@JvmName("currentStateAsFileEntry")
internal fun currentStateAsFileEntry(): FileEntry? {
val fileEditorWithProviderList = fileEditorWithProviders.value
if (fileEditorWithProviderList.isEmpty()) {
@@ -83,6 +83,7 @@ class EditorWindow internal constructor(
internal val DRAG_START_LOCATION_HASH_KEY: Key<Int> = KeyWithDefaultValue.create("drag start editor location hash", 0)
// Metadata to support editor tab drag&drop process: initial 'pinned' state
@JvmField
internal val DRAG_START_PINNED_KEY: Key<Boolean> = Key.create("drag start editor pinned state")
@JvmStatic
@@ -139,6 +140,7 @@ class EditorWindow internal constructor(
LOG.assertTrue(isValid, "EditorWindow not in collection")
}
@get:JvmName("isValid")
internal val isValid: Boolean
get() = owner.containsWindow(this)
@@ -588,6 +590,7 @@ class EditorWindow internal constructor(
@Deprecated("Use getSiblings()", ReplaceWith("getSiblings()"))
fun findSiblings(): Array<EditorWindow> = siblings().toList().toTypedArray()
@JvmName("getSiblings")
internal fun getSiblings(): List<EditorWindow> = siblings().toList()
@RequiresEdt
@@ -878,6 +881,7 @@ class EditorWindow internal constructor(
}
}
@JvmName("unsplit")
internal fun unsplit(setCurrent: Boolean) {
checkConsistency()
val splitter = component.parent as? Splitter ?: return
@@ -1093,6 +1093,7 @@ open class FileEditorManagerImpl(
* This method can be invoked from background thread. Of course, UI for returned editors should be accessed from EDT in any case.
*/
@Suppress("DuplicatedCode")
@JvmName("openFileImpl")
internal fun openFileImpl(
window: EditorWindow,
@Suppress("LocalVariableName") _file: VirtualFile,
@@ -36,19 +36,19 @@ class MoveEditorToOppositeTabGroupAction extends AnAction implements DumbAware,
}
EditorWindow window = EditorWindow.DATA_KEY.getData(dataContext);
List<EditorWindow> siblings = window == null ? Collections.emptyList() : window.getSiblings$intellij_platform_ide_impl();
List<EditorWindow> siblings = window == null ? Collections.emptyList() : window.getSiblings();
if (siblings.size() != 1) {
return;
}
EditorComposite editorComposite = window.getSelectedComposite();
FileEntry entry = editorComposite == null ? null : editorComposite.currentStateAsFileEntry$intellij_platform_ide_impl();
FileEntry entry = editorComposite == null ? null : editorComposite.currentStateAsFileEntry();
vFile.putUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN, Boolean.TRUE);
if (closeSource) {
window.closeFile(vFile, true, false);
}
((FileEditorManagerImpl)FileEditorManagerEx.getInstanceEx(project))
.openFileImpl$intellij_platform_ide_impl(siblings.get(0), vFile, entry, new FileEditorOpenOptions().withRequestFocus());
.openFileImpl(siblings.get(0), vFile, entry, new FileEditorOpenOptions().withRequestFocus());
vFile.putUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN, null);
}
@@ -77,6 +77,6 @@ class MoveEditorToOppositeTabGroupAction extends AnAction implements DumbAware,
if (!closeSource && FileEditorManagerImpl.forbidSplitFor(vFile)) {
return false;
}
return window.getSiblings$intellij_platform_ide_impl().size() == 1;
return window.getSiblings().size() == 1;
}
}
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("ReplacePutWithAssignment", "ReplaceGetOrSet")
package com.intellij.openapi.keymap.impl
@@ -516,6 +516,7 @@ class IdeKeyEventDispatcher(private val queue: IdeEventQueue?) {
shortcut = context.shortcut)
}
@JvmName("processAction")
internal fun processAction(e: InputEvent,
place: String,
context: DataContext,
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.keymap.impl;
import com.intellij.featureStatistics.FeatureUsageTracker;
@@ -34,8 +34,10 @@ import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import static java.awt.event.MouseEvent.*;
@@ -265,7 +267,7 @@ public final class IdeMouseEventDispatcher {
ActionManagerEx actionManager = (ActionManagerEx)ApplicationManager.getApplication().getServiceIfCreated(ActionManager.class);
if (actionManager != null && !actions.isEmpty()) {
DataContext context = DataManager.getInstance().getDataContext(component);
IdeEventQueue.getInstance().getKeyEventDispatcher().processAction$intellij_platform_ide_impl(
IdeEventQueue.getInstance().getKeyEventDispatcher().processAction(
event, place, context, actions,
newActionProcessor(modifiers), myPresentationFactory, shortcut);
}
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("ReplaceGetOrSet", "ReplaceJavaStaticMethodWithKotlinAnalog", "ReplacePutWithAssignment")
package com.intellij.openapi.keymap.impl
@@ -219,6 +219,7 @@ open class KeymapImpl @JvmOverloads constructor(@field:Volatile private var data
actionBinding = ActionManagerEx.getInstanceEx()::getActionBinding)
}
@JvmName("addShortcutFromSettings")
internal fun addShortcutFromSettings(actionId: String, shortcut: Shortcut) {
addShortcut(actionId = actionId,
shortcut = shortcut,
@@ -338,6 +339,7 @@ open class KeymapImpl @JvmOverloads constructor(@field:Volatile private var data
}
}
@JvmName("removeShortcutFromSettings")
internal fun removeShortcutFromSettings(actionId: String, toDelete: Shortcut) {
removeShortcut(actionId = actionId,
toDelete = toDelete,
@@ -254,7 +254,7 @@ public final class KeymapPanel extends JPanel implements SearchableConfigurable,
private static void addShortcut(Keymap keymap, String actionId, Shortcut shortcut) {
if (keymap instanceof KeymapImpl) {
((KeymapImpl)keymap).addShortcutFromSettings$intellij_platform_ide_impl(actionId, shortcut);
((KeymapImpl)keymap).addShortcutFromSettings(actionId, shortcut);
}
else {
keymap.addShortcut(actionId, shortcut);
@@ -263,7 +263,7 @@ public final class KeymapPanel extends JPanel implements SearchableConfigurable,
private static void removeShortcut(Keymap keymap, String actionId, Shortcut shortcut) {
if (keymap instanceof KeymapImpl) {
((KeymapImpl)keymap).removeShortcutFromSettings$intellij_platform_ide_impl(actionId, shortcut);
((KeymapImpl)keymap).removeShortcutFromSettings(actionId, shortcut);
}
else {
keymap.removeShortcut(actionId, shortcut);
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.options;
import com.intellij.ide.ui.search.BooleanOptionDescription;
@@ -226,7 +226,7 @@ public abstract class ConfigurableBuilder extends UiDslUnnamedConfigurable.Simpl
@Override
public void createContent(@NotNull Panel builder) {
ConfigurableBuilderHelper.buildFieldsPanel$intellij_platform_ide_impl(builder, myTitle, myFields);
ConfigurableBuilderHelper.buildFieldsPanel(builder, myTitle, myFields);
}
@ApiStatus.Internal
@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.options
import com.intellij.openapi.ui.DialogPanel
@@ -15,6 +15,7 @@ class ConfigurableBuilderHelper {
@ApiStatus.ScheduledForRemoval
@ApiStatus.Internal
@Deprecated("Will be removed")
@JvmName("buildFieldsPanel")
internal fun Panel.buildFieldsPanel(@NlsContexts.BorderTitle title: String?, fields: List<ConfigurableBuilder.BeanField<*, *>>) {
if (title != null) {
group(title) {
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.util;
import com.intellij.openapi.wm.IdeFrame;
@@ -113,7 +113,7 @@ final class WindowStateBean implements ModificationTracker, WindowState {
private static boolean isFullScreen(@NotNull Window window) {
return window instanceof IdeFrame &&
FrameInfoHelper.Companion.isFullScreenSupportedInCurrentOs$intellij_platform_ide_impl() &&
FrameInfoHelper.Companion.isFullScreenSupportedInCurrentOs() &&
((IdeFrame)window).isInFullScreen();
}
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE")
package com.intellij.openapi.wm.impl
@@ -21,6 +21,7 @@ import javax.swing.JFrame
internal class FrameInfoHelper {
companion object {
@JvmName("isFullScreenSupportedInCurrentOs")
internal fun isFullScreenSupportedInCurrentOs(): Boolean {
return SystemInfoRt.isMac
|| SystemInfoRt.isWindows
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.wm.impl;
import com.intellij.ide.ui.UISettings;
@@ -92,7 +92,7 @@ public final class IdeBackgroundUtil {
}
}
Component glassPane = rootPane == null ? null : rootPane.getGlassPane();
PainterHelper helper = glassPane instanceof IdeGlassPaneImpl ? ((IdeGlassPaneImpl)glassPane).getNamedPainters$intellij_platform_ide_impl(paintersName) : null;
PainterHelper helper = glassPane instanceof IdeGlassPaneImpl ? ((IdeGlassPaneImpl)glassPane).getNamedPainters(paintersName) : null;
if (helper == null || !helper.needsRepaint()) {
return MyGraphics.unwrap(g);
}
@@ -100,11 +100,11 @@ public final class IdeBackgroundUtil {
}
static void initEditorPainters(@NotNull IdeGlassPaneImpl glassPane) {
PainterHelper.initWallpaperPainter(EDITOR_PROP, glassPane.getNamedPainters$intellij_platform_ide_impl(EDITOR_PROP));
PainterHelper.initWallpaperPainter(EDITOR_PROP, glassPane.getNamedPainters(EDITOR_PROP));
}
static void initFramePainters(@NotNull IdeGlassPaneImpl glassPane) {
PainterHelper painters = glassPane.getNamedPainters$intellij_platform_ide_impl(FRAME_PROP);
PainterHelper painters = glassPane.getNamedPainters(FRAME_PROP);
PainterHelper.initWallpaperPainter(FRAME_PROP, painters);
painters.addPainter(new AbstractPainter() {

Some files were not shown because too many files have changed in this diff Show More