v0.4.0

gradle.properties

@@ -4,7 +4,7 @@ kotlin.code.style=official
 
 pluginGroup = spp.jetbrains
 pluginName = Source++
-projectVersion=0.3.1
+projectVersion=0.4.0
 pluginSinceBuild = 202.4357
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
@@ -21,7 +21,7 @@ platformPlugins = java, Groovy, Kotlin, PythonCore:213.5744.223, org.intellij.sc
 # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
 kotlin.stdlib.default.dependency = true
 
-apolloVersion=3.0.0
+apolloVersion=3.1.0
 vertxVersion=4.2.4
 slf4jVersion=1.7.33
 jacksonVersion=2.13.1

mapper/src/main/kotlin/spp/jetbrains/mapper/api/impl/SourceMapperImpl.kt

@@ -17,12 +17,12 @@
  */
 package spp.jetbrains.mapper.api.impl
 
+import org.slf4j.LoggerFactory
 import spp.jetbrains.mapper.api.SourceMapper
 import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
 import spp.jetbrains.mapper.vcs.git.LogFollowCommand
 import spp.protocol.artifact.ArtifactQualifiedName
 import spp.protocol.artifact.LocalArtifact
-import org.slf4j.LoggerFactory
 import java.util.*
 
 /**

mapper/src/main/kotlin/spp/jetbrains/mapper/vcs/git/GitRepositoryMapper.kt

@@ -18,7 +18,6 @@
 package spp.jetbrains.mapper.vcs.git
 
 import com.google.common.base.Preconditions
-import spp.jetbrains.mapper.extend.SourceCodeTokenizer
 import jp.ac.titech.c.se.stein.PorcelainAPI
 import jp.ac.titech.c.se.stein.core.Context
 import jp.ac.titech.c.se.stein.core.EntrySet
@@ -29,6 +28,7 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.lib.Repository
 import org.slf4j.LoggerFactory
+import spp.jetbrains.mapper.extend.SourceCodeTokenizer
 import java.io.File
 import java.nio.charset.StandardCharsets
 import java.util.*

mapper/src/main/kotlin/spp/jetbrains/mapper/vcs/git/LogFollowCommand.kt

@@ -17,10 +17,6 @@
  */
 package spp.jetbrains.mapper.vcs.git
 
-import spp.jetbrains.mapper.api.impl.SourceMapperImpl
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
-import spp.protocol.artifact.LocalArtifact
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.errors.GitAPIException
 import org.eclipse.jgit.diff.DiffEntry
@@ -33,6 +29,10 @@ import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk.TreeWalk
 import org.slf4j.LoggerFactory
+import spp.jetbrains.mapper.api.impl.SourceMapperImpl
+import spp.protocol.artifact.ArtifactQualifiedName
+import spp.protocol.artifact.ArtifactType
+import spp.protocol.artifact.LocalArtifact
 import java.io.IOException
 
 /**

mapper/src/test/kotlin/spp/jetbrains/mapper/integration/GroovyModificationTest.kt

@@ -17,18 +17,18 @@
  */
 package spp.jetbrains.mapper.integration
 
-import spp.jetbrains.mapper.api.impl.SourceMapperImpl
-import spp.jetbrains.mapper.extend.SourceCodeTokenizer
-import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.lib.Constants
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.*
 import org.junit.Ignore
 import org.junit.Test
+import spp.jetbrains.mapper.api.impl.SourceMapperImpl
+import spp.jetbrains.mapper.extend.SourceCodeTokenizer
+import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
+import spp.protocol.artifact.ArtifactQualifiedName
+import spp.protocol.artifact.ArtifactType
 import java.io.File
 import java.nio.file.Files
 import java.util.*

mapper/src/test/kotlin/spp/jetbrains/mapper/integration/JavaModificationTest.kt

@@ -17,18 +17,18 @@
  */
 package spp.jetbrains.mapper.integration
 
-import spp.jetbrains.mapper.api.impl.SourceMapperImpl
-import spp.jetbrains.mapper.extend.SourceCodeTokenizer
-import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.lib.Constants
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.*
 import org.junit.Ignore
 import org.junit.Test
+import spp.jetbrains.mapper.api.impl.SourceMapperImpl
+import spp.jetbrains.mapper.extend.SourceCodeTokenizer
+import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
+import spp.protocol.artifact.ArtifactQualifiedName
+import spp.protocol.artifact.ArtifactType
 import java.io.File
 import java.nio.file.Files
 import java.util.*

mapper/src/test/kotlin/spp/jetbrains/mapper/integration/KotlinModificationTest.kt

@@ -17,18 +17,18 @@
  */
 package spp.jetbrains.mapper.integration
 
-import spp.jetbrains.mapper.api.impl.SourceMapperImpl
-import spp.jetbrains.mapper.extend.SourceCodeTokenizer
-import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.lib.Constants
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.*
 import org.junit.Ignore
 import org.junit.Test
+import spp.jetbrains.mapper.api.impl.SourceMapperImpl
+import spp.jetbrains.mapper.extend.SourceCodeTokenizer
+import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
+import spp.protocol.artifact.ArtifactQualifiedName
+import spp.protocol.artifact.ArtifactType
 import java.io.File
 import java.nio.file.Files
 import java.util.*

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/ArtifactSearch.kt

