Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

[WIP] Add a Semanticdb plugin #142

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion 3rdparty/maven.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,10 @@ def list_dependencies():
},
"import_args": {
"default_visibility": ["//visibility:public"],
"deps": ["@scala_annex_com_lihaoyi_fansi_2_12"],
"deps": [
"@scala_annex_com_lihaoyi_fansi_2_12",
"@scala_annex_com_lihaoyi_sourcecode_2_12",
],
"jar_sha256": "2e18aa0884870537bf5c562255fc759d4ebe360882b5cb2141b30eda4034c71d",
"jar_urls": [
"http://central.maven.org/maven2/com/lihaoyi/pprint_2.12/0.5.3/pprint_2.12-0.5.3.jar",
Expand All @@ -895,6 +898,7 @@ def list_dependencies():
# duplicates in com.lihaoyi:sourcecode_2.12 promoted to 0.1.4
# - ch.epfl.scala:bloop-backend_2.12:1.0.0 wanted version 0.1.4
# - com.lihaoyi:fastparse_2.12:0.4.2 wanted version 0.1.3
# - com.lihaoyi:pprint_2.12:0.5.3 wanted version 0.1.4
{
"bind_args": {
"actual": "@scala_annex_com_lihaoyi_sourcecode_2_12",
Expand Down Expand Up @@ -2462,6 +2466,30 @@ def list_dependencies():
},
"lang": "java",
},
{
"bind_args": {
"actual": "@scala_annex_org_scalameta_semanticdb_scalac_2_12_7",
"name": "jar/scala_annex_org/scalameta/semanticdb_scalac_2_12_7",
},
"import_args": {
"default_visibility": ["//visibility:public"],
"deps": [
"@scala_annex_com_lihaoyi_pprint_2_12",
"@scala_annex_scala_2_12_scala_library//jar",
],
"jar_sha256": "62be6eb517912026e8824f95533a1ed4ae7c886bab5d266ee39ca98dd416a4dc",
"jar_urls": [
"http://central.maven.org/maven2/org/scalameta/semanticdb-scalac_2.12.7/4.0.0/semanticdb-scalac_2.12.7-4.0.0.jar",
],
"licenses": ["notice"],
"name": "scala_annex_org_scalameta_semanticdb_scalac_2_12_7",
"srcjar_sha256": "91970337ec5b6cc5ad0ae0162c452f1bb4a77bf1880644235dc8e62fa3dfd694",
"srcjar_urls": [
"http://central.maven.org/maven2/org/scalameta/semanticdb-scalac_2.12.7/4.0.0/semanticdb-scalac_2.12.7-4.0.0-sources.jar",
],
},
"lang": "java",
},
{
"bind_args": {
"actual": "@scala_annex_org_scalatest_scalatest_2_12",
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ http_archive(
urls = ["https://github.com/google/protobuf/archive/0038ff49af882463c2af9049356eed7df45c3e8e.zip"],
)

load("//rules/scala:workspace.bzl", "scala_repositories", "scala_register_toolchains")
load("//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories")

scala_repositories()

scala_register_toolchains()

load("//rules/scalafmt:workspace.bzl", "scalafmt_repositories", "scalafmt_default_config")
load("//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")

scalafmt_repositories()

scalafmt_default_config(".scalafmt.conf")

load(
"//rules/scala_proto:workspace.bzl",
"scala_proto_repositories",
"scala_proto_register_toolchains",
"scala_proto_repositories",
)

scala_proto_repositories()
Expand Down
5 changes: 5 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ dependencies:
modules: ["frontend"]
version: "1.0.0"

org.scalameta:
semanticdb-scalac_2.12.7:
lang: java
version: "4.0.0"

net.sourceforge.argparse4j:
argparse4j:
lang: java
Expand Down
23 changes: 23 additions & 0 deletions docs/stardoc/providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,29 @@ Zinc configuration.
</table>


<a name="#ScalaRulePhase"></a>
## ScalaRulePhase

A Scala compiler plugin

### Fields

<table class="params-table">
<colgroup>
<col class="col-param" />
<col class="col-description" />
</colgroup>
<tbody>
<tr id="#ScalaRulePhase_phases">
<td><code>phases</code></td>
<td>
<p>the phases to add</p>
</td>
</tr>
</tbody>
</table>


<a name="#ZincInfo"></a>
## ZincInfo

Expand Down
7 changes: 7 additions & 0 deletions rules/providers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ ZincConfiguration = provider(
},
)

ScalaRulePhase = provider(
doc = "A Scala compiler plugin",
fields = {
"phases": "the phases to add",
},
)

def _declare_zinc_configuration_implementation(ctx):
return [ZincConfiguration(
compiler_bridge = ctx.files.compiler_bridge,
Expand Down
2 changes: 1 addition & 1 deletion rules/rules_scala/private/compat.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ load(
)
load(
"//rules:scala.bzl",
_scala_library = "scala_library",
_scala_binary = "scala_binary",
_scala_library = "scala_library",
_scala_test = "scala_test",
)
load(
Expand Down
2 changes: 1 addition & 1 deletion rules/scala/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//rules:scala.bzl", "scala_library", "scala_binary", "scala_deps_toolchain", "scala_runner_toolchain")
load("//rules:scala.bzl", "scala_binary", "scala_deps_toolchain", "scala_library", "scala_runner_toolchain")
load("//rules:scalac.bzl", "scalac_binary", "scalac_library")
load("//rules:scalafmt.bzl", "scala_format_test")

Expand Down
9 changes: 4 additions & 5 deletions rules/scala/deps/DepsRunner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object DepsRunner extends SimpleMain {
parser
}

protected[this] def work(args: Array[String]) = {
protected[this] def work(args: Array[String]): Unit = {
val namespace = argParser.parseArgs(args)

val label = namespace.getString("label").tail
Expand Down Expand Up @@ -75,11 +75,10 @@ object DepsRunner extends SimpleMain {
println(s"buildozer 'add deps $depLabel' $label")
}

if (add.nonEmpty || remove.nonEmpty) {
sys.exit(1)
if (add.isEmpty && remove.isEmpty) {
try Files.createFile(namespace.get[File]("success").toPath)
catch { case _: FileAlreadyExistsException => }
}

try Files.createFile(namespace.get[File]("success").toPath)
catch { case _: FileAlreadyExistsException => }
}
}
Loading