diff --git a/pkgs/java-language-server/codegen/codegen/__init__.py b/pkgs/java-language-server/codegen/codegen/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pkgs/java-language-server/codegen/codegen/main.py b/pkgs/java-language-server/codegen/codegen/main.py deleted file mode 100644 index 3c0d6c10..00000000 --- a/pkgs/java-language-server/codegen/codegen/main.py +++ /dev/null @@ -1,183 +0,0 @@ -import javalang -import jinja2 -import pathlib -import os -import sys - -nativeTypes = { - "boolean": ( - lambda reader: f"{reader}.nextBoolean()", - lambda writer, value: f"{writer}.value({value})", - ), - "Boolean": ( - lambda reader: f"{reader}.nextBoolean()", - lambda writer, value: f"{writer}.value({value})", - ), - "Double": ( - lambda reader: f"{reader}.nextDouble()", - lambda writer, value: f"{writer}.value({value})", - ), - "Integer": ( - lambda reader: f"{reader}.nextInt()", - lambda writer, value: f"{writer}.value({value})", - ), - "int": ( - lambda reader: f"{reader}.nextInt()", - lambda writer, value: f"{writer}.value({value})", - ), - "String": ( - lambda reader: f"{reader}.nextString()", - lambda writer, value: f"{writer}.value({value})", - ), - "JsonElement": ( - lambda reader: f"new Gson().getAdapter(JsonElement.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(JsonElement.class).write({writer}, {value})", - ), - "JsonObject": ( - lambda reader: f"new Gson().getAdapter(JsonObject.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(JsonObject.class).write({writer}, {value})", - ), - "JsonArray": ( - lambda reader: f"new Gson().getAdapter(JsonArray.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(JsonArray.class).write({writer}, {value})", - ), - "List": ( - lambda reader: f"new Gson().getAdapter(List.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(List.class).write({writer}, {value})", - ), - "URI": ( - lambda reader: f"new Gson().getAdapter(URI.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(URI.class).write({writer}, {value})", - ), - "Map": ( - lambda reader: f"new Gson().getAdapter(Map.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(Map.class).write({writer}, {value})", - ), - "Object": ( - lambda reader: f"new Gson().getAdapter(Object.class).read({reader})", - lambda writer, value: f"new Gson().getAdapter(Object.class).write({writer}, {value})", - ), -} - -env = jinja2.Environment( - loader=jinja2.PackageLoader("codegen", "templates"), - trim_blocks=True, - lstrip_blocks=True, -) -adapter = env.get_template("./adapter.java") -builder = env.get_template("./builder.java") - -adapters = nativeTypes -all_classes = set() - -root = sys.argv[1] - - -def walk(clazz): - with open(f"{root}/{clazz}.java") as source: - ast = javalang.parse.parse("\n".join(source.readlines())) - - assert len(ast.types) == 1 - definition = ast.types[0] - - for field in definition.fields: - for declarator in field.declarators: - if "public" not in field.modifiers: - continue - - if "static" in field.modifiers: - continue - - if field.type.name not in adapters: - adapters[field.type.name] = ( - lambda reader, type=field.type.name: f"new {type}JsonAdapter().read({reader})", - lambda writer, value, type=field.type.name: f"new {type}JsonAdapter().write({writer}, {value})", - ) - walk(field.type.name) - all_classes.add(field.type.name) - - -def codegen(clazz): - with open(f"{root}/{clazz}.java") as source: - ast = javalang.parse.parse("\n".join(source.readlines())) - - assert len(ast.types) == 1 - definition = ast.types[0] - - fields = [] - for field in definition.fields: - if "public" not in field.modifiers: - continue - - if "static" in field.modifiers: - continue - - for declarator in field.declarators: - fields.append( - { - "name": declarator.name, - "adapter": adapters[field.type.name], - } - ) - - java = adapter.render( - clazz=definition.name, - instance=definition.name.lower(), - fields=fields, - package="org.javacs.lsp", - ) - with open(f"{root}/{clazz}JsonAdapter.java", "w") as out: - print(f"{root}/{clazz}JsonAdapter.java") - out.write(java) - - -def run(): - files = os.listdir(root) - for file in sorted(files, key=lambda f: pathlib.Path(root, f).name): - path = pathlib.Path(root, file) - if path.suffix == ".java": - with open(path) as source: - ast = javalang.parse.parse("\n".join(source.readlines())) - - if len(ast.imports) > 5: - print(f"Dropping {path.name}") - continue - - assert len(ast.types) == 1 - clazz = ast.types[0] - - if not isinstance(clazz, javalang.tree.ClassDeclaration): - print(f"Dropping {path.name}") - continue - - if "public" not in clazz.modifiers: - print(f"Dropping {path.name}") - continue - - if "abstract" in clazz.modifiers: - print(f"Dropping {path.name}") - continue - - if len(clazz.methods) > 10: - print(f"Dropping {path.name}") - continue - - if len(clazz.fields) == 0: - print(f"Dropping {path.name}") - continue - - all_classes.add(path.stem) - - for clazz in list(all_classes): - walk(clazz) - - for clazz in all_classes: - codegen(clazz) - - java = builder.render( - classes=all_classes, - package="org.javacs.lsp", - ) - - with open(f"{root}/GSONCodeGenBuilder.java", "w") as out: - out.write(java) diff --git a/pkgs/java-language-server/codegen/codegen/templates/adapter.java b/pkgs/java-language-server/codegen/codegen/templates/adapter.java deleted file mode 100644 index 331b9ea7..00000000 --- a/pkgs/java-language-server/codegen/codegen/templates/adapter.java +++ /dev/null @@ -1,61 +0,0 @@ -package {{ package }}; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.net.URI; - -import com.google.gson.TypeAdapter; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -public class {{ clazz }}JsonAdapter extends TypeAdapter<{{ clazz }}> { - @Override public void write(JsonWriter out, {{ clazz }} {{ instance }}) throws IOException { - out.beginObject(); - {% for field in fields %} - out.name("{{ field.name }}"); - {{ field.adapter[1]('out', instance + "." + field.name) }}; - {% endfor %} - out.endObject(); - } - - @Override public {{ clazz }} read(JsonReader in) throws IOException { - {{ clazz }} {{instance }} = new {{ clazz }}(); - - JsonToken token = in.peek(); - - in.beginObject(); - while (in.hasNext()) { - token = in.peek(); - - String field = ""; - if (token.equals(JsonToken.NAME)) { - field = in.nextName(); - } - - {% for field in fields %} - if ("{{ field.name }}".equals(field)) { - token = in.peek(); - if (token.equals(JsonToken.NULL)) { - in.nextNull(); - } else { - {{ instance }}.{{ field.name }} = {{ field.adapter[0]('in') }}; - } - } else - {% endfor %} - { - // The key is unknown, skip the whole element - new Gson().getAdapter(JsonElement.class).read(in); - } - } - in.endObject(); - - return {{ instance }}; - } -} diff --git a/pkgs/java-language-server/codegen/codegen/templates/builder.java b/pkgs/java-language-server/codegen/codegen/templates/builder.java deleted file mode 100644 index 14830c91..00000000 --- a/pkgs/java-language-server/codegen/codegen/templates/builder.java +++ /dev/null @@ -1,16 +0,0 @@ -package {{ package }}; - -import java.io.IOException; - -import com.google.gson.GsonBuilder; - -public class GSONCodeGenBuilder { - public static GsonBuilder builder() { - GsonBuilder builder = new GsonBuilder(); - - {% for clazz in classes -%} - builder.registerTypeAdapter({{ clazz }}.class, new {{ clazz }}JsonAdapter()); - {% endfor %} - return builder; - } -} diff --git a/pkgs/java-language-server/codegen/poetry.lock b/pkgs/java-language-server/codegen/poetry.lock deleted file mode 100644 index 482992ff..00000000 --- a/pkgs/java-language-server/codegen/poetry.lock +++ /dev/null @@ -1,127 +0,0 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. - -[[package]] -name = "javalang" -version = "0.13.0" -description = "Pure Python Java parser and tools" -optional = false -python-versions = "*" -files = [ - {file = "javalang-0.13.0-py2-none-any.whl", hash = "sha256:5c20f9ee81c49062341e78a88485d6a16f2fa7282856fecf79d2a9dc32374cca"}, - {file = "javalang-0.13.0-py3-none-any.whl", hash = "sha256:b203c258919b085b44b43b89effcba7291bb2d90c02906b915b39e86aa9fd8e6"}, - {file = "javalang-0.13.0.tar.gz", hash = "sha256:1681a5a480a58116d42a7eedfd132abe25e6c0ffe552868d581ad84e6aa3424c"}, -] - -[package.dependencies] -six = "*" - -[[package]] -name = "jinja2" -version = "3.1.3" -description = "A very fast and expressive template engine." -optional = false -python-versions = ">=3.7" -files = [ - {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, - {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, -] - -[package.dependencies] -MarkupSafe = ">=2.0" - -[package.extras] -i18n = ["Babel (>=2.7)"] - -[[package]] -name = "markupsafe" -version = "2.0.1" -description = "Safely add untrusted strings to HTML/XML markup." -optional = false -python-versions = ">=3.6" -files = [ - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, - {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, -] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - -[metadata] -lock-version = "2.0" -python-versions = "^3.8" -content-hash = "39221573db8f952a6e7cb6a1a7ee0a081aeb6400d74e946bcf835049a3e645da" diff --git a/pkgs/java-language-server/codegen/pyproject.toml b/pkgs/java-language-server/codegen/pyproject.toml deleted file mode 100644 index b3a8538e..00000000 --- a/pkgs/java-language-server/codegen/pyproject.toml +++ /dev/null @@ -1,20 +0,0 @@ -[tool.poetry] -name = "codegen" -version = "0.1.0" -description = "" -authors = ["Zach Anderson "] - -[tool.poetry.dependencies] -python = "^3.8" -javalang = "^0.13.0" -Jinja2 = "^3.1.3" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.poetry.scripts] -codegen = 'codegen.main:run' - diff --git a/pkgs/java-language-server/default.nix b/pkgs/java-language-server/default.nix deleted file mode 100644 index d7c04eef..00000000 --- a/pkgs/java-language-server/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv -, maven -, callPackage -, fetchFromGitHub -, graalvm17-ce -, poetry2nix -, makeWrapper -}: -let - repository = callPackage ./repo.nix { }; - - jars = [ - "$classpath/gson-2.8.5.jar" - "$classpath/protobuf-java-3.9.1.jar" - "$classpath/java-language-server.jar" - ]; - - flags = [ - "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" - "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" - "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" - "--class-path ${builtins.concatStringsSep ":" jars}" - ]; - - codegen = poetry2nix.mkPoetryApplication { - projectDir = ./codegen; - }; - -in -stdenv.mkDerivation rec { - name = "java-language-server"; - version = "0.2.38"; - - src = fetchFromGitHub { - owner = "georgewfraser"; - repo = "java-language-server"; - rev = "7fffb6c5929fe02c52e1c823ae990bad2b540ad1"; - sha256 = "0vw3sn2pm95aqs0wjgvzdnrmaz79f5gv212l3xq58c30n8i1lj1m"; - }; - - nativeBuildInputs = [ maven graalvm17-ce codegen makeWrapper ]; - buildInputs = [ graalvm17-ce ]; - patches = [ ./patches/log-cycle.patch ./patches/static-gson.patch ]; - dontConfigure = true; - buildPhase = '' - echo "Generating static type adapters for LSP" - codegen src/main/java/org/javacs/lsp - - echo "Using repository ${repository}" - mvn --offline -Dmaven.repo.local=${repository} -DskipTests package; - - classpath=dist/classpath - native-image ${builtins.concatStringsSep " " flags} --no-fallback org.javacs.Main - native-image ${builtins.concatStringsSep " " flags} --no-fallback org.javacs.debug.JavaDebugServer - ''; - installPhase = '' - classpath=$out/share/java - mkdir -p $classpath - cp -a dist/classpath/* $classpath - - mkdir -p $out/bin - cp org.javacs.main $out/bin/native-java-language-server - cp org.javacs.debug.javadebugserver $out/bin/native-java-dap - - makeWrapper ${graalvm17-ce}/bin/java $out/bin/java-langauge-server \ - --add-flags "${builtins.concatStringsSep " " flags}" \ - --add-flags "org.javacs.Main" - - makeWrapper ${graalvm17-ce}/bin/java $out/bin/java-dap \ - --add-flags "${builtins.concatStringsSep " " flags}" \ - --add-flags "org.javacs.debug.JavaDebugServer" - ''; -} diff --git a/pkgs/java-language-server/patches/log-cycle.patch b/pkgs/java-language-server/patches/log-cycle.patch deleted file mode 100644 index 2da3e4ed..00000000 --- a/pkgs/java-language-server/patches/log-cycle.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/main/java/org/javacs/ReusableCompiler.java b/src/main/java/org/javacs/ReusableCompiler.java -index 2d50f74c..dfaf6d2a 100644 ---- a/src/main/java/org/javacs/ReusableCompiler.java -+++ b/src/main/java/org/javacs/ReusableCompiler.java -@@ -174,19 +174,6 @@ class ReusableCompiler { - drop(JavacTask.class); - drop(JavacTrees.class); - drop(JavacElements.class); -- -- if (ht.get(Log.logKey) instanceof ReusableLog) { -- // log already inited - not first round -- ((ReusableLog) Log.instance(this)).clear(); -- Enter.instance(this).newRound(); -- ((ReusableJavaCompiler) ReusableJavaCompiler.instance(this)).clear(); -- Types.instance(this).newRound(); -- Check.instance(this).newRound(); -- Modules.instance(this).newRound(); -- Annotate.instance(this).newRound(); -- CompileStates.instance(this).clear(); -- MultiTaskListener.instance(this).clear(); -- } - } - - @Override diff --git a/pkgs/java-language-server/patches/static-gson.patch b/pkgs/java-language-server/patches/static-gson.patch deleted file mode 100644 index 808f5947..00000000 --- a/pkgs/java-language-server/patches/static-gson.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main/java/org/javacs/lsp/LSP.java b/src/main/java/org/javacs/lsp/LSP.java -index 24731930..6e38d415 100644 ---- a/src/main/java/org/javacs/lsp/LSP.java -+++ b/src/main/java/org/javacs/lsp/LSP.java -@@ -14,7 +14,7 @@ import java.util.logging.Level; - import java.util.logging.Logger; - - public class LSP { -- private static final Gson gson = new Gson(); -+ private static final Gson gson = GSONCodeGenBuilder.builder().create(); - - private static String readHeader(InputStream client) { - var line = new StringBuilder(); diff --git a/pkgs/java-language-server/repo.nix b/pkgs/java-language-server/repo.nix deleted file mode 100644 index 8adbb4a8..00000000 --- a/pkgs/java-language-server/repo.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, maven -, fetchFromGitHub -}: -stdenv.mkDerivation { - name = "java-language-server-repo"; - src = fetchFromGitHub { - owner = "georgewfraser"; - repo = "java-language-server"; - rev = "7fffb6c5929fe02c52e1c823ae990bad2b540ad1"; - sha256 = "0vw3sn2pm95aqs0wjgvzdnrmaz79f5gv212l3xq58c30n8i1lj1m"; - }; - - dontConfigure = true; - buildInputs = [ maven ]; - buildPhase = '' - mvn package -Dmaven.repo.local=$out -DskipTests - ''; - - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - ''; - - # don't do any fixup - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0850nyrsmgcfxqcrr8rs48pbi1qsx9gwv57cxq3y38dwd4m10iv2"; -}