User: rednesto
Date: 14 Jul 24 13:03
Revision: 60004c27fb4d694fddeb7d4732820b0f6662a8b6
Summary:
2024.2 post-merge fixes


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9449&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 03d5aaaa2f72399dd13d7d1637dceffa60a5d3ad)
+++ build.gradle.kts	(revision 60004c27fb4d694fddeb7d4732820b0f6662a8b6)
@@ -246,6 +246,8 @@
 intellijPlatform {
     sandboxContainer.set(layout.projectDirectory.dir(".sandbox"))
 
+    instrumentCode = false
+
     verifyPlugin {
         ides {
             recommended()
@@ -471,14 +473,6 @@
     enabled = false
 }
 
-tasks.instrumentCode {
-    enabled = false
-}
-
-tasks.instrumentedJar {
-    enabled = false
-}
-
 tasks.verifyPluginProjectConfiguration {
     // Breaks since IJGP 2.0.0-beta5 :(
     setDependsOn(emptyList<Any>())
Index: src/main/kotlin/creator/custom/CustomPlatformStep.kt
===================================================================
--- src/main/kotlin/creator/custom/CustomPlatformStep.kt	(revision 03d5aaaa2f72399dd13d7d1637dceffa60a5d3ad)
+++ src/main/kotlin/creator/custom/CustomPlatformStep.kt	(revision 60004c27fb4d694fddeb7d4732820b0f6662a8b6)
@@ -46,7 +46,6 @@
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.module.ModuleManager
-import com.intellij.openapi.module.ModuleTypeId
 import com.intellij.openapi.observable.util.transform
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
@@ -529,7 +528,7 @@
 
     private fun setupTempRootModule(project: Project, projectPath: Path) {
         val modifiableModel = ModuleManager.getInstance(project).getModifiableModel()
-        val module = modifiableModel.newNonPersistentModule("mcdev-temp-root", ModuleTypeId.JAVA_MODULE)
+        val module = modifiableModel.newNonPersistentModule("mcdev-temp-root", "")
         val rootsModel = ModuleRootManager.getInstance(module).modifiableModel
         rootsModel.addContentEntry(projectPath.virtualFileOrError)
         rootsModel.commit()
Index: src/main/kotlin/creator/custom/ResourceBundleTranslator.kt
===================================================================
--- src/main/kotlin/creator/custom/ResourceBundleTranslator.kt	(revision 03d5aaaa2f72399dd13d7d1637dceffa60a5d3ad)
+++ src/main/kotlin/creator/custom/ResourceBundleTranslator.kt	(revision 60004c27fb4d694fddeb7d4732820b0f6662a8b6)
@@ -31,11 +31,13 @@
 
     abstract val bundle: ResourceBundle?
 
-    fun translate(key: @NonNls String): @Nls String {
+    @Nls
+    fun translate(key: @NonNls String): String {
         return translateOrNull(key) ?: StringUtil.escapeMnemonics(key)
     }
 
-    fun translateOrNull(key: @NonNls String): @Nls String? {
+    @Nls
+    fun translateOrNull(key: @NonNls String): String? {
         if (bundle != null) {
             try {
                 return bundle!!.getString(key)
Index: src/main/kotlin/platform/mixin/expression/MEExpressionCompletionUtil.kt
===================================================================
--- src/main/kotlin/platform/mixin/expression/MEExpressionCompletionUtil.kt	(revision 03d5aaaa2f72399dd13d7d1637dceffa60a5d3ad)
+++ src/main/kotlin/platform/mixin/expression/MEExpressionCompletionUtil.kt	(revision 60004c27fb4d694fddeb7d4732820b0f6662a8b6)
@@ -102,11 +102,11 @@
 import com.intellij.psi.PsiModifierList
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.codeStyle.JavaCodeStyleManager
+import com.intellij.psi.createSmartPointer
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageEditorUtil
 import com.intellij.psi.tree.TokenSet
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiUtil
-import com.intellij.psi.util.createSmartPointer
 import com.intellij.psi.util.parentOfType
 import com.intellij.psi.util.parents
 import com.intellij.util.PlatformIcons
@@ -1143,7 +1143,7 @@
         )
 
         val prevCursorPosInLiteral = hostEditor.caretModel.offset - hostElement.textRange.startOffset
-        val hostElementPtr = hostElement.createSmartPointer(project)
+        val hostElementPtr = hostElement.createSmartPointer()
         hostEditor.caretModel.moveToOffset(annotation.textRange.startOffset)
         TemplateManager.getInstance(project).startTemplate(
             hostEditor,