@@ -26,10 +26,6 @@ import com.intellij.psi.*
 import com.intellij.psi.search.FileTypeIndex
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.ProjectScope
-import spp.jetbrains.marker.jvm.psi.EndpointDetector
-import spp.jetbrains.marker.source.JVMMarkerUtils
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
 import io.vertx.core.Promise
 import io.vertx.core.Vertx
 import io.vertx.kotlin.coroutines.await
@@ -42,7 +38,11 @@ import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
 import org.jetbrains.uast.toUElementOfType
 import org.slf4j.LoggerFactory
-import spp.protocol.utils.ArtifactNameUtils
+import spp.jetbrains.marker.jvm.psi.EndpointDetector
+import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.protocol.artifact.ArtifactNameUtils
+import spp.protocol.artifact.ArtifactQualifiedName
+import spp.protocol.artifact.ArtifactType
 import java.util.*
 
 /**

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingService.kt

@@ -20,12 +20,12 @@ package spp.jetbrains.marker.jvm
 import com.intellij.psi.PsiClassOwner
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
-import spp.jetbrains.marker.ArtifactNamingService
-import spp.jetbrains.marker.source.JVMMarkerUtils
 import org.jetbrains.uast.UClass
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
+import spp.jetbrains.marker.ArtifactNamingService
+import spp.jetbrains.marker.source.JVMMarkerUtils
 import spp.protocol.artifact.ArtifactQualifiedName
 import spp.protocol.artifact.ArtifactType
 

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt

@@ -23,17 +23,17 @@ import com.intellij.openapi.editor.BlockInlayPriority
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiStatement
-import spp.jetbrains.marker.SourceMarker
-import spp.jetbrains.marker.plugin.SourceInlayHintProvider
-import spp.jetbrains.marker.source.JVMMarkerUtils
-import spp.jetbrains.marker.source.mark.inlay.InlayMark
-import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
+import spp.jetbrains.marker.SourceMarker
+import spp.jetbrains.marker.plugin.SourceInlayHintProvider
+import spp.jetbrains.marker.source.JVMMarkerUtils
+import spp.jetbrains.marker.source.mark.inlay.InlayMark
+import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
 
 /**
  * todo: description.

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMVariableSimpleNode.kt

@@ -24,9 +24,9 @@ import com.intellij.ui.SimpleTextAttributes
 import com.intellij.ui.treeStructure.SimpleNode
 import com.intellij.xdebugger.impl.ui.DebuggerUIUtil
 import com.intellij.xdebugger.impl.ui.XDebuggerUIConstants
-import spp.protocol.instrument.LiveVariable
-import spp.protocol.instrument.LiveVariableScope
 import org.apache.commons.lang3.EnumUtils
+import spp.protocol.instrument.variable.LiveVariable
+import spp.protocol.instrument.variable.LiveVariableScope
 
 /**
  * todo: description.

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/EndpointDetector.kt

@@ -19,12 +19,6 @@ package spp.jetbrains.marker.jvm.psi
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.util.Computable
-import spp.jetbrains.marker.jvm.psi.endpoint.SkywalkingTraceEndpoint
-import spp.jetbrains.marker.jvm.psi.endpoint.SpringMVCEndpoint
-import spp.jetbrains.marker.source.mark.api.MethodSourceMark
-import spp.jetbrains.marker.source.mark.api.SourceMark
-import spp.jetbrains.marker.source.mark.api.key.SourceKey
-import spp.jetbrains.monitor.skywalking.bridge.EndpointBridge
 import io.vertx.core.Future
 import io.vertx.core.Promise
 import io.vertx.core.Vertx
@@ -39,6 +33,12 @@ import kotlinx.coroutines.withContext
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
 import org.slf4j.LoggerFactory
+import spp.jetbrains.marker.jvm.psi.endpoint.SkywalkingTraceEndpoint
+import spp.jetbrains.marker.jvm.psi.endpoint.SpringMVCEndpoint
+import spp.jetbrains.marker.source.mark.api.MethodSourceMark
+import spp.jetbrains.marker.source.mark.api.SourceMark
+import spp.jetbrains.marker.source.mark.api.key.SourceKey
+import spp.jetbrains.monitor.skywalking.bridge.EndpointBridge
 import java.util.*
 
 /**

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/LoggerDetector.kt

@@ -27,10 +27,6 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.refactoring.suggested.endOffset
 import com.intellij.refactoring.suggested.startOffset
-import spp.jetbrains.marker.source.SourceFileMarker
-import spp.jetbrains.marker.source.mark.api.MethodSourceMark
-import spp.jetbrains.marker.source.mark.api.key.SourceKey
-import spp.jetbrains.marker.source.mark.inlay.InlayMark
 import io.vertx.core.Future
 import io.vertx.core.Promise
 import io.vertx.core.Vertx
@@ -43,6 +39,10 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.stringValue
 import org.jetbrains.uast.UMethod
 import org.jetbrains.uast.toUElement
 import org.slf4j.LoggerFactory
+import spp.jetbrains.marker.source.SourceFileMarker
+import spp.jetbrains.marker.source.mark.api.MethodSourceMark
+import spp.jetbrains.marker.source.mark.api.key.SourceKey
+import spp.jetbrains.marker.source.mark.inlay.InlayMark
 
 /**
  * Detects the presence of log statements within methods and saves log patterns.