Skip to content

Commit 7322ee5

Browse files
BFergersonBFergerson
authored
v0.5.0 (#742)
* archive media * should be only place that needs null check * revert to dynamic * fixes #701 * use readme for unreleased * verify oldest version * bump vertx * determine locale * translate * bump * impl guide marks * #610 * url can be censored * fix modified check * dev id will always be system * ability to get sw version * #695 * sw 9 uses endpoint_resp_time instead of endpoint_avg * basic py coding for LCP * basic py coding for LCP * formatting * correct defaults * sw 9 compatability * use guide marks * fix isModified (handles override=true) * sw 9 compatability * use guide marks * override can't be modified * single page portals preload views * remove spp-skywalking-reroute header add spp-platform-request header changed port 5445 to 12800 for live-platform * fix isModified * changed port 5445 to 12800 for live-platform * impl failing endpoint indicator for SW oap * live platform supports endpoint id and endpoint name subs * send events directly to subs * bump * bump * bump * bump * /graphql/spp endpoint * bump * correct * use SourceMarkerPlugin.getConfig * test * dev commands + booster ui * move portal logic * initial url * using dev commands * using dev commands * relative icon * handle missing resource * impl instruments dev commands * bump * clean * bump * refactor * bump * bump * new command command * new command command * refactor dev commands * sort/filter commands * refactor * use more memory * bump intellij * refactor * bump * command config * boot-time command * remove suspend * impl library check * impl watch-variable * smaller default description font size * fix commander * bump * with submodules * test * limit to commander * limit to commander * fix plugin verify * bump * bump * fix plugin verify * revert version * create kotlin guide marks * don't show control bar on kt fields * don't show control bar on kt properties * work on class expressions * bump * revert * bump * removed * bump * paint hints/require command params * more strict * can show on local properties * works in mono repo * bump * bump * impl rest * bump * bump * unused * bump * get by project * add kotlin version * Update build.yml * fix autocomplete tab/enter * use internal portal * bump * bump
1 parent a2a55bb commit 7322ee5

File tree

61 files changed

+892
-1854
lines changed

Some content is hidden

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

61 files changed

+892
-1854
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
# Check out current repository
4545
- name: Fetch Sources
4646
uses: actions/checkout@v2.4.0
47+
with:
48+
submodules: true
4749

4850
# Validate wrapper
4951
- name: Gradle Wrapper Validation
@@ -108,9 +110,11 @@ jobs:
108110
name: pluginVerifier-result
109111
path: ${{ github.workspace }}/plugin/build/reports/pluginVerifier
110112

111-
# Run Qodana inspections
112-
- name: Qodana - Code Inspection
113-
uses: JetBrains/qodana-action@v4.2.3
113+
# # Run Qodana inspections
114+
# - name: Qodana - Code Inspection
115+
# uses: JetBrains/qodana-action@v4.2.3
116+
# with:
117+
# upload-result: false
114118

115119
# Prepare plugin archive content for creating artifact
116120
- name: Prepare Plugin Artifact

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "test/e2e/example-web-app"]
22
path = test/e2e/example-web-app
33
url = https://github.com/sourceplusplus/example-web-app
4+
[submodule "commander"]
5+
path = commander
6+
url = https://github.com/sourceplusplus/jetbrains-commander

‎build.gradle.kts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id("com.diffplug.spotless") apply false
55
id("com.avast.gradle.docker-compose")
66
id("org.jetbrains.kotlin.jvm") apply false
7-
id("io.gitlab.arturbosch.detekt")
7+
// id("io.gitlab.arturbosch.detekt") apply false
88
id("maven-publish")
99
}
1010

@@ -25,22 +25,18 @@ repositories {
2525
}
2626

