Skip to content

Commit 84b592b

Browse files
BFergersonBFergerson
committed
refactor: move
1 parent 0a8a83d commit 84b592b

17 files changed

+33
-27
lines changed

‎insight/src/main/kotlin/spp/jetbrains/insight/InsightKeys.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package spp.jetbrains.insight
1818

1919
import spp.jetbrains.SourceKey
20+
import spp.jetbrains.insight.path.ProceduralMultiPath
2021
import spp.protocol.insight.InsightType
2122
import spp.protocol.insight.InsightValue
2223

‎insight/src/main/kotlin/spp/jetbrains/insight/InsightPassProvider.kt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@ package spp.jetbrains.insight
1919
import spp.jetbrains.artifact.model.ArtifactElement
2020
import spp.jetbrains.insight.pass.ArtifactPass
2121
import spp.jetbrains.insight.pass.IPass
22-
import spp.jetbrains.insight.pass.ProceduralPathPass
2322
import spp.jetbrains.insight.pass.ProceduralMultiPathPass
23+
import spp.jetbrains.insight.pass.ProceduralPathPass
2424
import spp.jetbrains.insight.pass.artifact.CallDurationPass
2525
import spp.jetbrains.insight.pass.artifact.LoadPsiPass
2626
import spp.jetbrains.insight.pass.artifact.RandomConditionalPass
2727
import spp.jetbrains.insight.pass.artifact.ThreadSleepPass
28+
import spp.jetbrains.insight.pass.multipath.SavePsiMultiPathPass
29+
import spp.jetbrains.insight.pass.multipath.SimplifyMultiPathPass
30+
import spp.jetbrains.insight.pass.multipath.StaticDfaMultiPathPass
2831
import spp.jetbrains.insight.pass.path.PathDurationPass
2932
import spp.jetbrains.insight.pass.path.PathProbabilityPass
3033
import spp.jetbrains.insight.pass.path.PruneArtifactsPass
3134
import spp.jetbrains.insight.pass.path.RecursivePathPass
32-
import spp.jetbrains.insight.pass.multipath.SavePsiMultiPathPass
33-
import spp.jetbrains.insight.pass.multipath.SimplifyMultiPathPass
34-
import spp.jetbrains.insight.pass.multipath.StaticDfaMultiPathPass
35+
import spp.jetbrains.insight.path.ProceduralMultiPath
36+
import spp.jetbrains.insight.path.ProceduralPath
3537

