From 4c05414fa465d238a2fff2d18abffbd78a80baad Mon Sep 17 00:00:00 2001 From: Emil Kantis Date: Fri, 21 Jun 2024 04:38:38 +0200 Subject: [PATCH] Cleaning up IDE version differentiated files where files are identical (#303) --- .../kotest/plugin/intellij/contentFactory.kt | 5 - .../io/kotest/plugin/intellij/findeditor.kt | 6 - .../io/kotest/plugin/intellij/fqnames.kt | 7 -- .../kotest/plugin/intellij/inspectionsuper.kt | 5 - .../io/kotest/plugin/intellij/markers.kt | 18 --- .../structure/KotestStructureViewExtension.kt | 68 ----------- src/IC-231/resources/META-INF/plugin.xml | 113 ------------------ .../kotest/plugin/intellij/contentFactory.kt | 5 - .../io/kotest/plugin/intellij/findeditor.kt | 6 - .../io/kotest/plugin/intellij/fqnames.kt | 7 -- .../kotest/plugin/intellij/inspectionsuper.kt | 5 - .../io/kotest/plugin/intellij/markers.kt | 18 --- .../structure/KotestStructureViewExtension.kt | 68 ----------- src/IC-232/resources/META-INF/plugin.xml | 113 ------------------ .../kotest/plugin/intellij/contentFactory.kt | 5 - .../io/kotest/plugin/intellij/findeditor.kt | 6 - .../io/kotest/plugin/intellij/fqnames.kt | 7 -- .../kotest/plugin/intellij/inspectionsuper.kt | 5 - .../io/kotest/plugin/intellij/markers.kt | 18 --- .../structure/KotestStructureViewExtension.kt | 68 ----------- src/IC-233/resources/META-INF/plugin.xml | 113 ------------------ .../kotest/plugin/intellij/contentFactory.kt | 5 - .../io/kotest/plugin/intellij/findeditor.kt | 6 - .../io/kotest/plugin/intellij/fqnames.kt | 7 -- .../kotest/plugin/intellij/inspectionsuper.kt | 5 - .../io/kotest/plugin/intellij/markers.kt | 18 --- .../structure/KotestStructureViewExtension.kt | 68 ----------- src/IC-241/resources/META-INF/plugin.xml | 113 ------------------ .../kotest/plugin/intellij/contentFactory.kt | 5 - .../io/kotest/plugin/intellij/findeditor.kt | 6 - .../io/kotest/plugin/intellij/fqnames.kt | 7 -- .../kotest/plugin/intellij/inspectionsuper.kt | 5 - .../io/kotest/plugin/intellij/markers.kt | 18 --- .../structure/KotestStructureViewExtension.kt | 68 ----------- src/IC-242/resources/META-INF/plugin.xml | 113 ------------------ .../kotest/plugin/intellij/contentFactory.kt | 0 .../io/kotest/plugin/intellij/findeditor.kt | 0 .../io/kotest/plugin/intellij/fqnames.kt | 0 .../kotest/plugin/intellij/inspectionsuper.kt | 0 .../io/kotest/plugin/intellij/markers.kt | 0 .../structure/KotestStructureViewExtension.kt | 0 .../resources/META-INF/plugin.xml | 0 42 files changed, 1110 deletions(-) delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/contentFactory.kt delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/findeditor.kt delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/fqnames.kt delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/markers.kt delete mode 100644 src/IC-231/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt delete mode 100644 src/IC-231/resources/META-INF/plugin.xml delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/contentFactory.kt delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/findeditor.kt delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/fqnames.kt delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/markers.kt delete mode 100644 src/IC-232/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt delete mode 100644 src/IC-232/resources/META-INF/plugin.xml delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/contentFactory.kt delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/findeditor.kt delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/fqnames.kt delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/markers.kt delete mode 100644 src/IC-233/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt delete mode 100644 src/IC-233/resources/META-INF/plugin.xml delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/contentFactory.kt delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/findeditor.kt delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/fqnames.kt delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/markers.kt delete mode 100644 src/IC-241/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt delete mode 100644 src/IC-241/resources/META-INF/plugin.xml delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/contentFactory.kt delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/findeditor.kt delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/fqnames.kt delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/markers.kt delete mode 100644 src/IC-242/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt delete mode 100644 src/IC-242/resources/META-INF/plugin.xml rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/contentFactory.kt (100%) rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/findeditor.kt (100%) rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/fqnames.kt (100%) rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt (100%) rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/markers.kt (100%) rename src/{IC-223 => main}/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt (100%) rename src/{IC-223 => main}/resources/META-INF/plugin.xml (100%) diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/contentFactory.kt deleted file mode 100644 index 3cd76f88..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/contentFactory.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.ui.content.ContentFactory - -fun getContentFactory(): ContentFactory = ContentFactory.getInstance() diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/findeditor.kt deleted file mode 100644 index aeb4fca5..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/findeditor.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor - -fun PsiElement.existingEditor() = this.findExistingEditor() diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/fqnames.kt deleted file mode 100644 index 5318e346..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/fqnames.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.base.psi.kotlinFqName -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtClassOrObject - -fun KtClassOrObject.fqname(): FqName? = this.kotlinFqName diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt deleted file mode 100644 index 9ea4f784..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - -abstract class AbstractInspection : AbstractKotlinInspection() diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/markers.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/markers.kt deleted file mode 100644 index 6bd63cde..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/markers.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.openapi.editor.markup.GutterIconRenderer -import com.intellij.openapi.editor.markup.MarkupEditorFilter -import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory -import com.intellij.psi.PsiElement -import com.intellij.util.Functions -import javax.swing.Icon - -/** - * A Line marker that does not appear in diffs - */ -class MainEditorLineMarkerInfo(element: PsiElement, text: String, icon: Icon) : LineMarkerInfo( - element, element.textRange, icon, Functions.constant(text), null, GutterIconRenderer.Alignment.LEFT, { text } -) { - override fun getEditorFilter(): MarkupEditorFilter = MarkupEditorFilterFactory.createIsNotDiffFilter() -} diff --git a/src/IC-231/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/IC-231/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt deleted file mode 100644 index 8aa0e602..00000000 --- a/src/IC-231/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt +++ /dev/null @@ -1,68 +0,0 @@ -package io.kotest.plugin.intellij.structure - -import com.intellij.icons.AllIcons -import com.intellij.ide.structureView.StructureViewExtension -import com.intellij.ide.structureView.StructureViewTreeElement -import com.intellij.ide.util.treeView.smartTree.TreeElement -import com.intellij.navigation.ItemPresentation -import com.intellij.openapi.editor.Editor -import com.intellij.psi.NavigatablePsiElement -import com.intellij.psi.PsiElement -import io.kotest.plugin.intellij.TestElement -import io.kotest.plugin.intellij.psi.specStyle -import org.jetbrains.kotlin.psi.KtClassOrObject -import javax.swing.Icon - -class KotestStructureViewExtension : StructureViewExtension { - - override fun getType(): Class { - return KtClassOrObject::class.java - } - - override fun getChildren(parent: PsiElement): Array { - val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray() - val spec = ktClassOrObject.specStyle() ?: return emptyArray() - val tests = spec.tests(parent, false) - return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - class KotestTestStructureViewTreeElement(private val test: TestElement) : StructureViewTreeElement { - override fun getPresentation(): ItemPresentation { - return object : ItemPresentation { - override fun getIcon(unused: Boolean): Icon { - return AllIcons.Nodes.Test - } - - override fun getPresentableText(): String { - return test.test.name.displayName() - } - } - } - - override fun getChildren(): Array { - return test.nestedTests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - override fun navigate(requestFocus: Boolean) { - if (test.psi is NavigatablePsiElement) { - test.psi.navigate(true) - } - } - - override fun canNavigate(): Boolean { - return true - } - - override fun canNavigateToSource(): Boolean { - return true - } - - override fun getValue(): Any { - return test - } - } - - override fun getCurrentEditorElement(editor: Editor?, parent: PsiElement?): Any? { - return null - } -} diff --git a/src/IC-231/resources/META-INF/plugin.xml b/src/IC-231/resources/META-INF/plugin.xml deleted file mode 100644 index ef2d22a2..00000000 --- a/src/IC-231/resources/META-INF/plugin.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - kotest-plugin-intellij - Kotest - - Kotest - - Kotest.

- This plugin requires the use of Kotest 4.2.0 or newer. - ]]>
- - - 1.0.0 - - - org.jetbrains.kotlin - com.intellij.modules.java - org.jetbrains.plugins.gradle - org.intellij.intelliLang - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.kotest.plugin.intellij.intentions.SoftAssertIntention - Kotlin/Test - SoftAssertIntention - - - - io.kotest.plugin.intellij.intentions.BangIntention - Kotlin/Test - BangIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowIntention - Kotlin/Test - ShouldThrowIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowAnyIntention - Kotlin/Test - ShouldThrowAnyIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowExactlyIntention - Kotlin/Test - ShouldThrowExactlyIntention - - - -
diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/contentFactory.kt deleted file mode 100644 index 3cd76f88..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/contentFactory.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.ui.content.ContentFactory - -fun getContentFactory(): ContentFactory = ContentFactory.getInstance() diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/findeditor.kt deleted file mode 100644 index aeb4fca5..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/findeditor.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor - -fun PsiElement.existingEditor() = this.findExistingEditor() diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/fqnames.kt deleted file mode 100644 index 5318e346..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/fqnames.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.base.psi.kotlinFqName -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtClassOrObject - -fun KtClassOrObject.fqname(): FqName? = this.kotlinFqName diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt deleted file mode 100644 index 9ea4f784..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - -abstract class AbstractInspection : AbstractKotlinInspection() diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/markers.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/markers.kt deleted file mode 100644 index 6bd63cde..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/markers.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.openapi.editor.markup.GutterIconRenderer -import com.intellij.openapi.editor.markup.MarkupEditorFilter -import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory -import com.intellij.psi.PsiElement -import com.intellij.util.Functions -import javax.swing.Icon - -/** - * A Line marker that does not appear in diffs - */ -class MainEditorLineMarkerInfo(element: PsiElement, text: String, icon: Icon) : LineMarkerInfo( - element, element.textRange, icon, Functions.constant(text), null, GutterIconRenderer.Alignment.LEFT, { text } -) { - override fun getEditorFilter(): MarkupEditorFilter = MarkupEditorFilterFactory.createIsNotDiffFilter() -} diff --git a/src/IC-232/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/IC-232/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt deleted file mode 100644 index 8aa0e602..00000000 --- a/src/IC-232/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt +++ /dev/null @@ -1,68 +0,0 @@ -package io.kotest.plugin.intellij.structure - -import com.intellij.icons.AllIcons -import com.intellij.ide.structureView.StructureViewExtension -import com.intellij.ide.structureView.StructureViewTreeElement -import com.intellij.ide.util.treeView.smartTree.TreeElement -import com.intellij.navigation.ItemPresentation -import com.intellij.openapi.editor.Editor -import com.intellij.psi.NavigatablePsiElement -import com.intellij.psi.PsiElement -import io.kotest.plugin.intellij.TestElement -import io.kotest.plugin.intellij.psi.specStyle -import org.jetbrains.kotlin.psi.KtClassOrObject -import javax.swing.Icon - -class KotestStructureViewExtension : StructureViewExtension { - - override fun getType(): Class { - return KtClassOrObject::class.java - } - - override fun getChildren(parent: PsiElement): Array { - val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray() - val spec = ktClassOrObject.specStyle() ?: return emptyArray() - val tests = spec.tests(parent, false) - return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - class KotestTestStructureViewTreeElement(private val test: TestElement) : StructureViewTreeElement { - override fun getPresentation(): ItemPresentation { - return object : ItemPresentation { - override fun getIcon(unused: Boolean): Icon { - return AllIcons.Nodes.Test - } - - override fun getPresentableText(): String { - return test.test.name.displayName() - } - } - } - - override fun getChildren(): Array { - return test.nestedTests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - override fun navigate(requestFocus: Boolean) { - if (test.psi is NavigatablePsiElement) { - test.psi.navigate(true) - } - } - - override fun canNavigate(): Boolean { - return true - } - - override fun canNavigateToSource(): Boolean { - return true - } - - override fun getValue(): Any { - return test - } - } - - override fun getCurrentEditorElement(editor: Editor?, parent: PsiElement?): Any? { - return null - } -} diff --git a/src/IC-232/resources/META-INF/plugin.xml b/src/IC-232/resources/META-INF/plugin.xml deleted file mode 100644 index ef2d22a2..00000000 --- a/src/IC-232/resources/META-INF/plugin.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - kotest-plugin-intellij - Kotest - - Kotest - - Kotest.

- This plugin requires the use of Kotest 4.2.0 or newer. - ]]>
- - - 1.0.0 - - - org.jetbrains.kotlin - com.intellij.modules.java - org.jetbrains.plugins.gradle - org.intellij.intelliLang - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.kotest.plugin.intellij.intentions.SoftAssertIntention - Kotlin/Test - SoftAssertIntention - - - - io.kotest.plugin.intellij.intentions.BangIntention - Kotlin/Test - BangIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowIntention - Kotlin/Test - ShouldThrowIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowAnyIntention - Kotlin/Test - ShouldThrowAnyIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowExactlyIntention - Kotlin/Test - ShouldThrowExactlyIntention - - - -
diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/contentFactory.kt deleted file mode 100644 index 3cd76f88..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/contentFactory.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.ui.content.ContentFactory - -fun getContentFactory(): ContentFactory = ContentFactory.getInstance() diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/findeditor.kt deleted file mode 100644 index aeb4fca5..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/findeditor.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor - -fun PsiElement.existingEditor() = this.findExistingEditor() diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/fqnames.kt deleted file mode 100644 index 5318e346..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/fqnames.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.base.psi.kotlinFqName -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtClassOrObject - -fun KtClassOrObject.fqname(): FqName? = this.kotlinFqName diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt deleted file mode 100644 index 9ea4f784..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - -abstract class AbstractInspection : AbstractKotlinInspection() diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/markers.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/markers.kt deleted file mode 100644 index 6bd63cde..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/markers.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.openapi.editor.markup.GutterIconRenderer -import com.intellij.openapi.editor.markup.MarkupEditorFilter -import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory -import com.intellij.psi.PsiElement -import com.intellij.util.Functions -import javax.swing.Icon - -/** - * A Line marker that does not appear in diffs - */ -class MainEditorLineMarkerInfo(element: PsiElement, text: String, icon: Icon) : LineMarkerInfo( - element, element.textRange, icon, Functions.constant(text), null, GutterIconRenderer.Alignment.LEFT, { text } -) { - override fun getEditorFilter(): MarkupEditorFilter = MarkupEditorFilterFactory.createIsNotDiffFilter() -} diff --git a/src/IC-233/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/IC-233/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt deleted file mode 100644 index 8aa0e602..00000000 --- a/src/IC-233/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt +++ /dev/null @@ -1,68 +0,0 @@ -package io.kotest.plugin.intellij.structure - -import com.intellij.icons.AllIcons -import com.intellij.ide.structureView.StructureViewExtension -import com.intellij.ide.structureView.StructureViewTreeElement -import com.intellij.ide.util.treeView.smartTree.TreeElement -import com.intellij.navigation.ItemPresentation -import com.intellij.openapi.editor.Editor -import com.intellij.psi.NavigatablePsiElement -import com.intellij.psi.PsiElement -import io.kotest.plugin.intellij.TestElement -import io.kotest.plugin.intellij.psi.specStyle -import org.jetbrains.kotlin.psi.KtClassOrObject -import javax.swing.Icon - -class KotestStructureViewExtension : StructureViewExtension { - - override fun getType(): Class { - return KtClassOrObject::class.java - } - - override fun getChildren(parent: PsiElement): Array { - val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray() - val spec = ktClassOrObject.specStyle() ?: return emptyArray() - val tests = spec.tests(parent, false) - return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - class KotestTestStructureViewTreeElement(private val test: TestElement) : StructureViewTreeElement { - override fun getPresentation(): ItemPresentation { - return object : ItemPresentation { - override fun getIcon(unused: Boolean): Icon { - return AllIcons.Nodes.Test - } - - override fun getPresentableText(): String { - return test.test.name.displayName() - } - } - } - - override fun getChildren(): Array { - return test.nestedTests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - override fun navigate(requestFocus: Boolean) { - if (test.psi is NavigatablePsiElement) { - test.psi.navigate(true) - } - } - - override fun canNavigate(): Boolean { - return true - } - - override fun canNavigateToSource(): Boolean { - return true - } - - override fun getValue(): Any { - return test - } - } - - override fun getCurrentEditorElement(editor: Editor?, parent: PsiElement?): Any? { - return null - } -} diff --git a/src/IC-233/resources/META-INF/plugin.xml b/src/IC-233/resources/META-INF/plugin.xml deleted file mode 100644 index ef2d22a2..00000000 --- a/src/IC-233/resources/META-INF/plugin.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - kotest-plugin-intellij - Kotest - - Kotest - - Kotest.

- This plugin requires the use of Kotest 4.2.0 or newer. - ]]>
- - - 1.0.0 - - - org.jetbrains.kotlin - com.intellij.modules.java - org.jetbrains.plugins.gradle - org.intellij.intelliLang - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.kotest.plugin.intellij.intentions.SoftAssertIntention - Kotlin/Test - SoftAssertIntention - - - - io.kotest.plugin.intellij.intentions.BangIntention - Kotlin/Test - BangIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowIntention - Kotlin/Test - ShouldThrowIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowAnyIntention - Kotlin/Test - ShouldThrowAnyIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowExactlyIntention - Kotlin/Test - ShouldThrowExactlyIntention - - - -
diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/contentFactory.kt deleted file mode 100644 index 3cd76f88..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/contentFactory.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.ui.content.ContentFactory - -fun getContentFactory(): ContentFactory = ContentFactory.getInstance() diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/findeditor.kt deleted file mode 100644 index aeb4fca5..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/findeditor.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor - -fun PsiElement.existingEditor() = this.findExistingEditor() diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/fqnames.kt deleted file mode 100644 index 5318e346..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/fqnames.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.base.psi.kotlinFqName -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtClassOrObject - -fun KtClassOrObject.fqname(): FqName? = this.kotlinFqName diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt deleted file mode 100644 index 9ea4f784..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - -abstract class AbstractInspection : AbstractKotlinInspection() diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/markers.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/markers.kt deleted file mode 100644 index 6bd63cde..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/markers.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.openapi.editor.markup.GutterIconRenderer -import com.intellij.openapi.editor.markup.MarkupEditorFilter -import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory -import com.intellij.psi.PsiElement -import com.intellij.util.Functions -import javax.swing.Icon - -/** - * A Line marker that does not appear in diffs - */ -class MainEditorLineMarkerInfo(element: PsiElement, text: String, icon: Icon) : LineMarkerInfo( - element, element.textRange, icon, Functions.constant(text), null, GutterIconRenderer.Alignment.LEFT, { text } -) { - override fun getEditorFilter(): MarkupEditorFilter = MarkupEditorFilterFactory.createIsNotDiffFilter() -} diff --git a/src/IC-241/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/IC-241/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt deleted file mode 100644 index 8aa0e602..00000000 --- a/src/IC-241/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt +++ /dev/null @@ -1,68 +0,0 @@ -package io.kotest.plugin.intellij.structure - -import com.intellij.icons.AllIcons -import com.intellij.ide.structureView.StructureViewExtension -import com.intellij.ide.structureView.StructureViewTreeElement -import com.intellij.ide.util.treeView.smartTree.TreeElement -import com.intellij.navigation.ItemPresentation -import com.intellij.openapi.editor.Editor -import com.intellij.psi.NavigatablePsiElement -import com.intellij.psi.PsiElement -import io.kotest.plugin.intellij.TestElement -import io.kotest.plugin.intellij.psi.specStyle -import org.jetbrains.kotlin.psi.KtClassOrObject -import javax.swing.Icon - -class KotestStructureViewExtension : StructureViewExtension { - - override fun getType(): Class { - return KtClassOrObject::class.java - } - - override fun getChildren(parent: PsiElement): Array { - val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray() - val spec = ktClassOrObject.specStyle() ?: return emptyArray() - val tests = spec.tests(parent, false) - return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - class KotestTestStructureViewTreeElement(private val test: TestElement) : StructureViewTreeElement { - override fun getPresentation(): ItemPresentation { - return object : ItemPresentation { - override fun getIcon(unused: Boolean): Icon { - return AllIcons.Nodes.Test - } - - override fun getPresentableText(): String { - return test.test.name.displayName() - } - } - } - - override fun getChildren(): Array { - return test.nestedTests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - override fun navigate(requestFocus: Boolean) { - if (test.psi is NavigatablePsiElement) { - test.psi.navigate(true) - } - } - - override fun canNavigate(): Boolean { - return true - } - - override fun canNavigateToSource(): Boolean { - return true - } - - override fun getValue(): Any { - return test - } - } - - override fun getCurrentEditorElement(editor: Editor?, parent: PsiElement?): Any? { - return null - } -} diff --git a/src/IC-241/resources/META-INF/plugin.xml b/src/IC-241/resources/META-INF/plugin.xml deleted file mode 100644 index ef2d22a2..00000000 --- a/src/IC-241/resources/META-INF/plugin.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - kotest-plugin-intellij - Kotest - - Kotest - - Kotest.

- This plugin requires the use of Kotest 4.2.0 or newer. - ]]>
- - - 1.0.0 - - - org.jetbrains.kotlin - com.intellij.modules.java - org.jetbrains.plugins.gradle - org.intellij.intelliLang - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.kotest.plugin.intellij.intentions.SoftAssertIntention - Kotlin/Test - SoftAssertIntention - - - - io.kotest.plugin.intellij.intentions.BangIntention - Kotlin/Test - BangIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowIntention - Kotlin/Test - ShouldThrowIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowAnyIntention - Kotlin/Test - ShouldThrowAnyIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowExactlyIntention - Kotlin/Test - ShouldThrowExactlyIntention - - - -
diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/contentFactory.kt deleted file mode 100644 index 3cd76f88..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/contentFactory.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.ui.content.ContentFactory - -fun getContentFactory(): ContentFactory = ContentFactory.getInstance() diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/findeditor.kt deleted file mode 100644 index aeb4fca5..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/findeditor.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.codeinsight.utils.findExistingEditor - -fun PsiElement.existingEditor() = this.findExistingEditor() diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/fqnames.kt deleted file mode 100644 index 5318e346..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/fqnames.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.base.psi.kotlinFqName -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.KtClassOrObject - -fun KtClassOrObject.fqname(): FqName? = this.kotlinFqName diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt deleted file mode 100644 index 9ea4f784..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.kotest.plugin.intellij - -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - -abstract class AbstractInspection : AbstractKotlinInspection() diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/markers.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/markers.kt deleted file mode 100644 index 6bd63cde..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/markers.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.kotest.plugin.intellij - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.openapi.editor.markup.GutterIconRenderer -import com.intellij.openapi.editor.markup.MarkupEditorFilter -import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory -import com.intellij.psi.PsiElement -import com.intellij.util.Functions -import javax.swing.Icon - -/** - * A Line marker that does not appear in diffs - */ -class MainEditorLineMarkerInfo(element: PsiElement, text: String, icon: Icon) : LineMarkerInfo( - element, element.textRange, icon, Functions.constant(text), null, GutterIconRenderer.Alignment.LEFT, { text } -) { - override fun getEditorFilter(): MarkupEditorFilter = MarkupEditorFilterFactory.createIsNotDiffFilter() -} diff --git a/src/IC-242/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/IC-242/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt deleted file mode 100644 index 8aa0e602..00000000 --- a/src/IC-242/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt +++ /dev/null @@ -1,68 +0,0 @@ -package io.kotest.plugin.intellij.structure - -import com.intellij.icons.AllIcons -import com.intellij.ide.structureView.StructureViewExtension -import com.intellij.ide.structureView.StructureViewTreeElement -import com.intellij.ide.util.treeView.smartTree.TreeElement -import com.intellij.navigation.ItemPresentation -import com.intellij.openapi.editor.Editor -import com.intellij.psi.NavigatablePsiElement -import com.intellij.psi.PsiElement -import io.kotest.plugin.intellij.TestElement -import io.kotest.plugin.intellij.psi.specStyle -import org.jetbrains.kotlin.psi.KtClassOrObject -import javax.swing.Icon - -class KotestStructureViewExtension : StructureViewExtension { - - override fun getType(): Class { - return KtClassOrObject::class.java - } - - override fun getChildren(parent: PsiElement): Array { - val ktClassOrObject = parent as? KtClassOrObject ?: return emptyArray() - val spec = ktClassOrObject.specStyle() ?: return emptyArray() - val tests = spec.tests(parent, false) - return tests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - class KotestTestStructureViewTreeElement(private val test: TestElement) : StructureViewTreeElement { - override fun getPresentation(): ItemPresentation { - return object : ItemPresentation { - override fun getIcon(unused: Boolean): Icon { - return AllIcons.Nodes.Test - } - - override fun getPresentableText(): String { - return test.test.name.displayName() - } - } - } - - override fun getChildren(): Array { - return test.nestedTests.map { KotestTestStructureViewTreeElement(it) }.toTypedArray() - } - - override fun navigate(requestFocus: Boolean) { - if (test.psi is NavigatablePsiElement) { - test.psi.navigate(true) - } - } - - override fun canNavigate(): Boolean { - return true - } - - override fun canNavigateToSource(): Boolean { - return true - } - - override fun getValue(): Any { - return test - } - } - - override fun getCurrentEditorElement(editor: Editor?, parent: PsiElement?): Any? { - return null - } -} diff --git a/src/IC-242/resources/META-INF/plugin.xml b/src/IC-242/resources/META-INF/plugin.xml deleted file mode 100644 index ef2d22a2..00000000 --- a/src/IC-242/resources/META-INF/plugin.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - kotest-plugin-intellij - Kotest - - Kotest - - Kotest.

- This plugin requires the use of Kotest 4.2.0 or newer. - ]]>
- - - 1.0.0 - - - org.jetbrains.kotlin - com.intellij.modules.java - org.jetbrains.plugins.gradle - org.intellij.intelliLang - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.kotest.plugin.intellij.intentions.SoftAssertIntention - Kotlin/Test - SoftAssertIntention - - - - io.kotest.plugin.intellij.intentions.BangIntention - Kotlin/Test - BangIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowIntention - Kotlin/Test - ShouldThrowIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowAnyIntention - Kotlin/Test - ShouldThrowAnyIntention - - - - io.kotest.plugin.intellij.intentions.ShouldThrowExactlyIntention - Kotlin/Test - ShouldThrowExactlyIntention - - - -
diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/contentFactory.kt b/src/main/kotlin/io/kotest/plugin/intellij/contentFactory.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/contentFactory.kt rename to src/main/kotlin/io/kotest/plugin/intellij/contentFactory.kt diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/findeditor.kt b/src/main/kotlin/io/kotest/plugin/intellij/findeditor.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/findeditor.kt rename to src/main/kotlin/io/kotest/plugin/intellij/findeditor.kt diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/fqnames.kt b/src/main/kotlin/io/kotest/plugin/intellij/fqnames.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/fqnames.kt rename to src/main/kotlin/io/kotest/plugin/intellij/fqnames.kt diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt b/src/main/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt rename to src/main/kotlin/io/kotest/plugin/intellij/inspectionsuper.kt diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/markers.kt b/src/main/kotlin/io/kotest/plugin/intellij/markers.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/markers.kt rename to src/main/kotlin/io/kotest/plugin/intellij/markers.kt diff --git a/src/IC-223/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt b/src/main/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt similarity index 100% rename from src/IC-223/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt rename to src/main/kotlin/io/kotest/plugin/intellij/structure/KotestStructureViewExtension.kt diff --git a/src/IC-223/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml similarity index 100% rename from src/IC-223/resources/META-INF/plugin.xml rename to src/main/resources/META-INF/plugin.xml