From 7ecb21dbb4af6c5863a418550621202028a80b6c Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Fri, 30 Sep 2022 23:08:50 +0400 Subject: [PATCH] refactor: improved packaging --- .../spp/jetbrains/marker/js/JavascriptMarker.kt | 1 + .../js/{ => detect}/JavascriptEndpointDetector.kt | 4 ++-- .../js/{ => detect}/JavascriptLoggerDetector.kt | 2 +- .../js/{psi => detect}/endpoint/ExpressEndpoint.kt | 2 +- .../{ => presentation}/JavascriptVariableRootNode.kt | 2 +- .../JavascriptVariableSimpleNode.kt | 2 +- .../JavascriptArtifactConditionService.kt | 2 +- .../JavascriptArtifactCreationService.kt | 2 +- .../{ => service}/JavascriptArtifactNamingService.kt | 2 +- .../{ => service}/JavascriptArtifactScopeService.kt | 2 +- .../{ => service}/JavascriptArtifactTypeService.kt | 2 +- .../jetbrains/marker/jvm/JVMLineMarkerProvider.kt | 2 +- .../kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt | 1 + .../marker/jvm/JVMSourceInlayHintProvider.kt | 2 +- .../marker/jvm/{ => detect}/JVMEndpointDetector.kt | 8 ++++---- .../marker/jvm/{psi => detect}/JVMLoggerDetector.kt | 2 +- .../endpoint/SkywalkingTraceEndpoint.kt | 4 ++-- .../{psi => detect}/endpoint/SpringMVCEndpoint.kt | 5 ++--- .../jvm/{ => presentation}/JVMVariableSimpleNode.kt | 2 +- .../jvm/{ => service}/JVMArtifactConditionService.kt | 2 +- .../jvm/{ => service}/JVMArtifactCreationService.kt | 4 ++-- .../jvm/{ => service}/JVMArtifactNamingService.kt | 4 ++-- .../jvm/{ => service}/JVMArtifactScopeService.kt | 2 +- .../jvm/{ => service}/JVMArtifactTypeService.kt | 2 +- .../{source => jvm/service/utils}/JVMMarkerUtils.kt | 3 ++- .../marker/jvm/JVMArtifactNamingServiceTest.kt | 1 + .../jetbrains/marker/jvm/JVMConditionParserTest.kt | 1 + .../jvm/{psi => detect}/JVMLoggerDetectorTest.kt | 2 +- .../endpoint/AbstractEndpointDetectorTest.kt | 2 +- .../endpoint/GroovyEndpointDetectorTest.kt | 4 ++-- .../endpoint/JavaEndpointDetectorTest.kt | 4 ++-- .../endpoint/KotlinEndpointDetectorTest.kt | 4 ++-- .../endpoint/ScalaEndpointNameDetectorTest.kt | 4 ++-- .../kotlin/spp/jetbrains/marker/py/PythonMarker.kt | 1 + .../marker/py/{ => detect}/PythonEndpointDetector.kt | 4 ++-- .../marker/py/{ => detect}/PythonLoggerDetector.kt | 2 +- .../py/{psi => detect}/endpoint/FlaskEndpoint.kt | 2 +- .../py/{ => presentation}/PythonVariableRootNode.kt | 2 +- .../{ => presentation}/PythonVariableSimpleNode.kt | 2 +- .../{ => service}/PythonArtifactConditionService.kt | 2 +- .../{ => service}/PythonArtifactCreationService.kt | 2 +- .../py/{ => service}/PythonArtifactNamingService.kt | 2 +- .../py/{ => service}/PythonArtifactScopeService.kt | 2 +- .../py/{ => service}/PythonArtifactTypeService.kt | 2 +- .../marker/{jvm => py}/PythonGuideProviderTest.kt | 3 +-- .../marker/source/mark/api/ExpressionSourceMark.kt | 1 - .../mark/PluginSourceMarkEventListener.kt | 12 ++++++------ .../breakpoint/tree/VariableRootSimpleNode.kt | 6 +++--- 48 files changed, 68 insertions(+), 65 deletions(-) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => detect}/JavascriptEndpointDetector.kt (91%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => detect}/JavascriptLoggerDetector.kt (96%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{psi => detect}/endpoint/ExpressEndpoint.kt (99%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => presentation}/JavascriptVariableRootNode.kt (97%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => presentation}/JavascriptVariableSimpleNode.kt (98%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => service}/JavascriptArtifactConditionService.kt (96%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => service}/JavascriptArtifactCreationService.kt (99%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => service}/JavascriptArtifactNamingService.kt (99%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => service}/JavascriptArtifactScopeService.kt (97%) rename marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/{ => service}/JavascriptArtifactTypeService.kt (97%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => detect}/JVMEndpointDetector.kt (88%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/JVMLoggerDetector.kt (99%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/SkywalkingTraceEndpoint.kt (95%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/SpringMVCEndpoint.kt (98%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => presentation}/JVMVariableSimpleNode.kt (99%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => service}/JVMArtifactConditionService.kt (98%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => service}/JVMArtifactCreationService.kt (98%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => service}/JVMArtifactNamingService.kt (97%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => service}/JVMArtifactScopeService.kt (98%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/{ => service}/JVMArtifactTypeService.kt (97%) rename marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/{source => jvm/service/utils}/JVMMarkerUtils.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/JVMLoggerDetectorTest.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/AbstractEndpointDetectorTest.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/GroovyEndpointDetectorTest.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/JavaEndpointDetectorTest.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/KotlinEndpointDetectorTest.kt (99%) rename marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/{psi => detect}/endpoint/ScalaEndpointNameDetectorTest.kt (98%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => detect}/PythonEndpointDetector.kt (91%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => detect}/PythonLoggerDetector.kt (96%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{psi => detect}/endpoint/FlaskEndpoint.kt (98%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => presentation}/PythonVariableRootNode.kt (97%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => presentation}/PythonVariableSimpleNode.kt (98%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => service}/PythonArtifactConditionService.kt (96%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => service}/PythonArtifactCreationService.kt (99%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => service}/PythonArtifactNamingService.kt (99%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => service}/PythonArtifactScopeService.kt (98%) rename marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/{ => service}/PythonArtifactTypeService.kt (96%) rename marker/py-marker/src/test/kotlin/spp/jetbrains/marker/{jvm => py}/PythonGuideProviderTest.kt (96%) diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt index 00fa80245..9ef89bb73 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt @@ -17,6 +17,7 @@ package spp.jetbrains.marker.js import spp.jetbrains.marker.impl.* +import spp.jetbrains.marker.js.service.* /** * Provides JavaScript support for the Marker API. diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptEndpointDetector.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptEndpointDetector.kt similarity index 91% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptEndpointDetector.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptEndpointDetector.kt index 1ad5d60ef..86686dce4 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptEndpointDetector.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptEndpointDetector.kt @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.detect import com.intellij.openapi.project.Project -import spp.jetbrains.marker.js.psi.endpoint.ExpressEndpoint +import spp.jetbrains.marker.js.detect.endpoint.ExpressEndpoint import spp.jetbrains.marker.source.info.EndpointDetector import spp.jetbrains.marker.source.info.EndpointDetector.EndpointNameDeterminer diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptLoggerDetector.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptLoggerDetector.kt similarity index 96% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptLoggerDetector.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptLoggerDetector.kt index 024e0bbe6..b1e4b39eb 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptLoggerDetector.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/JavascriptLoggerDetector.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.detect import com.intellij.openapi.project.Project import spp.jetbrains.marker.source.info.LoggerDetector diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/psi/endpoint/ExpressEndpoint.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/endpoint/ExpressEndpoint.kt similarity index 99% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/psi/endpoint/ExpressEndpoint.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/endpoint/ExpressEndpoint.kt index 41a271948..f231977ef 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/psi/endpoint/ExpressEndpoint.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/detect/endpoint/ExpressEndpoint.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js.psi.endpoint +package spp.jetbrains.marker.js.detect.endpoint import com.intellij.lang.javascript.psi.* import com.intellij.openapi.application.ApplicationManager diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableRootNode.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableRootNode.kt similarity index 97% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableRootNode.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableRootNode.kt index c44ca03a2..328bf4acc 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableRootNode.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableRootNode.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.presentation import com.intellij.ide.projectView.PresentationData import com.intellij.openapi.editor.DefaultLanguageHighlighterColors diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableSimpleNode.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableSimpleNode.kt similarity index 98% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableSimpleNode.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableSimpleNode.kt index f85bbd8ec..324d151ae 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptVariableSimpleNode.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/presentation/JavascriptVariableSimpleNode.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.presentation import com.intellij.icons.AllIcons import com.intellij.ide.projectView.PresentationData diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactConditionService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactConditionService.kt similarity index 96% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactConditionService.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactConditionService.kt index 850b4d90d..af5f030ad 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactConditionService.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactConditionService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.service import com.intellij.psi.PsiElement import spp.jetbrains.marker.IArtifactConditionService diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactCreationService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactCreationService.kt similarity index 99% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactCreationService.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactCreationService.kt index b551edc8a..cf25ba58e 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactCreationService.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactCreationService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.service import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactNamingService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt similarity index 99% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactNamingService.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt index f4929a2a7..9ec4d65fe 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactNamingService.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.service import com.intellij.lang.javascript.psi.* import com.intellij.lang.javascript.psi.ecmal4.JSClass diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactScopeService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactScopeService.kt similarity index 97% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactScopeService.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactScopeService.kt index 7edf671fb..ffb8c3acf 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactScopeService.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactScopeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.service import com.intellij.lang.javascript.psi.JSFunction import com.intellij.lang.javascript.psi.JSVariable diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactTypeService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt similarity index 97% rename from marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactTypeService.kt rename to marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt index df0181d0c..6b81cc7a8 100644 --- a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptArtifactTypeService.kt +++ b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.js +package spp.jetbrains.marker.js.service import com.intellij.lang.javascript.psi.JSExpression import com.intellij.lang.javascript.psi.JSFunction diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt index efad5ee9c..d15838001 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLineMarkerProvider.kt @@ -33,7 +33,7 @@ import org.jetbrains.uast.toUElementOfType import spp.jetbrains.marker.SourceMarker import spp.jetbrains.marker.impl.ArtifactCreationService import spp.jetbrains.marker.plugin.SourceLineMarkerProvider -import spp.jetbrains.marker.source.JVMMarkerUtils +import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils import spp.jetbrains.marker.source.SourceFileMarker.Companion.SUPPORTED_FILE_TYPES import spp.jetbrains.marker.source.mark.api.SourceMark import spp.jetbrains.marker.source.mark.api.key.SourceKey diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt index 2d18a5f06..f2183ab35 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMMarker.kt @@ -18,6 +18,7 @@ package spp.jetbrains.marker.jvm import spp.jetbrains.marker.SourceMarkerUtils import spp.jetbrains.marker.impl.* +import spp.jetbrains.marker.jvm.service.* /** * todo: description. diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt index 349213970..a6127405c 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMSourceInlayHintProvider.kt @@ -27,7 +27,7 @@ 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.jvm.service.utils.JVMMarkerUtils import spp.jetbrains.marker.source.mark.inlay.InlayMark import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMEndpointDetector.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMEndpointDetector.kt similarity index 88% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMEndpointDetector.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMEndpointDetector.kt index 4e4249a91..fa1429877 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMEndpointDetector.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMEndpointDetector.kt @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.detect import com.intellij.openapi.project.Project import io.vertx.core.CompositeFuture import io.vertx.core.Future import io.vertx.core.Promise import org.jetbrains.uast.UMethod -import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer -import spp.jetbrains.marker.jvm.psi.endpoint.SkywalkingTraceEndpoint -import spp.jetbrains.marker.jvm.psi.endpoint.SpringMVCEndpoint +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer +import spp.jetbrains.marker.jvm.detect.endpoint.SkywalkingTraceEndpoint +import spp.jetbrains.marker.jvm.detect.endpoint.SpringMVCEndpoint import spp.jetbrains.marker.source.info.EndpointDetector import java.util.* diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetector.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetector.kt similarity index 99% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetector.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetector.kt index 8333d3490..cd4cc7e51 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetector.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetector.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi +package spp.jetbrains.marker.jvm.detect import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.logger diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SkywalkingTraceEndpoint.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SkywalkingTraceEndpoint.kt similarity index 95% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SkywalkingTraceEndpoint.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SkywalkingTraceEndpoint.kt index 9aa58f605..8113a82e2 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SkywalkingTraceEndpoint.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SkywalkingTraceEndpoint.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Computable @@ -23,7 +23,7 @@ import io.vertx.core.Promise import org.jetbrains.uast.UMethod import org.jetbrains.uast.expressions.UInjectionHost import org.jetbrains.uast.toUElementOfType -import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer import spp.jetbrains.marker.source.info.EndpointDetector.DetectedEndpoint import spp.jetbrains.marker.source.mark.guide.GuideMark import java.util.* diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SpringMVCEndpoint.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SpringMVCEndpoint.kt similarity index 98% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SpringMVCEndpoint.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SpringMVCEndpoint.kt index a00c06faa..9dce53ba5 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/SpringMVCEndpoint.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/SpringMVCEndpoint.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.lang.Language import com.intellij.openapi.application.ApplicationManager @@ -29,10 +29,9 @@ import org.jetbrains.uast.kotlin.KotlinStringULiteralExpression import org.jetbrains.uast.kotlin.KotlinUQualifiedReferenceExpression import org.jetbrains.uast.kotlin.KotlinUSimpleReferenceExpression import org.joor.Reflect -import spp.jetbrains.marker.jvm.JVMEndpointDetector.JVMEndpointNameDeterminer +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector.JVMEndpointNameDeterminer import spp.jetbrains.marker.source.info.EndpointDetector.DetectedEndpoint import spp.jetbrains.marker.source.mark.guide.GuideMark -import spp.jetbrains.marker.source.mark.guide.MethodGuideMark import java.util.* /** diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMVariableSimpleNode.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableSimpleNode.kt similarity index 99% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMVariableSimpleNode.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableSimpleNode.kt index 62c7cbd00..b626f1c16 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMVariableSimpleNode.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableSimpleNode.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.presentation import com.intellij.icons.AllIcons import com.intellij.ide.projectView.PresentationData diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactConditionService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactConditionService.kt similarity index 98% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactConditionService.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactConditionService.kt index 784f66bc7..af466f4df 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactConditionService.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactConditionService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.service import com.intellij.debugger.engine.evaluation.TextWithImportsImpl import com.intellij.debugger.impl.DebuggerUtilsEx diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactCreationService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt similarity index 98% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactCreationService.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt index 26affe31e..8f077e47e 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactCreationService.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.service import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.PsiStatement import spp.jetbrains.marker.IArtifactCreationService import spp.jetbrains.marker.SourceMarkerUtils -import spp.jetbrains.marker.source.JVMMarkerUtils +import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils import spp.jetbrains.marker.source.SourceFileMarker import spp.jetbrains.marker.source.mark.api.SourceMark import spp.jetbrains.marker.source.mark.api.key.SourceKey diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt similarity index 97% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingService.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt index 302e09323..e97b77d97 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingService.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project @@ -23,7 +23,7 @@ import com.intellij.psi.util.ClassUtil import org.jetbrains.uast.* import spp.jetbrains.marker.IArtifactNamingService import spp.jetbrains.marker.SourceMarker -import spp.jetbrains.marker.source.JVMMarkerUtils +import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils import spp.jetbrains.marker.source.mark.api.SourceMark import spp.protocol.artifact.ArtifactLanguage import spp.protocol.artifact.ArtifactNameUtils diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactScopeService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt similarity index 98% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactScopeService.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt index a69cef25d..647e6a508 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactScopeService.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.service import com.intellij.psi.* import com.intellij.psi.scope.processor.VariablesProcessor diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactTypeService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactTypeService.kt similarity index 97% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactTypeService.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactTypeService.kt index c160269db..ef9cc5d69 100644 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMArtifactTypeService.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactTypeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.jvm.service import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/source/JVMMarkerUtils.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt similarity index 99% rename from marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/source/JVMMarkerUtils.kt rename to marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt index 0de8807fd..d3cb750ba 100755 --- a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/source/JVMMarkerUtils.kt +++ b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.source +package spp.jetbrains.marker.jvm.service.utils import com.intellij.lang.jvm.util.JvmClassUtil import com.intellij.openapi.diagnostic.logger @@ -23,6 +23,7 @@ import com.intellij.psi.util.PsiUtil import org.jetbrains.uast.* import org.joor.Reflect import spp.jetbrains.marker.SourceMarkerUtils +import spp.jetbrains.marker.source.SourceFileMarker import spp.jetbrains.marker.source.mark.api.SourceMark import spp.jetbrains.marker.source.mark.api.key.SourceKey import spp.jetbrains.marker.source.mark.gutter.ClassGutterMark diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt index 5188afa3e..e68469df3 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType import org.jetbrains.plugins.groovy.lang.psi.GroovyFile import spp.jetbrains.marker.SourceMarker +import spp.jetbrains.marker.jvm.service.JVMArtifactNamingService import spp.jetbrains.marker.source.SourceFileMarker import spp.protocol.artifact.ArtifactType diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt index 4829dedc9..fa838b47f 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMConditionParserTest.kt @@ -28,6 +28,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl import org.intellij.lang.annotations.Language import spp.jetbrains.marker.impl.ArtifactConditionService +import spp.jetbrains.marker.jvm.service.JVMArtifactConditionService class JVMConditionParserTest : LightJavaCodeInsightFixtureTestCase() { diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetectorTest.kt similarity index 99% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetectorTest.kt index 28f8bd147..a1a2a17e8 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/JVMLoggerDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/JVMLoggerDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi +package spp.jetbrains.marker.jvm.detect import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.module.Module diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/AbstractEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/AbstractEndpointDetectorTest.kt similarity index 99% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/AbstractEndpointDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/AbstractEndpointDetectorTest.kt index cdec5de5c..82963b871 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/AbstractEndpointDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/AbstractEndpointDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.testFramework.TestApplicationManager import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/GroovyEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/GroovyEndpointDetectorTest.kt similarity index 99% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/GroovyEndpointDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/GroovyEndpointDetectorTest.kt index 52baef85b..dc505ba95 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/GroovyEndpointDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/GroovyEndpointDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.openapi.application.ApplicationManager import io.vertx.kotlin.coroutines.await @@ -22,7 +22,7 @@ import org.intellij.lang.annotations.Language import org.jetbrains.uast.UFile import org.jetbrains.uast.toUElement import spp.jetbrains.ScopeExtensions.safeRunBlocking -import spp.jetbrains.marker.jvm.JVMEndpointDetector +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector class GroovyEndpointDetectorTest : AbstractEndpointDetectorTest() { diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/JavaEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/JavaEndpointDetectorTest.kt similarity index 99% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/JavaEndpointDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/JavaEndpointDetectorTest.kt index 505d437e8..5ea1d7fb5 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/JavaEndpointDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/JavaEndpointDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.openapi.application.ApplicationManager import io.vertx.kotlin.coroutines.await @@ -22,7 +22,7 @@ import org.intellij.lang.annotations.Language import org.jetbrains.uast.UFile import org.jetbrains.uast.toUElement import spp.jetbrains.ScopeExtensions.safeRunBlocking -import spp.jetbrains.marker.jvm.JVMEndpointDetector +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector class JavaEndpointDetectorTest : AbstractEndpointDetectorTest() { diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/KotlinEndpointDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/KotlinEndpointDetectorTest.kt similarity index 99% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/KotlinEndpointDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/KotlinEndpointDetectorTest.kt index c84789099..bc1fd2f97 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/KotlinEndpointDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/KotlinEndpointDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.openapi.application.ApplicationManager import io.vertx.kotlin.coroutines.await @@ -22,7 +22,7 @@ import org.intellij.lang.annotations.Language import org.jetbrains.uast.UFile import org.jetbrains.uast.toUElement import spp.jetbrains.ScopeExtensions.safeRunBlocking -import spp.jetbrains.marker.jvm.JVMEndpointDetector +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector class KotlinEndpointDetectorTest : AbstractEndpointDetectorTest() { diff --git a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/ScalaEndpointNameDetectorTest.kt b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/ScalaEndpointNameDetectorTest.kt similarity index 98% rename from marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/ScalaEndpointNameDetectorTest.kt rename to marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/ScalaEndpointNameDetectorTest.kt index 578f626f0..6cb38f0e0 100644 --- a/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/psi/endpoint/ScalaEndpointNameDetectorTest.kt +++ b/marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/ScalaEndpointNameDetectorTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm.psi.endpoint +package spp.jetbrains.marker.jvm.detect.endpoint import com.intellij.openapi.application.ApplicationManager import io.vertx.kotlin.coroutines.await @@ -22,7 +22,7 @@ import org.intellij.lang.annotations.Language import org.jetbrains.uast.UFile import org.jetbrains.uast.toUElement import spp.jetbrains.ScopeExtensions.safeRunBlocking -import spp.jetbrains.marker.jvm.JVMEndpointDetector +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector class ScalaEndpointNameDetectorTest : AbstractEndpointDetectorTest() { diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt index 854de9be8..dd5908ed5 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonMarker.kt @@ -17,6 +17,7 @@ package spp.jetbrains.marker.py import spp.jetbrains.marker.impl.* +import spp.jetbrains.marker.py.service.* /** * todo: description. diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonEndpointDetector.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonEndpointDetector.kt similarity index 91% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonEndpointDetector.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonEndpointDetector.kt index dece32305..52ae916bd 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonEndpointDetector.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonEndpointDetector.kt @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.detect import com.intellij.openapi.project.Project -import spp.jetbrains.marker.py.psi.endpoint.FlaskEndpoint +import spp.jetbrains.marker.py.detect.endpoint.FlaskEndpoint import spp.jetbrains.marker.source.info.EndpointDetector import spp.jetbrains.marker.source.info.EndpointDetector.EndpointNameDeterminer diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonLoggerDetector.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonLoggerDetector.kt similarity index 96% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonLoggerDetector.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonLoggerDetector.kt index e050e1614..fa7fc6c91 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonLoggerDetector.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/PythonLoggerDetector.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.detect import com.intellij.openapi.project.Project import spp.jetbrains.marker.source.info.LoggerDetector diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/psi/endpoint/FlaskEndpoint.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/endpoint/FlaskEndpoint.kt similarity index 98% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/psi/endpoint/FlaskEndpoint.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/endpoint/FlaskEndpoint.kt index 9d1c1f4b5..a3d8b061d 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/psi/endpoint/FlaskEndpoint.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/detect/endpoint/FlaskEndpoint.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py.psi.endpoint +package spp.jetbrains.marker.py.detect.endpoint import com.intellij.openapi.application.ApplicationManager import com.jetbrains.python.psi.PyFunction diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableRootNode.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableRootNode.kt similarity index 97% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableRootNode.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableRootNode.kt index 92afbe6a8..212250ea7 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableRootNode.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableRootNode.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.presentation import com.intellij.ide.projectView.PresentationData import com.intellij.openapi.editor.DefaultLanguageHighlighterColors diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableSimpleNode.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableSimpleNode.kt similarity index 98% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableSimpleNode.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableSimpleNode.kt index 38488928b..312ebe73e 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableSimpleNode.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/presentation/PythonVariableSimpleNode.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.presentation import com.intellij.ide.projectView.PresentationData import com.intellij.openapi.editor.DefaultLanguageHighlighterColors diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactConditionService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactConditionService.kt similarity index 96% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactConditionService.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactConditionService.kt index 42cbe0c16..7757fb119 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactConditionService.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactConditionService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.service import com.intellij.psi.PsiElement import spp.jetbrains.marker.IArtifactConditionService diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactCreationService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactCreationService.kt similarity index 99% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactCreationService.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactCreationService.kt index 131df5578..1f1a09ad2 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactCreationService.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactCreationService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.service import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactNamingService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt similarity index 99% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactNamingService.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt index 0ce0c9193..6b64b42f7 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactNamingService.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.service import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactScopeService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactScopeService.kt similarity index 98% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactScopeService.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactScopeService.kt index 19c0d170b..5dc4d1091 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactScopeService.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactScopeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.service import com.intellij.psi.PsiElement import com.intellij.psi.PsiNamedElement diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactTypeService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt similarity index 96% rename from marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactTypeService.kt rename to marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt index 0b68bb84b..1474aa9a3 100644 --- a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonArtifactTypeService.kt +++ b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.py +package spp.jetbrains.marker.py.service import com.intellij.psi.PsiElement import com.jetbrains.python.psi.PyClass diff --git a/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/jvm/PythonGuideProviderTest.kt b/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/py/PythonGuideProviderTest.kt similarity index 96% rename from marker/py-marker/src/test/kotlin/spp/jetbrains/marker/jvm/PythonGuideProviderTest.kt rename to marker/py-marker/src/test/kotlin/spp/jetbrains/marker/py/PythonGuideProviderTest.kt index d0789518f..190f9c375 100644 --- a/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/jvm/PythonGuideProviderTest.kt +++ b/marker/py-marker/src/test/kotlin/spp/jetbrains/marker/py/PythonGuideProviderTest.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package spp.jetbrains.marker.jvm +package spp.jetbrains.marker.py import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Computable @@ -24,7 +24,6 @@ import com.jetbrains.python.psi.PyFile import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import spp.jetbrains.marker.SourceMarker -import spp.jetbrains.marker.py.PythonMarker import spp.jetbrains.marker.source.SourceFileMarker import spp.jetbrains.marker.source.mark.guide.MethodGuideMark diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt b/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt index 9786e0160..3bace614d 100644 --- a/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt +++ b/marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt @@ -19,7 +19,6 @@ package spp.jetbrains.marker.source.mark.api import com.intellij.openapi.Disposable import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import com.intellij.psi.PsiInvalidElementAccessException import spp.jetbrains.marker.impl.ArtifactNamingService import spp.jetbrains.marker.source.SourceFileMarker import spp.jetbrains.marker.source.mark.api.component.api.SourceMarkComponent diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt index 86e6a15be..cbf5fda89 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/PluginSourceMarkEventListener.kt @@ -25,12 +25,12 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiManager import io.vertx.core.Vertx import spp.jetbrains.marker.SourceMarker -import spp.jetbrains.marker.js.JavascriptEndpointDetector -import spp.jetbrains.marker.js.JavascriptLoggerDetector -import spp.jetbrains.marker.jvm.JVMEndpointDetector -import spp.jetbrains.marker.jvm.psi.JVMLoggerDetector -import spp.jetbrains.marker.py.PythonEndpointDetector -import spp.jetbrains.marker.py.PythonLoggerDetector +import spp.jetbrains.marker.js.detect.JavascriptEndpointDetector +import spp.jetbrains.marker.js.detect.JavascriptLoggerDetector +import spp.jetbrains.marker.jvm.detect.JVMEndpointDetector +import spp.jetbrains.marker.jvm.detect.JVMLoggerDetector +import spp.jetbrains.marker.py.detect.PythonEndpointDetector +import spp.jetbrains.marker.py.detect.PythonLoggerDetector import spp.jetbrains.marker.source.info.EndpointDetector import spp.jetbrains.marker.source.info.LoggerDetector import spp.jetbrains.marker.source.mark.api.event.SourceMarkEvent diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt index 5cd746322..090cf3a2b 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/tree/VariableRootSimpleNode.kt @@ -18,9 +18,9 @@ package spp.jetbrains.sourcemarker.service.instrument.breakpoint.tree import com.intellij.ui.treeStructure.SimpleNode import com.intellij.util.containers.hash.LinkedHashMap -import spp.jetbrains.marker.js.JavascriptVariableRootNode -import spp.jetbrains.marker.jvm.JVMVariableSimpleNode -import spp.jetbrains.marker.py.PythonVariableRootNode +import spp.jetbrains.marker.js.presentation.JavascriptVariableRootNode +import spp.jetbrains.marker.jvm.presentation.JVMVariableSimpleNode +import spp.jetbrains.marker.py.presentation.PythonVariableRootNode import spp.jetbrains.sourcemarker.service.instrument.breakpoint.StackFrameManager import spp.protocol.artifact.ArtifactLanguage import spp.protocol.instrument.variable.LiveVariableScope