diff --git a/build.gradle.kts b/build.gradle.kts index dcd92d5..c26203c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,19 +8,18 @@ plugins { } group = "com.cppcxy" -val emmyluaAnalyzerVersion = "0.7.1" +val emmyluaAnalyzerVersion = "0.4.6" val emmyDebuggerVersion = "1.8.2" -val emmyluaAnalyzerProjectUrl = "https://github.com/CppCXY/EmmyLuaAnalyzer" -val emmyluaCodeStyleProjectUrl = "https://github.com/CppCXY/EmmyLuaCodeStyle" +val emmyluaAnalyzerProjectUrl = "https://github.com/CppCXY/emmylua-analyzer-rust" task("download", type = Download::class) { src( arrayOf( - "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/EmmyLua.LanguageServer-win32-x64.zip", - "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/EmmyLua.LanguageServer-linux-x64.tar.gz", - "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/EmmyLua.LanguageServer-darwin-arm64.zip", - "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/EmmyLua.LanguageServer-darwin-x64.zip", + "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/emmylua_ls-win32-x64.zip", + "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/emmylua_ls-linux-x64.tar.gz", + "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/emmylua_ls-darwin-arm64.tar.gz", + "${emmyluaAnalyzerProjectUrl}/releases/download/${emmyluaAnalyzerVersion}/emmylua_ls-darwin-x64.tar.gz", ) ) dest("temp") @@ -43,17 +42,17 @@ task("downloadEmmyDebugger", type = Download::class) { task("unzip", type = Copy::class) { dependsOn("download", "downloadEmmyDebugger") // language server - from(zipTree("temp/EmmyLua.LanguageServer-win32-x64.zip")) { - into("server/") + from(zipTree("temp/emmylua_ls-win32-x64.zip")) { + into("server/win32-x64") } - from(tarTree("temp/EmmyLua.LanguageServer-linux-x64.tar.gz")) { - into("server/EmmyLua.LanguageServer-linux-x64") + from(tarTree("temp/emmylua_ls-linux-x64.tar.gz")) { + into("server/linux-x64") } - from(zipTree("temp/EmmyLua.LanguageServer-darwin-arm64.zip")) { - into("server/") + from(zipTree("temp/emmylua_ls-darwin-arm64.tar.gz")) { + into("server/darwin-arm64") } - from(zipTree("temp/EmmyLua.LanguageServer-darwin-x64.zip")) { - into("server/") + from(zipTree("temp/emmylua_ls-darwin-x64.tar.gz")) { + into("server/darwin-x64") } // debugger from(zipTree("temp/debugger/win32-x86.zip")) { @@ -175,6 +174,11 @@ tasks { dependsOn("install") } + // fix by https://youtrack.jetbrains.com/issue/IDEA-325747/IDE-always-actively-disables-LSP-plugins-if-I-ask-the-plugin-to-return-localized-diagnostic-messages. + runIde { + autoReloadPlugins.set(false) + } + prepareSandbox { doLast { copy { diff --git a/src/main/kotlin/com/cppcxy/ide/lsp/EmmyLuaAnalyzerAdaptor.kt b/src/main/kotlin/com/cppcxy/ide/lsp/EmmyLuaAnalyzerAdaptor.kt index e5cbec6..9529f45 100644 --- a/src/main/kotlin/com/cppcxy/ide/lsp/EmmyLuaAnalyzerAdaptor.kt +++ b/src/main/kotlin/com/cppcxy/ide/lsp/EmmyLuaAnalyzerAdaptor.kt @@ -13,15 +13,15 @@ object EmmyLuaAnalyzerAdaptor { private val exe: String get() { return if (SystemInfoRt.isWindows) { - "EmmyLua.LanguageServer-win32-x64/EmmyLua.LanguageServer.exe" + "win32-x64/emmylua_ls.exe" } else if (SystemInfoRt.isMac) { if (System.getProperty("os.arch") == "arm64") { - "EmmyLua.LanguageServer-darwin-arm64/EmmyLua.LanguageServer" + "darwin-arm64/emmylua_ls" } else { - "EmmyLua.LanguageServer-darwin-x64/EmmyLua.LanguageServer" + "darwin-x64/emmylua_ls" } } else { - "EmmyLua.LanguageServer-linux-x64/EmmyLua.LanguageServer" + "linux-x64/emmylua_ls" } }