Skip to content

Commit

Permalink
Update required sdk version to 2024.3
Browse files Browse the repository at this point in the history
  • Loading branch information
waleedyaseen committed Jan 12, 2025
1 parent a907777 commit e251799
Showing 18 changed files with 37 additions and 43 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

## [Unreleased]

### Changed

- Update required IntelliJ version to 2024.3.

## [1.7.0] - 2024-12-16

### Added
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ pluginName = RuneScript
pluginRepositoryUrl = https://github.com/waleedyaseen/intellij-runescript
pluginVersion = 1.7.0

pluginSinceBuild = 232
pluginSinceBuild = 243
pluginUntilBuild = 243.*

platformType = IC
platformVersion = 2023.2
platformVersion = 2024.3

platformPlugins =
platformBundledPlugins = com.intellij.java,org.toml.lang
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import com.intellij.lang.parameterInfo.ParameterInfoUIContext
import com.intellij.lang.parameterInfo.UpdateParameterInfoContext
import com.intellij.psi.tree.IElementType
import com.intellij.psi.util.parentOfType
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.*

class RsGosubParameterInfoProvider : ParameterInfoHandlerWithTabActionSupport<RsArgumentList, CallInfo, RsExpression> {
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package io.runescript.plugin.ide.codeInsight
import com.intellij.codeInsight.hints.InlayInfo
import com.intellij.codeInsight.hints.InlayParameterHintsProvider
import com.intellij.psi.PsiElement
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.*

@Suppress("UnstableApiUsage")
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.suggested.endOffset
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.endOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.*

class RsFoldingBuilder : FoldingBuilderEx(), DumbAware {
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import com.intellij.lang.annotation.Annotator
import com.intellij.openapi.editor.colors.TextAttributesKey
import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement
import com.intellij.refactoring.suggested.endOffset
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.endOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.*
import io.runescript.plugin.symbollang.psi.RsSymSymbol

Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.codeInspection.ProblemsHolder
import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElementVisitor
import com.intellij.refactoring.suggested.endOffset
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.endOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.ide.RsBundle
import io.runescript.plugin.lang.psi.*
import io.runescript.plugin.lang.psi.type.RsPrimitiveType
Original file line number Diff line number Diff line change
@@ -79,9 +79,12 @@ class NeptuneSystemSettingsControl(private val settings: NeptuneSettings) :
val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
.withPathToTextConvertor(::getPresentablePath)
.withTextToPathConvertor(::getCanonicalPath)
@Suppress("UnstableApiUsage")
textFieldWithBrowseButton("Neptune Home:", null, fileChooserDescriptor)
.bindText(neptuneHomeProperty.toUiPathProperty())
.withTitle("Neptune Home:")
textFieldWithBrowseButton(
fileChooserDescriptor = fileChooserDescriptor,
project = null,
fileChosen = null
).bindText(neptuneHomeProperty.toUiPathProperty())
.trimmedTextValidation(CHECK_NON_EMPTY, CHECK_DIRECTORY)
.validationInfo { validateNeptuneHome() }
.align(AlignX.FILL)
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ class NeptuneModuleBuilder :
RsProjectTemplate.generateTemplate(module, moduleContentEntry, modelContentRootDir)
}

override fun createProject(name: String?, path: String?): Project? {
override fun createProject(name: String, path: String): Project? {
creatingNewProject = true
return super.createProject(name, path)
}
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ class RsSearchEverywhereContributor(event: AnActionEvent) : AbstractGotoSEContri
}

override fun getActions(onChanged: Runnable): List<AnAction> {
return doGetActions(filter, RsTriggerFilterCollector(), onChanged)
return doGetActions(filter, null, onChanged)
}

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

override fun createExtendedInfo(): ExtendedInfo {
return createPsiExtendedInfo()
return createPsiExtendedInfo(psiElement = { null })
}

override fun createRightActions(
registerShortcut: (AnAction) -> Unit,
onChanged: Runnable
): List<AnAction> {
return ContainerUtil.emptyList()
}

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

override fun createRightActions(pattern: String, onChanged: Runnable): List<AnAction> {
return ContainerUtil.emptyList();
}

@Suppress("unused")
fun createRightActions(registerShortcut: (AnAction) -> Unit, onChanged: Runnable): List<AnAction> {
// For compatability with 241
return ContainerUtil.emptyList();
}

companion object {
fun createTriggerFilter(project: Project): PersistentSearchEverywhereContributorFilter<RsTriggerRef> {
val items = RsTriggerRef.forAllTriggers()

This file was deleted.

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement
import com.intellij.lang.ASTNode
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.RsConstantExpression
import io.runescript.plugin.lang.psi.RsPsiImplUtil
import io.runescript.plugin.lang.psi.refs.RsConstantReference
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import com.intellij.psi.search.SearchScope
import com.intellij.psi.stubs.IStubElementType
import com.intellij.psi.tree.IElementType
import com.intellij.psi.util.parentOfType
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.ide.doc.findDoc
import io.runescript.plugin.lang.psi.*
import io.runescript.plugin.lang.psi.refs.RsLocalVariableReference
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.SearchScope
import com.intellij.psi.stubs.IStubElementType
import com.intellij.psi.tree.IElementType
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.RsPsiImplUtil
import io.runescript.plugin.lang.psi.RsScopedVariableExpression
import io.runescript.plugin.lang.psi.refs.RsScopedVariableReference
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import com.intellij.psi.stubs.IStubElementType
import com.intellij.psi.tree.IElementType
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.ide.RsIcons
import io.runescript.plugin.ide.codeInsight.controlFlow.RsControlFlow
import io.runescript.plugin.ide.codeInsight.controlFlow.RsControlFlowBuilder
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package io.runescript.plugin.lang.psi.mixin
import com.intellij.extapi.psi.ASTWrapperPsiElement
import com.intellij.lang.ASTNode
import com.intellij.psi.PsiElement
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.lang.psi.RsElementGenerator
import io.runescript.plugin.lang.psi.RsStringLiteralExpression
import io.runescript.plugin.lang.psi.isHookExpression
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import com.intellij.lang.injection.InjectedLanguageManager
import com.intellij.psi.PsiElement
import com.intellij.psi.util.findParentOfType
import com.intellij.psi.util.parentOfType
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import com.intellij.util.SmartList
import io.runescript.plugin.ide.RsBundle
import io.runescript.plugin.lang.psi.*
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.SearchScope
import com.intellij.psi.stubs.IStubElementType
import com.intellij.psi.tree.IElementType
import com.intellij.refactoring.suggested.startOffset
import com.intellij.psi.util.startOffset
import io.runescript.plugin.symbollang.psi.RsSymPsiImplUtil
import io.runescript.plugin.symbollang.psi.RsSymSymbol
import io.runescript.plugin.symbollang.psi.isConstantFile

0 comments on commit e251799

Please sign in to comment.