3638
/**
3739
* Used to process passes over [ProceduralMultiPath]s, [ProceduralPath]s, and [ArtifactElement]s.

‎insight/src/main/kotlin/spp/jetbrains/insight/LiveInsightManager.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.intellij.openapi.diagnostic.logger
2121
import com.intellij.openapi.project.Project
2222
import com.intellij.openapi.util.Disposer
2323
import io.vertx.kotlin.coroutines.CoroutineVerticle
24-
import spp.jetbrains.insight.coupler.FunctionDurationCoupler
24+
import spp.jetbrains.insight.contributor.FunctionDurationContributor
2525
import spp.jetbrains.marker.source.mark.api.ClassSourceMark
2626
import spp.jetbrains.marker.source.mark.api.event.SourceMarkEvent
2727
import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventCode
@@ -43,8 +43,8 @@ class LiveInsightManager(
4343

4444
// private lateinit var insightService: LiveInsightService
4545
// private lateinit var workspace: InsightWorkspace
46-
private val insights = listOf(
47-
FunctionDurationCoupler(remoteInsightsAvailable)
46+
private val contributors = listOf(
47+
FunctionDurationContributor(remoteInsightsAvailable)
4848
)
4949

5050
override suspend fun start() {
@@ -102,7 +102,7 @@ class LiveInsightManager(
102102
}
103103
}
104104

105-
insights.forEach { it.handleEvent(event) }
105+
contributors.forEach { it.handleEvent(event) }
106106
}
107107

108108
private suspend fun downloadInsights(classMark: ClassSourceMark) {

‎insight/src/main/kotlin/spp/jetbrains/insight/ProceduralAnalyzer.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package spp.jetbrains.insight
1919
import spp.jetbrains.artifact.model.*
2020
import spp.jetbrains.artifact.service.getParentFunction
2121
import spp.jetbrains.artifact.service.toArtifact
22+
import spp.jetbrains.insight.path.ProceduralMultiPath
23+
import spp.jetbrains.insight.path.ProceduralPath
2224
import java.util.*
2325
import java.util.stream.Collectors
2426
import java.util.stream.IntStream

insight/src/main/kotlin/spp/jetbrains/insight/coupler/FunctionDurationCoupler.kt renamed to insight/src/main/kotlin/spp/jetbrains/insight/contributor/FunctionDurationContributor.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package spp.jetbrains.insight.coupler
17+
package spp.jetbrains.insight.contributor
1818

1919
import com.intellij.openapi.diagnostic.logger
2020
import com.intellij.psi.PsiNameIdentifierOwner
@@ -48,14 +48,14 @@ import spp.protocol.view.LiveViewConfig
4848
import spp.protocol.view.LiveViewEvent
4949

5050
/**
51-
* Provides the [FUNCTION_DURATION_PREDICTION] insight. This insight is only calculated for
51+
* Contributes the [FUNCTION_DURATION_PREDICTION] insight. This insight is only calculated for
5252
* functions that have or call functions with VCS modifications (i.e. [VCS_MODIFIED] flag).
5353
*/
54-
class FunctionDurationCoupler(private val remoteInsightsAvailable: Boolean) : SourceMarkEventListener {
54+
class FunctionDurationContributor(private val remoteInsightsAvailable: Boolean) : SourceMarkEventListener {
5555

56-
private val log = logger<FunctionDurationCoupler>()
56+
private val log = logger<FunctionDurationContributor>()
5757
private val updateInsightQueue = MergingUpdateQueue(
58-
FunctionDurationCoupler::javaClass.name, 200, true, null, null
58+
FunctionDurationContributor::javaClass.name, 200, true, null, null
5959
)
6060

6161
override fun handleEvent(event: SourceMarkEvent) {

‎insight/src/main/kotlin/spp/jetbrains/insight/pass/ProceduralMultiPathPass.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package spp.jetbrains.insight.pass
1818

19-
import spp.jetbrains.insight.ProceduralMultiPath
19+
import spp.jetbrains.insight.path.ProceduralMultiPath
2020

2121
/**
2222
* A pass that analyzes a [ProceduralMultiPath].

‎insight/src/main/kotlin/spp/jetbrains/insight/pass/ProceduralPathPass.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package spp.jetbrains.insight.pass
1818

19-
import spp.jetbrains.insight.ProceduralPath
19+
import spp.jetbrains.insight.path.ProceduralPath
2020

2121
/**
2222
* A pass that analyzes an [ProceduralPath] and adds data to it.

‎insight/src/main/kotlin/spp/jetbrains/insight/pass/artifact/LoadPsiPass.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package spp.jetbrains.insight.pass.artifact
1919
import spp.jetbrains.artifact.model.ArtifactElement
2020
import spp.jetbrains.artifact.model.CallArtifact
2121
import spp.jetbrains.insight.InsightKeys
22-
import spp.jetbrains.insight.ProceduralPath
2322
import spp.jetbrains.insight.pass.ArtifactPass
23+
import spp.jetbrains.insight.path.ProceduralPath
2424

2525
/**
2626
* Loads the [ProceduralPath] set from [CallArtifact]s that have already been processed. Allows for basic

‎insight/src/main/kotlin/spp/jetbrains/insight/pass/multipath/SavePsiMultiPathPass.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package spp.jetbrains.insight.pass.multipath
1818

1919
import spp.jetbrains.insight.InsightKeys
20-
import spp.jetbrains.insight.ProceduralMultiPath
21-
import spp.jetbrains.insight.ProceduralPath
2220
import spp.jetbrains.insight.pass.ProceduralMultiPathPass
21+
import spp.jetbrains.insight.path.ProceduralMultiPath
22+
import spp.jetbrains.insight.path.ProceduralPath
2323

2424
/**
2525
* Saves the [ProceduralPath] set to the root artifact PSI element for later use.

‎insight/src/main/kotlin/spp/jetbrains/insight/pass/multipath/SimplifyMultiPathPass.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package spp.jetbrains.insight.pass.multipath
1818

1919
import spp.jetbrains.artifact.model.IfArtifact
2020
import spp.jetbrains.insight.InsightKeys
21-
import spp.jetbrains.insight.ProceduralMultiPath
22-
import spp.jetbrains.insight.ProceduralPath
2321
import spp.jetbrains.insight.pass.ProceduralMultiPathPass
22+
import spp.jetbrains.insight.path.ProceduralMultiPath
23+
import spp.jetbrains.insight.path.ProceduralPath
2424

2525
/**
2626
* Removes paths caused by conditional branches that are never taken.

0 commit comments

Comments
 (0)