Skip to content

Commit e251799

Browse files
committed
Update required sdk version to 2024.3
1 parent a907777 commit e251799

18 files changed

+37
-43
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
### Changed
6+
7+
- Update required IntelliJ version to 2024.3.
8+
59
## [1.7.0] - 2024-12-16
610

711
### Added

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ pluginName = RuneScript
33
pluginRepositoryUrl = https://github.com/waleedyaseen/intellij-runescript
44
pluginVersion = 1.7.0
55

6-
pluginSinceBuild = 232
6+
pluginSinceBuild = 243
77
pluginUntilBuild = 243.*
88

99
platformType = IC
10-
platformVersion = 2023.2
10+
platformVersion = 2024.3
1111

1212
platformPlugins =
1313
platformBundledPlugins = com.intellij.java,org.toml.lang

src/main/kotlin/io/runescript/plugin/ide/codeInsight/RsGosubParameterInfoProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.intellij.lang.parameterInfo.ParameterInfoUIContext
66
import com.intellij.lang.parameterInfo.UpdateParameterInfoContext
77
import com.intellij.psi.tree.IElementType
88
import com.intellij.psi.util.parentOfType
9-
import com.intellij.refactoring.suggested.startOffset
9+
import com.intellij.psi.util.startOffset
1010
import io.runescript.plugin.lang.psi.*
1111

1212
class RsGosubParameterInfoProvider : ParameterInfoHandlerWithTabActionSupport<RsArgumentList, CallInfo, RsExpression> {

src/main/kotlin/io/runescript/plugin/ide/codeInsight/RsInlayParameterHintsProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.runescript.plugin.ide.codeInsight
33
import com.intellij.codeInsight.hints.InlayInfo
44
import com.intellij.codeInsight.hints.InlayParameterHintsProvider
55
import com.intellij.psi.PsiElement
6-
import com.intellij.refactoring.suggested.startOffset
6+
import com.intellij.psi.util.startOffset
77
import io.runescript.plugin.lang.psi.*
88

99
@Suppress("UnstableApiUsage")

src/main/kotlin/io/runescript/plugin/ide/folding/RsFoldingBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.intellij.openapi.util.TextRange
99
import com.intellij.psi.PsiComment
1010
import com.intellij.psi.PsiElement
1111
import com.intellij.psi.util.PsiTreeUtil
12-
import com.intellij.refactoring.suggested.endOffset
13-
import com.intellij.refactoring.suggested.startOffset
12+
import com.intellij.psi.util.endOffset
13+
import com.intellij.psi.util.startOffset
1414
import io.runescript.plugin.lang.psi.*
1515

1616
class RsFoldingBuilder : FoldingBuilderEx(), DumbAware {

src/main/kotlin/io/runescript/plugin/ide/highlight/RsHighlightingAnnotator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import com.intellij.lang.annotation.Annotator
66
import com.intellij.openapi.editor.colors.TextAttributesKey
77
import com.intellij.openapi.util.TextRange
88
import com.intellij.psi.PsiElement
9-
import com.intellij.refactoring.suggested.endOffset
10-
import com.intellij.refactoring.suggested.startOffset
9+
import com.intellij.psi.util.endOffset
10+
import com.intellij.psi.util.startOffset
1111
import io.runescript.plugin.lang.psi.*
1212
import io.runescript.plugin.symbollang.psi.RsSymSymbol
1313

src/main/kotlin/io/runescript/plugin/ide/inspections/RuneScriptMissingScriptSymbolInspection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.intellij.codeInspection.ProblemHighlightType
55
import com.intellij.codeInspection.ProblemsHolder
66
import com.intellij.openapi.util.TextRange
77
import com.intellij.psi.PsiElementVisitor
8-
import com.intellij.refactoring.suggested.endOffset
9-
import com.intellij.refactoring.suggested.startOffset
8+
import com.intellij.psi.util.endOffset
9+
import com.intellij.psi.util.startOffset
1010
import io.runescript.plugin.ide.RsBundle
1111
import io.runescript.plugin.lang.psi.*
1212
import io.runescript.plugin.lang.psi.type.RsPrimitiveType

src/main/kotlin/io/runescript/plugin/ide/neptune/NeptuneSystemSettingsControl.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,12 @@ class NeptuneSystemSettingsControl(private val settings: NeptuneSettings) :
7979
val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
8080
.withPathToTextConvertor(::getPresentablePath)
8181
.withTextToPathConvertor(::getCanonicalPath)
82-
@Suppress("UnstableApiUsage")
83-
textFieldWithBrowseButton("Neptune Home:", null, fileChooserDescriptor)
84-
.bindText(neptuneHomeProperty.toUiPathProperty())
82+
.withTitle("Neptune Home:")
83+
textFieldWithBrowseButton(
84+
fileChooserDescriptor = fileChooserDescriptor,
85+
project = null,
86+
fileChosen = null
87+
).bindText(neptuneHomeProperty.toUiPathProperty())
8588
.trimmedTextValidation(CHECK_NON_EMPTY, CHECK_DIRECTORY)
8689
.validationInfo { validateNeptuneHome() }
8790
.align(AlignX.FILL)

src/main/kotlin/io/runescript/plugin/ide/projectWizard/NeptuneModuleBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class NeptuneModuleBuilder :
6868
RsProjectTemplate.generateTemplate(module, moduleContentEntry, modelContentRootDir)
6969
}
7070

71-
override fun createProject(name: String?, path: String?): Project? {
71+
override fun createProject(name: String, path: String): Project? {
7272
creatingNewProject = true
7373
return super.createProject(name, path)
7474
}

src/main/kotlin/io/runescript/plugin/ide/searchEverywhere/RsSearchEverywhereContributor.kt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class RsSearchEverywhereContributor(event: AnActionEvent) : AbstractGotoSEContri
3333
}
3434

3535
override fun getActions(onChanged: Runnable): List<AnAction> {
36-
return doGetActions(filter, RsTriggerFilterCollector(), onChanged)
36+
return doGetActions(filter, null, onChanged)
3737
}
3838

3939
override fun isEmptyPatternSupported(): Boolean {
@@ -46,7 +46,14 @@ class RsSearchEverywhereContributor(event: AnActionEvent) : AbstractGotoSEContri
4646
}
4747

4848
override fun createExtendedInfo(): ExtendedInfo {
49-
return createPsiExtendedInfo()
49+
return createPsiExtendedInfo(psiElement = { null })
50+
}
51+
52+
override fun createRightActions(
53+
registerShortcut: (AnAction) -> Unit,
54+
onChanged: Runnable
55+
): List<AnAction> {
56+
return ContainerUtil.emptyList()
5057
}
5158

5259
class Factory : SearchEverywhereContributorFactory<Any> {
@@ -59,16 +66,6 @@ class RsSearchEverywhereContributor(event: AnActionEvent) : AbstractGotoSEContri
5966
}
6067
}
6168

62-
override fun createRightActions(pattern: String, onChanged: Runnable): List<AnAction> {
63-
return ContainerUtil.emptyList();
64-
}
65-
66-
@Suppress("unused")
67-
fun createRightActions(registerShortcut: (AnAction) -> Unit, onChanged: Runnable): List<AnAction> {
68-
// For compatability with 241
69-
return ContainerUtil.emptyList();
70-
}
71-
7269
companion object {
7370
fun createTriggerFilter(project: Project): PersistentSearchEverywhereContributorFilter<RsTriggerRef> {
7471
val items = RsTriggerRef.forAllTriggers()

0 commit comments

Comments
 (0)