Fixed deprecation warnings in the code.

exigow · Jul 23, 2023 · 059436c · 059436c
1 parent 375f3c4
commit 059436c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/src/main/kotlin/common/Icons.kt b/src/main/kotlin/common/Icons.kt
@@ -8,7 +8,8 @@ import javax.swing.Icon
 
 object Icons {
 
-    val GDSCRIPT_FILE = IconLoader.getIcon("/fileIcon.png")
+    @JvmField
+    val GDSCRIPT_FILE = IconLoader.getIcon("/fileIcon.png", javaClass)
     val TSCN_FILE: Icon = FileTypes.Config
     val JSON_FILE: Icon = FileTypes.Json
     val ANY_FILE: Icon = FileTypes.Any_type

diff --git a/src/main/kotlin/gdscript/annotation/ResourceAnnotator.kt b/src/main/kotlin/gdscript/annotation/ResourceAnnotator.kt
@@ -2,6 +2,7 @@ package gdscript.annotation
 
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
+import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
@@ -19,7 +20,8 @@ class ResourceAnnotator : Annotator {
             val project: VirtualFile = ResourceUtil.findProject(element) ?: return
             val path: String = ResourceUtil.cleanResource(element.text)
             if (VfsUtilCore.findRelativeFile(path, project) == null)
-                holder.createWeakWarningAnnotation(element, "Cannot resolve resource '$path'")
+                holder.newAnnotation(HighlightSeverity.WEAK_WARNING, "Cannot resolve resource '$path'")
+                        .range(element).create()
         }
     }
 

diff --git a/src/main/kotlin/gdscript/annotation/utils.kt b/src/main/kotlin/gdscript/annotation/utils.kt
@@ -1,10 +1,13 @@
 package gdscript.annotation
 
 import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.psi.PsiElement
 
 fun AnnotationHolder.createTextAttributesAnnotation(element: PsiElement, textAttributes: TextAttributesKey) {
-    val annotation = createInfoAnnotation(element, null)
-    annotation.textAttributes = textAttributes
+    newAnnotation(HighlightSeverity.INFORMATION, "")
+            .range(element)
+            .textAttributes(textAttributes)
+            .create()
 }
diff --git a/src/main/kotlin/tscn/psi/reference/TscnResourceExtReference.kt b/src/main/kotlin/tscn/psi/reference/TscnResourceExtReference.kt
@@ -6,7 +6,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiReferenceBase
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.psi.util.parentOfType
+import com.intellij.psi.util.parentOfTypes
 import common.ResourceUtil
 import tscn.psi.TscnAttribute
 import tscn.psi.TscnExtEntry
@@ -23,7 +23,7 @@ class TscnResourceExtReference(element: TscnExtExpression) :
             .flatMap { entry -> PsiTreeUtil.getChildrenOfType(entry, TscnAttribute::class.java).orEmpty().asIterable() }
             .filter { attribute -> attribute.key.text == "id" }
             .find { attribute -> attribute.value.text.toIntOrNull() == id }
-            ?.parentOfType(TscnExtEntry::class)
+            ?.parentOfTypes(TscnExtEntry::class)
             ?: return null
         val resourcePath = entry.attributeList.find { it.key.text.equals("path") }?.value?.text
             ?: return null

diff --git a/src/main/kotlin/tscn/psi/reference/TscnResourceSubReference.kt b/src/main/kotlin/tscn/psi/reference/TscnResourceSubReference.kt
@@ -4,7 +4,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReferenceBase
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.psi.util.parentOfType
+import com.intellij.psi.util.parentOfTypes
 import tscn.psi.TscnAttribute
 import tscn.psi.TscnSubEntry
 import tscn.psi.TscnSubExpression
@@ -20,7 +20,7 @@ class TscnResourceSubReference(element: TscnSubExpression) :
             .flatMap { entry -> PsiTreeUtil.getChildrenOfType(entry, TscnAttribute::class.java).orEmpty().asIterable() }
             .filter { attribute -> attribute.key.text == "id" }
             .find { attribute -> attribute.value.text.toIntOrNull() == id }
-            ?.parentOfType(TscnSubEntry::class)
+            ?.parentOfTypes(TscnSubEntry::class)
     }
 
 }