Merge pull request #32 from csense-oss/2.1.3

2.1.3

Author: Tvede-dk

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 val javaVersion = "11"
 
 group = "csense-idea"
-version = "2.1.2"
+version = "2.1.3"
 
 intellij {
     updateSinceUntilBuild.set(false)
@@ -35,7 +35,7 @@ dependencies {
     //https://github.com/csense-oss/csense-kotlin-annotations
     implementation("csense.kotlin:csense-kotlin-annotations-jvm:0.0.63")
     //https://github.com/csense-oss/idea-kotlin-shared-base
-    implementation("csense.idea.base:csense-idea-base:0.1.63")
+    implementation("csense.idea.base:csense-idea-base:0.1.65")
     //https://github.com/Kotlin/kotlinx.serialization
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
     //https://github.com/Kotlin/kotlinx.coroutines
@@ -49,11 +49,8 @@ dependencies {
 tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml") {
     changeNotes.set(
         """
-            Fixes
         <ul>
-          <li> Fixes a lot of issues with respect to throw expressions (also causes a thrown exception to be interpreted as Exception https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/26 )</li>
-          <li> QuickFixes (CSense detects Throws annotation only if lambda provides callsInPlace contract https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/27) </li>
-          <li> Method references are now resolved (method references are not marked https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/28) </li>
+          <li>Fix for bad wrap in try catch (https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/31) </li>
         </ul>
       """
     )

changelog.md

@@ -1,3 +1,6 @@
+# 2.1.3
+- Fixed a bug in wrap in try catch (copping off code) https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/31
+- 
 # 2.1.2
 - Fixes a lot of issues with respect to throw expressions (also causes a thrown exception to be interpreted as Exception https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/26 )
 - QuickFixes (CSense detects Throws annotation only if lambda provides callsInPlace contract https://github.com/csense-oss/idea-kotlin-checked-exceptions/issues/27)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/csense/idea/kotlin/checked/exceptions/bll/files/CachedFileInMemory.kt

@@ -1,6 +1,7 @@
 package csense.idea.kotlin.checked.exceptions.bll.files
 
 import com.intellij.openapi.project.*
+import csense.idea.base.files.*
 import csense.kotlin.extensions.*
 import csense.kotlin.extensions.collections.*
 import java.nio.file.*

src/main/kotlin/csense/idea/kotlin/checked/exceptions/bll/files/CachedFqNameFunctionParameterStorage.kt

@@ -21,9 +21,19 @@ class WrapInTryCatchQuickFix(
         )
     }
 
+    @Throws(com.intellij.util.IncorrectOperationException::class)
     override fun tryUpdate(project: Project, file: PsiFile, element: KtCallExpression): PsiElement {
-        val newElement: KtExpression = createTryCatchWithElement(element, forFile = file)
-        return element.replace(newElement)
+        val top: KtElement = element.resolveToTop()
+        val newElement: KtExpression = createTryCatchWithElement(top, forFile = file)
+        return top.replace(newElement)
+    }
+
+    private fun KtCallExpression.resolveToTop(): KtElement {
+        val parent: PsiElement? = parent
+        if (parent is KtDotQualifiedExpression) {
+            return parent
+        }
+        return this
     }
 
 
@@ -68,5 +78,4 @@ fun KtPsiClass.catchParameterCode(forFile: PsiFile): String {
             }
         """.trimIndent()
     return result
-}
-
+}

src/main/kotlin/csense/idea/kotlin/checked/exceptions/quickfixes/wrap/WrapInTryCatchQuickFix.kt

@@ -1,5 +1,10 @@
 # missing todos
 
+
+- @Throws on overriden methods that does not declare throws in base interface / class
+
+
+
 - tell if certain exceptions are NOT thrown but declared.
 - detect when there are overlaps in catch clauses (e.g. throwable followed by more specific type...)
 - handle "*arrayOf(exception::class, exception2::class)" ....