Skip to content

Commit c2f8a8a

Browse files
BFergersonBFergerson
authored
v0.4.0 (#656)
* protocol update * bump * refactor * refactor * refactor * temp version * refactor * refactor * refactor * clean * organize imports * refactor * refactor * bump * bump * refactor * validate marker auth over tcp * refactor * bump * refactor * bump * bump * backwards compatibility issues * bump * bump * bump * moved packages * refactor * better error message * bump * bump * use official lib * Update build.gradle.kts * Update build.gradle.kts * Update build.gradle.kts * Update build.gradle.kts * Update build.gradle.kts * bump * Update build.gradle.kts
1 parent 1fdfc5f commit c2f8a8a

File tree

92 files changed

+430
-1015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+430
-1015
lines changed

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kotlin.code.style=official
44

55
pluginGroup = spp.jetbrains
66
pluginName = Source++
7-
projectVersion=0.3.1
7+
projectVersion=0.4.0
88
pluginSinceBuild = 202.4357
99
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
1010
# 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
2121
# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
2222
kotlin.stdlib.default.dependency = true
2323

24-
apolloVersion=3.0.0
24+
apolloVersion=3.1.0
2525
vertxVersion=4.2.4
2626
slf4jVersion=1.7.33
2727
jacksonVersion=2.13.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
*/
1818
package spp.jetbrains.mapper.api.impl
1919

20+
import org.slf4j.LoggerFactory
2021
import spp.jetbrains.mapper.api.SourceMapper
2122
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
2223
import spp.jetbrains.mapper.vcs.git.LogFollowCommand
2324
import spp.protocol.artifact.ArtifactQualifiedName
2425
import spp.protocol.artifact.LocalArtifact
25-
import org.slf4j.LoggerFactory
2626
import java.util.*
2727

2828
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package spp.jetbrains.mapper.vcs.git
1919

2020
import com.google.common.base.Preconditions
21-
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
2221
import jp.ac.titech.c.se.stein.PorcelainAPI
2322
import jp.ac.titech.c.se.stein.core.Context
2423
import jp.ac.titech.c.se.stein.core.EntrySet
@@ -29,6 +28,7 @@ import org.eclipse.jgit.api.Git
2928
import org.eclipse.jgit.internal.storage.file.FileRepository
3029
import org.eclipse.jgit.lib.Repository
3130
import org.slf4j.LoggerFactory
31+
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
3232
import java.io.File
3333
import java.nio.charset.StandardCharsets
3434
import java.util.*

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
*/
1818
package spp.jetbrains.mapper.vcs.git
1919

20-
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
21-
import spp.protocol.artifact.ArtifactQualifiedName
22-
import spp.protocol.artifact.ArtifactType
23-
import spp.protocol.artifact.LocalArtifact
2420
import org.eclipse.jgit.api.Git
2521
import org.eclipse.jgit.api.errors.GitAPIException
2622
import org.eclipse.jgit.diff.DiffEntry
@@ -33,6 +29,10 @@ import org.eclipse.jgit.lib.Repository
3329
import org.eclipse.jgit.revwalk.RevCommit
3430
import org.eclipse.jgit.treewalk.TreeWalk
3531
import org.slf4j.LoggerFactory
32+
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
33+
import spp.protocol.artifact.ArtifactQualifiedName
34+
import spp.protocol.artifact.ArtifactType
35+
import spp.protocol.artifact.LocalArtifact
3636
import java.io.IOException
3737

3838
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
*/
1818
package spp.jetbrains.mapper.integration
1919

20-
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
21-
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
22-
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
23-
import spp.protocol.artifact.ArtifactQualifiedName
24-
import spp.protocol.artifact.ArtifactType
2520
import org.eclipse.jgit.api.Git
2621
import org.eclipse.jgit.internal.storage.file.FileRepository
2722
import org.eclipse.jgit.lib.Constants
2823
import org.intellij.lang.annotations.Language
2924
import org.junit.Assert.*
3025
import org.junit.Ignore
3126
import org.junit.Test
27+
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
28+
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
29+
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
30+
import spp.protocol.artifact.ArtifactQualifiedName
31+
import spp.protocol.artifact.ArtifactType
3232
import java.io.File
3333
import java.nio.file.Files
3434
import java.util.*

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
*/
1818
package spp.jetbrains.mapper.integration
1919

20-
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
21-
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
22-
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
23-
import spp.protocol.artifact.ArtifactQualifiedName
24-
import spp.protocol.artifact.ArtifactType
2520
import org.eclipse.jgit.api.Git
2621
import org.eclipse.jgit.internal.storage.file.FileRepository
2722
import org.eclipse.jgit.lib.Constants
2823
import org.intellij.lang.annotations.Language
2924
import org.junit.Assert.*
3025
import org.junit.Ignore
3126
import org.junit.Test
27+
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
28+
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
29+
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
30+
import spp.protocol.artifact.ArtifactQualifiedName
31+
import spp.protocol.artifact.ArtifactType
3232
import java.io.File
3333
import java.nio.file.Files
3434
import java.util.*

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
*/
1818
package spp.jetbrains.mapper.integration
1919

20-
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
21-
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
22-
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
23-
import spp.protocol.artifact.ArtifactQualifiedName
24-
import spp.protocol.artifact.ArtifactType
2520
import org.eclipse.jgit.api.Git
2621
import org.eclipse.jgit.internal.storage.file.FileRepository
2722
import org.eclipse.jgit.lib.Constants
2823
import org.intellij.lang.annotations.Language
2924
import org.junit.Assert.*
3025
import org.junit.Ignore
3126
import org.junit.Test
27+
import spp.jetbrains.mapper.api.impl.SourceMapperImpl
28+
import spp.jetbrains.mapper.extend.SourceCodeTokenizer
29+
import spp.jetbrains.mapper.vcs.git.GitRepositoryMapper
30+
import spp.protocol.artifact.ArtifactQualifiedName
31+
import spp.protocol.artifact.ArtifactType
3232
import java.io.File
3333
import java.nio.file.Files
3434
import java.util.*

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ import com.intellij.psi.*
2626
import com.intellij.psi.search.FileTypeIndex
2727
import com.intellij.psi.search.GlobalSearchScope
2828
import com.intellij.psi.search.ProjectScope
29-
import spp.jetbrains.marker.jvm.psi.EndpointDetector
30-
import spp.jetbrains.marker.source.JVMMarkerUtils
31-
import spp.protocol.artifact.ArtifactQualifiedName
32-
import spp.protocol.artifact.ArtifactType
3329
import io.vertx.core.Promise
3430
import io.vertx.core.Vertx
3531
import io.vertx.kotlin.coroutines.await
@@ -42,7 +38,11 @@ import org.jetbrains.uast.UMethod
4238
import org.jetbrains.uast.toUElement
4339
import org.jetbrains.uast.toUElementOfType
4440
import org.slf4j.LoggerFactory
45-
import spp.protocol.utils.ArtifactNameUtils
41+
import spp.jetbrains.marker.jvm.psi.EndpointDetector
42+
import spp.jetbrains.marker.source.JVMMarkerUtils
43+
import spp.protocol.artifact.ArtifactNameUtils
44+
import spp.protocol.artifact.ArtifactQualifiedName
45+
import spp.protocol.artifact.ArtifactType
4646
import java.util.*
4747

4848
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ package spp.jetbrains.marker.jvm
2020
import com.intellij.psi.PsiClassOwner
2121
import com.intellij.psi.PsiElement
2222
import com.intellij.psi.PsiFile
23-
import spp.jetbrains.marker.ArtifactNamingService
24-
import spp.jetbrains.marker.source.JVMMarkerUtils
2523
import org.jetbrains.uast.UClass
2624
import org.jetbrains.uast.UExpression
2725
import org.jetbrains.uast.UMethod
2826
import org.jetbrains.uast.toUElement
27+
import spp.jetbrains.marker.ArtifactNamingService
28+
import spp.jetbrains.marker.source.JVMMarkerUtils
2929
import spp.protocol.artifact.ArtifactQualifiedName
3030
import spp.protocol.artifact.ArtifactType
3131

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ import com.intellij.openapi.editor.BlockInlayPriority
2323
import com.intellij.psi.PsiElement
2424
import com.intellij.psi.PsiMethod
2525
import com.intellij.psi.PsiStatement
26-
import spp.jetbrains.marker.SourceMarker
27-
import spp.jetbrains.marker.plugin.SourceInlayHintProvider
28-
import spp.jetbrains.marker.source.JVMMarkerUtils
29-
import spp.jetbrains.marker.source.mark.inlay.InlayMark
30-
import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
3126
import org.jetbrains.kotlin.psi.KtNamedFunction
3227
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
3328
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
3429
import org.jetbrains.uast.UExpression
3530
import org.jetbrains.uast.UMethod
3631
import org.jetbrains.uast.toUElement
32+
import spp.jetbrains.marker.SourceMarker
33+
import spp.jetbrains.marker.plugin.SourceInlayHintProvider
34+
import spp.jetbrains.marker.source.JVMMarkerUtils
35+
import spp.jetbrains.marker.source.mark.inlay.InlayMark
36+
import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
3737

3838
/**
3939
* todo: description.

0 commit comments

Comments
 (0)