Skip to content

Commit

Permalink
drop 242 and update deps (#278)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurnikov authored Feb 5, 2025
1 parent b90c689 commit 947646b
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
tests:
strategy:
matrix:
gradle-properties-version: [ 242, 243 ]
gradle-properties-version: [ 243 ]
platform-type: [ RR, PC ]
include:
- gradle-properties-version: 251
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-stable-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
publish-release:
strategy:
matrix:
gradle-properties-version: [ 242, 243, 251 ]
gradle-properties-version: [ 243, 251 ]

runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ version = pluginVersion

plugins {
id("java")
kotlin("jvm") version "2.1.0"
kotlin("jvm") version "2.1.10"
id("org.jetbrains.intellij.platform") version "2.1.0"
id("org.jetbrains.grammarkit") version "2022.3.2.2"
id("net.saliman.properties") version "1.5.2"
Expand Down
5 changes: 0 additions & 5 deletions gradle-242.properties

This file was deleted.

2 changes: 1 addition & 1 deletion gradle-243.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = RR
platformType = PC
platformVersion = 2024.3.1

useInstaller=true
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xms512m -Xmx4096m "-XX:MaxMetaspaceSize=512m"
propertiesPluginEnvironmentNameProperty=shortPlatformVersion
# properties files
# pass ORG_GRADLE_PROJECT_shortPlatformVersion environment variable to overwrite
shortPlatformVersion=242
shortPlatformVersion=243

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/org/move/ide/actions/CreateMoveFileAction.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.intellij.psi.SmartPointerManager
import com.intellij.psi.createSmartPointer
import com.intellij.util.IncorrectOperationException
import com.jetbrains.rd.util.firstOrNull
import fleet.util.logging.logger
import org.apache.velocity.runtime.parser.ParseException
import org.move.ide.MoveIcons
import org.move.lang.moveProject
Expand Down Expand Up @@ -68,7 +69,7 @@ class CreateMoveFileAction : CreateFileFromTemplateAction(CAPTION, "", MoveIcons
} catch (e: IncorrectOperationException) {
throw e
} catch (e: java.lang.Exception) {
LOG.error(e)
logger<CreateMoveFileAction>().error(e)
}

return null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.move.lang.core.completion

import com.intellij.codeInsight.completion.CompletionConfidence
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.util.ThreeState
Expand All @@ -12,7 +13,12 @@ import org.move.lang.core.psi.ext.elementType
import org.move.lang.core.psi.ext.bindingOwner

class MvCompletionConfidence : CompletionConfidence() {
override fun shouldSkipAutopopup(contextElement: PsiElement, psiFile: PsiFile, offset: Int): ThreeState {
override fun shouldSkipAutopopup(
editor: Editor,
contextElement: PsiElement,
psiFile: PsiFile,
offset: Int
): ThreeState {
// Don't show completion popup when typing a `let binding` identifier starting with a lowercase letter.
// If the identifier is uppercase, the user probably wants to type a destructuring pattern
// (`let Foo { ... }`), so we show the completion popup in this case
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/org/move/openapiext/ui.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fun pathField(
): TextFieldWithBrowseButton {
val component = TextFieldWithBrowseButton(null, parentDisposable)
component.addBrowseFolderListener(
dialogTitle, null, null,
null,
fileChooserDescriptor,
TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT
)
Expand All @@ -62,14 +62,14 @@ fun pathField(

fun JTextField.addTextChangeListener(listener: (DocumentEvent) -> Unit) {
document.addDocumentListener(
object : DocumentAdapter() {
object: DocumentAdapter() {
override fun textChanged(e: DocumentEvent) {
listener(e)
}
}
)
}

fun <T : JComponent> Row.fullWidthCell(component: T): Cell<T> {
fun <T: JComponent> Row.fullWidthCell(component: T): Cell<T> {
return cell(component).align(AlignX.FILL)
}
3 changes: 2 additions & 1 deletion src/main/kotlin/org/move/utils/ui/UiUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import com.intellij.ui.dsl.builder.Row
import com.intellij.ui.layout.ValidationInfoBuilder
import com.intellij.util.PsiErrorElementUtil
import com.intellij.util.text.nullize
import org.move.openapiext.project
import java.nio.file.Path
import java.nio.file.Paths
import javax.swing.JLabel
Expand Down Expand Up @@ -113,7 +114,7 @@ class WorkingDirectoryField : LabeledComponent<TextFieldWithBrowseButton>() {
val fileChooser = FileChooserDescriptorFactory.createSingleFolderDescriptor().apply {
title = ExecutionBundle.message("select.working.directory.message")
}
addBrowseFolderListener(null, null, null, fileChooser)
addBrowseFolderListener(null, fileChooser)
}
text = ExecutionBundle.message("run.configuration.working.directory.label")
}
Expand Down

0 comments on commit 947646b

Please sign in to comment.