2727
subprojects {
28-
ext {
29-
set("kotlinVersion", "1.5.0")
30-
}
31-
3228
repositories {
3329
mavenCentral()
3430
maven(url = "https://jitpack.io")
3531
}
3632

3733
apply<MavenPublishPlugin>()
38-
apply<io.gitlab.arturbosch.detekt.DetektPlugin>()
34+
// apply<io.gitlab.arturbosch.detekt.DetektPlugin>()
3935
tasks {
40-
withType<io.gitlab.arturbosch.detekt.Detekt> {
41-
parallel = true
42-
buildUponDefaultConfig = true
43-
}
36+
// withType<io.gitlab.arturbosch.detekt.Detekt> {
37+
// parallel = true
38+
// buildUponDefaultConfig = true
39+
// }
4440

4541
withType<JavaCompile> {
4642
sourceCompatibility = "1.8"
@@ -70,7 +66,7 @@ subprojects {
7066
apply(plugin = "com.diffplug.spotless")
7167
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
7268
kotlin {
73-
targetExclude("**/generated/**")
69+
targetExclude("**/generated/**", "**/liveplugin/**")
7470
if (file("../LICENSE-HEADER.txt").exists()) {
7571
licenseHeaderFile(file("../LICENSE-HEADER.txt"))
7672
} else {

‎commander‎

Submodule commander added at a9ef4be

‎gradle.properties‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,27 @@ kotlin.code.style=official
44

55
pluginGroup = spp.jetbrains
66
pluginName = Source++
7-
projectVersion=0.4.7
8-
pluginSinceBuild = 202.4357
7+
projectVersion=0.5.0
8+
pluginSinceBuild = 221.5080.210
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
11-
pluginVerifierIdeVersions = 2020.2.4, 2021.3.3
11+
pluginVerifierIdeVersions = 2022.1, 2022.1.1
1212

1313
platformType = IC
14-
ideVersion = 2021.3.3
14+
ideVersion = 2022.1.1
1515
platformDownloadSources = true
1616
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1717
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
18-
platformPlugins = java, Groovy, Kotlin, PythonCore:213.5744.223, org.intellij.scala:2021.3.18
18+
platformPlugins = java, Groovy, Kotlin, PythonCore:221.5591.52, org.intellij.scala:2022.1.14
1919

2020
# Opt-out flag for bundling Kotlin standard library.
2121
# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
2222
kotlin.stdlib.default.dependency = true
2323

2424
apolloVersion=3.3.0
25-
vertxVersion=4.2.6
25+
vertxVersion=4.3.0
2626
slf4jVersion=1.7.33
2727
jacksonVersion=2.13.1
2828
joorVersion=0.9.13
29+
30+
kotlinVersion=1.6.10

‎marker/build.gradle.kts‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
11
plugins {
22
id("org.jetbrains.kotlin.jvm")
3-
id("maven-publish")
43
}
54

6-
val kotlinVersion = ext.get("kotlinVersion")
5+
val kotlinVersion: String by project
76
val pluginGroup: String by project
87
val projectVersion: String by project
98
val slf4jVersion: String by project
109
val joorVersion: String by project
11-
12-
publishing {
13-
publications {
14-
create<MavenPublication>("maven") {
15-
groupId = pluginGroup
16-
artifactId = "marker"
17-
version = projectVersion
18-
19-
from(components["java"])
20-
}
21-
}
22-
}
10+
val vertxVersion: String by project
2311

2412
repositories {
2513
maven(url = "https://www.jetbrains.com/intellij-repository/releases") { name = "intellij-releases" }
2614
maven(url = "https://cache-redirector.jetbrains.com/intellij-dependencies/") { name = "intellij-dependencies" }
2715
}
2816

2917
dependencies {
30-
val intellijVersion = "213.7172.25"
18+
val intellijVersion = "221.5080.210"
3119

20+
compileOnly("io.vertx:vertx-core:$vertxVersion")
3221
compileOnly("org.jooq:joor:$joorVersion")
3322
compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
34-
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")
23+
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
3524
compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
3625
compileOnly("com.google.guava:guava:31.1-jre")
3726
compileOnly("org.jetbrains:annotations:23.0.0")

‎marker/jvm-marker/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id("org.jetbrains.kotlin.jvm")
33
}
44

5-
val kotlinVersion = ext.get("kotlinVersion")
5+
val kotlinVersion: String by project
66
val vertxVersion: String by project
77
val projectVersion: String by project
88
val slf4jVersion: String by project
@@ -22,9 +22,9 @@ dependencies {
2222
compileOnly(project(":monitor"))
2323
}
2424
compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
25-
val intellijVersion = "213.7172.25"
25+
val intellijVersion = "221.5080.210"
2626

27-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")
27+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
2828
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
2929
implementation("com.google.guava:guava:31.1-jre")
3030
implementation("org.jetbrains:annotations:23.0.0")

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ 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 org.jetbrains.uast.UClass
24-
import org.jetbrains.uast.UExpression
25-
import org.jetbrains.uast.UMethod
26-
import org.jetbrains.uast.toUElement
23+
import org.jetbrains.uast.*
2724
import spp.jetbrains.marker.ArtifactNamingService
2825
import spp.jetbrains.marker.source.JVMMarkerUtils
2926
import spp.protocol.artifact.ArtifactQualifiedName
@@ -42,6 +39,7 @@ class JVMArtifactNamingService : ArtifactNamingService {
4239
is UClass -> JVMMarkerUtils.getFullyQualifiedName(uElement)
4340
is UMethod -> JVMMarkerUtils.getFullyQualifiedName(uElement)
4441
is UExpression -> JVMMarkerUtils.getFullyQualifiedName(element)
42+
is UDeclaration -> JVMMarkerUtils.getFullyQualifiedName(element)
4543
else -> TODO("Not yet implemented")
4644
}
4745
}

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package spp.jetbrains.marker.jvm
1919

2020
import com.intellij.openapi.application.ApplicationManager
2121
import com.intellij.psi.JavaRecursiveElementVisitor
22+
import com.intellij.psi.PsiElement
2223
import com.intellij.psi.PsiMethod
2324
import com.intellij.psi.PsiNameIdentifierOwner
2425
import spp.jetbrains.marker.plugin.SourceGuideProvider
@@ -29,15 +30,22 @@ class JVMGuideProvider : SourceGuideProvider {
2930

3031
override fun determineGuideMarks(fileMarker: SourceFileMarker) {
3132
fileMarker.psiFile.acceptChildren(object : JavaRecursiveElementVisitor() {
32-
override fun visitMethod(method: PsiMethod) {
33-
super.visitMethod(method)
34-
35-
ApplicationManager.getApplication().runReadAction {
36-
fileMarker.createMethodSourceMark(
37-
method as PsiNameIdentifierOwner, SourceMark.Type.GUIDE
38-
).apply(true)
33+
override fun visitElement(element: PsiElement) {
34+
super.visitElement(element)
35+
if (element is PsiMethod) {
36+
makeMethodGuideMark(fileMarker, element)
37+
} else if (element::class.java.name == "org.jetbrains.kotlin.psi.KtNamedFunction") {
38+
makeMethodGuideMark(fileMarker, element)
3939
}
4040
}
4141
})
4242
}
43+
44+
private fun makeMethodGuideMark(fileMarker: SourceFileMarker, element: PsiElement) {
45+
ApplicationManager.getApplication().runReadAction {
46+
fileMarker.createMethodSourceMark(
47+
element as PsiNameIdentifierOwner, SourceMark.Type.GUIDE
48+
).apply(true)
49+
}
50+
}
4351
}

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ package spp.jetbrains.marker.jvm
2020
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
2121
import com.intellij.codeInsight.daemon.LineMarkerInfo
2222
import com.intellij.openapi.editor.markup.GutterIconRenderer
23-
import com.intellij.psi.*
23+
import com.intellij.psi.PsiClass
24+
import com.intellij.psi.PsiElement
25+
import com.intellij.psi.PsiIdentifier
26+
import com.intellij.psi.PsiJavaFile
2427
import org.jetbrains.kotlin.psi.KtFile
25-
import org.jetbrains.kotlin.psi.KtNamedFunction
2628
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
27-
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
2829
import org.jetbrains.uast.UClass
2930
import org.jetbrains.uast.UMethod
3031
import org.jetbrains.uast.toUElement
@@ -58,15 +59,7 @@ abstract class JVMLineMarkerProvider : SourceLineMarkerProvider() {
5859
): LineMarkerInfo<PsiElement>? {
5960
return when {
6061
parent is PsiClass && element === parent.nameIdentifier -> getClassGutterMark(element)
61-
parent is PsiMethod && element === parent.nameIdentifier -> getMethodGutterMark(element)
62-
parent?.javaClass?.simpleName?.equals("GrMethod") == true
63-
&& (parent is GrMethod && element === parent.nameIdentifierGroovy) -> {
64-
getMethodGutterMark(element)
65-
}
66-
parent?.javaClass?.simpleName?.equals("KtNamedFunction") == true
67-
&& (parent is KtNamedFunction && element === parent.nameIdentifier) -> {
68-
getMethodGutterMark(element)
69-
}
62+
element == JVMMarkerUtils.getNameIdentifier(parent) -> getMethodGutterMark(element)
7063
else -> null
7164
}
7265
}

0 commit comments

Comments
 (0)