Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for macOS (Darwin) for Java and Rust #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −6
Open

Add support for macOS (Darwin) for Java and Rust #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/monitors4codegen/multilspy/language_servers/eclipse_jdtls/eclipse_jdtls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ def setupRuntimeDependencies(self, logger: MultilspyLogger, config: MultilspyCon
assert platformId.value in [
"linux-x64",
"win-x64",
"darwin-arm64",
], "Only linux-x64 platform is supported for in multilspy at the moment"

gradle_path = str(
Expand Down
7 changes: 6 additions & 1 deletion src/monitors4codegen/multilspy/language_servers/eclipse_jdtls/runtime_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
"darwin-arm64": {
"url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/[email protected]",
"archiveType": "zip",
"relative_extraction_path": "vscode-java"
"relative_extraction_path": "vscode-java",
"jre_home_path": "extension/jre/17.0.8.1-macosx-aarch64",
"jre_path": "extension/jre/17.0.8.1-macosx-aarch64/bin/java",
"lombok_jar_path": "extension/lombok/lombok-1.18.30.jar",
"jdtls_launcher_jar_path": "extension/server/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar",
"jdtls_readonly_config_path": "extension/server/config_mac_arm"
},
"darwin-x64": {
"url": "https://github.com/redhat-developer/vscode-java/releases/download/v1.23.0/[email protected]",
Expand Down
8 changes: 8 additions & 0 deletions src/monitors4codegen/multilspy/language_servers/rust_analyzer/runtime_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
"platformId": "win-x64",
"archiveType": "zip",
"binaryName": "rust-analyzer.exe"
},
{
"id": "RustAnalyzer",
"description": "RustAnalyzer for macOS (arm64)",
"url": "https://github.com/rust-lang/rust-analyzer/releases/download/2023-10-09/rust-analyzer-aarch64-apple-darwin.gz",
"platformId": "darwin-arm64",
"archiveType": "gz",
"binaryName": "rust-analyzer"
}
]
}
1 change: 1 addition & 0 deletions src/monitors4codegen/multilspy/language_servers/rust_analyzer/rust_analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def setup_runtime_dependencies(self, logger: MultilspyLogger, config: MultilspyC
assert platform_id.value in [
"linux-x64",
"win-x64",
"darwin-arm64"
], "Only linux-x64 platform is supported for in multilspy at the moment"

runtime_dependencies = d["runtimeDependencies"]
Expand Down
10 changes: 5 additions & 5 deletions src/monitors4codegen/multilspy/multilspy_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ class PlatformId(str, Enum):
WIN_x86 = "win-x86"
WIN_x64 = "win-x64"
WIN_arm64 = "win-arm64"
OSX = "osx"
OSX_x64 = "osx-x64"
OSX_arm64 = "osx-arm64"
OSX = "darwin"
OSX_x64 = "darwin-x64"
OSX_arm64 = "darwin-arm64"
LINUX_x86 = "linux-x86"
LINUX_x64 = "linux-x64"
LINUX_arm64 = "linux-arm64"
Expand Down Expand Up @@ -202,8 +202,8 @@ def get_platform_id() -> PlatformId:
system = platform.system()
machine = platform.machine()
bitness = platform.architecture()[0]
system_map = {"Windows": "win", "Darwin": "osx", "Linux": "linux"}
machine_map = {"AMD64": "x64", "x86_64": "x64", "i386": "x86", "i686": "x86", "aarch64": "arm64"}
system_map = {"Windows": "win", "Darwin": "darwin", "Linux": "linux"}
machine_map = {"AMD64": "x64", "x86_64": "x64", "i386": "x86", "i686": "x86", "aarch64": "arm64", "arm64": "arm64"}
if system in system_map and machine in machine_map:
platform_id = system_map[system] + "-" + machine_map[machine]
if system == "Linux" and bitness == "64bit":
Expand Down