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

Jump to bottom

Release plugin v1.1.0 #56

Merged
merged 1 commit into from
Jun 1, 2024
Merged

Release plugin v1.1.0 #56

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
3 changes: 1 addition & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ pluginRepositoryUrl = https://github.com/kizeevov/slint-idea-plugin

pluginGroup = dev.slint
pluginName = SlintPlugin
pluginVersion = 1.0.2
pluginVersion = 1.1.0
platformType = IU
#platformVersion = 242-EAP-SNAPSHOT
platformVersion = 2024.1
pluginSinceBuild = 241
pluginUntilBuild =
Expand Down
18 changes: 5 additions & 13 deletions src/main/kotlin/dev/slint/ideaplugin/ide/lsp/CommandLineHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.ide.plugins.PluginManager
import com.intellij.openapi.extensions.PluginId
import com.intellij.openapi.util.SystemInfo
import com.intellij.util.system.CpuArch
import dev.slint.ideaplugin.ide.settings.SlintBackend
import dev.slint.ideaplugin.ide.settings.SlintSettingsState
import dev.slint.ideaplugin.ide.settings.SlintStyle
Expand Down Expand Up @@ -68,19 +69,10 @@ object CommandLineHandler {
if (SystemInfo.isMac) {
programName = "Slint Live Preview.app/Contents/MacOS/slint-lsp"
} else if (SystemInfo.isLinux) {
programName = when (SystemInfo.OS_ARCH) {
"x64" -> {
"slint-lsp-x86_64-unknown-linux-gnu"
}

"arm" -> {
"slint-lsp-armv7-unknown-linux-gnueabihf"
}

"arm64" -> {
"slint-lsp-aarch64-unknown-linux-gnu"
}

programName = when (CpuArch.CURRENT) {
CpuArch.X86_64 -> "slint-lsp-x86_64-unknown-linux-gnu"
CpuArch.ARM32 -> "slint-lsp-armv7-unknown-linux-gnueabihf"
CpuArch.ARM64 -> "slint-lsp-aarch64-unknown-linux-gnu"
else -> {
return null
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/dev/slint/ideaplugin/ide/lsp/SlintLspServerDescriptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class SlintLspServerDescriptor(project: Project) : ProjectWideLspServerDescripto

override fun createInitializationOptions(): Any = SlintSettingsState.getInstance().lspSettings

override fun createLsp4jClient(handler: LspServerNotificationsHandler): Lsp4jClient = SlintLspClient(handler)
// Waiting for fix https://youtrack.jetbrains.com/issue/MP-6574
// override fun createLsp4jClient(handler: LspServerNotificationsHandler): Lsp4jClient = SlintLspClient(handler)

override val lsp4jServerClass: Class<out LanguageServer> = SlintLspServer::class.java
override val lspServerListener: LspServerListener = SlintLspServerListener(project)
Expand Down
Loading