From bf6d35dc05ced5496484237b8506e8190df267a3 Mon Sep 17 00:00:00 2001 From: Felix Schnabel Date: Wed, 18 Sep 2024 17:04:06 +0200 Subject: [PATCH] Declare missing Service usage and remove exports non existing modules --- .../src/main/java/module-info.java | 14 +++++++------- .../ballerina-lang/src/main/java/module-info.java | 3 +++ .../langserver-core/src/main/java/module-info.java | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/module-info.java b/bvm/ballerina-runtime/src/main/java/module-info.java index de8f45222601..32a43bd94043 100644 --- a/bvm/ballerina-runtime/src/main/java/module-info.java +++ b/bvm/ballerina-runtime/src/main/java/module-info.java @@ -1,4 +1,5 @@ module io.ballerina.runtime { + uses io.ballerina.runtime.api.launch.LaunchListener; requires java.xml; requires org.apache.commons.text; requires axiom.api; @@ -44,23 +45,22 @@ io.ballerina.lang.floatingpoint, io.ballerina.lang.internal, io.ballerina.lang.function, io.ballerina.lang.regexp, io.ballerina.runtime.profiler; exports io.ballerina.runtime.internal.commons to io.ballerina.lang.value; - exports io.ballerina.runtime.internal.launch to io.ballerina.testerina.runtime, io.ballerina.packerina, - ballerina.test.listener, io.ballerina.cli, org.ballerinalang.debugadapter.runtime; - exports io.ballerina.runtime.internal.scheduling to io.ballerina.cli.utils, io.ballerina.java, + exports io.ballerina.runtime.internal.launch to io.ballerina.testerina.runtime, ballerina.test.listener, + io.ballerina.cli, org.ballerinalang.debugadapter.runtime; + exports io.ballerina.runtime.internal.scheduling to io.ballerina.java, io.ballerina.lang.array, io.ballerina.lang.error, io.ballerina.lang.internal, io.ballerina.lang.map, io.ballerina.lang.table, io.ballerina.lang.transaction, io.ballerina.lang.value, io.ballerina.lang.xml, - io.ballerina.log.api, io.ballerina.testerina.core, io.ballerina.testerina.runtime, io.ballerina.shell, + io.ballerina.testerina.core, io.ballerina.testerina.runtime, io.ballerina.shell, org.ballerinalang.debugadapter.runtime, io.ballerina.lang.function, io.ballerina.runtime.profiler; exports io.ballerina.runtime.internal.util to io.ballerina.testerina.runtime, io.ballerina.lang, io.ballerina.lang.integer, io.ballerina.lang.floatingpoint, io.ballerina.lang.array, io.ballerina.lang.table, io.ballerina.java, io.ballerina.lang.map, io.ballerina.lang.string, io.ballerina.lang.xml, io.ballerina.lang.bool, io.ballerina.lang.error, io.ballerina.lang.internal, - io.ballerina.lang.value, io.ballerina.auth, io.ballerina.runtime.api, io.ballerina.cli.utils, - io.ballerina.cli; + io.ballerina.lang.value, io.ballerina.cli; exports io.ballerina.runtime.internal.errors to io.ballerina.lang.value, io.ballerina.lang.integer, io.ballerina.java, io.ballerina.lang.internal, io.ballerina.lang.array, io.ballerina.lang.bool, io.ballerina.lang.floatingpoint, io.ballerina.lang.map, io.ballerina.lang.string, io.ballerina.lang.table, - io.ballerina.lang.xml, io.ballerina.testerina.core, io.ballerina.cli.utils, io.ballerina.cli, + io.ballerina.lang.xml, io.ballerina.testerina.core, io.ballerina.cli, io.ballerina.lang.decimal, org.ballerinalang.debugadapter.runtime, io.ballerina.lang.function, io.ballerina.lang.regexp; exports io.ballerina.runtime.internal.values to io.ballerina.testerina.core, io.ballerina.testerina.runtime, diff --git a/compiler/ballerina-lang/src/main/java/module-info.java b/compiler/ballerina-lang/src/main/java/module-info.java index f3ae030b12a9..bf773acd7296 100644 --- a/compiler/ballerina-lang/src/main/java/module-info.java +++ b/compiler/ballerina-lang/src/main/java/module-info.java @@ -1,6 +1,9 @@ module io.ballerina.lang { uses io.ballerina.projects.plugins.CompilerPlugin; uses io.ballerina.projects.buildtools.CodeGeneratorTool; + uses org.ballerinalang.spi.CompilerBackendCodeGenerator; + uses org.ballerinalang.compiler.plugins.CompilerPlugin; + uses org.ballerinalang.spi.EmbeddedExecutor; requires java.compiler; requires com.google.gson; requires java.xml; diff --git a/language-server/modules/langserver-core/src/main/java/module-info.java b/language-server/modules/langserver-core/src/main/java/module-info.java index deac82e07835..a2ad981981ed 100644 --- a/language-server/modules/langserver-core/src/main/java/module-info.java +++ b/language-server/modules/langserver-core/src/main/java/module-info.java @@ -11,6 +11,7 @@ uses org.ballerinalang.langserver.eventsync.EventPublisher; uses org.ballerinalang.langserver.commons.codeaction.spi.DiagnosticBasedCodeActionProvider; uses org.ballerinalang.langserver.commons.codeaction.spi.RangeBasedCodeActionProvider; + uses org.ballerinalang.langserver.commons.completion.spi.BallerinaCompletionProvider; exports org.ballerinalang.langserver; exports org.ballerinalang.langserver.references; exports org.ballerinalang.langserver.common.utils; @@ -20,7 +21,7 @@ exports org.ballerinalang.langserver.extensions; exports org.ballerinalang.langserver.config; exports org.ballerinalang.langserver.telemetry; - exports org.ballerinalang.langserver.util to io.ballerina.language.server.simulator; + exports org.ballerinalang.langserver.util; exports org.ballerinalang.langserver.codeaction to io.ballerina.datamapper; requires io.ballerina.diagram.util; requires io.ballerina.formatter.core;