Merge pull request #2762 from digma-ai/support-python

Support python Closes #2761

Author: shalom938

.github/workflows/build-branches.yml

@@ -15,6 +15,7 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.ref_name }}
       build-with-rider: false
+      build-with-pycharm: false
     secrets: inherit
   build-workflow-with-rider:
     strategy:
@@ -25,15 +26,17 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.ref_name }}
       build-with-rider: true
+      build-with-pycharm: false
     secrets: inherit
 
-    ##todo: maybe we want to run plugin verifier on every commit to branch ?
-#  plugin-verifier-workflow:
-#    strategy:
-#      matrix:
-#        profile: [ p241, p242, p243, p251, p252 ]
-#    uses: ./.github/workflows/plugin-verifier-workflow.yml
-#    with:
-#      build-profile: ${{ matrix.profile }}
-#      ref-name: ${{ github.ref_name }}
-#    secrets: inherit
+  build-workflow-with-pycharm:
+    strategy:
+      matrix:
+        profile: [ p241, p242, p243, p251, p252 ]
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      build-profile: ${{ matrix.profile }}
+      ref-name: ${{ github.ref_name }}
+      build-with-rider: false
+      build-with-pycharm: true
+    secrets: inherit

.github/workflows/build-main.yml

@@ -13,6 +13,7 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.ref_name }}
       build-with-rider: false
+      build-with-pycharm: false
     secrets: inherit
   ## can do a double matrix for rider but then it's not clear in github which is the rider build.
   build-workflow-with-rider:
@@ -24,6 +25,19 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.ref_name }}
       build-with-rider: true
+      build-with-pycharm: false
+    secrets: inherit
+
+  build-workflow-with-pycharm:
+    strategy:
+      matrix:
+        profile: [ p241, p242, p243, p251, p252 ]
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      build-profile: ${{ matrix.profile }}
+      ref-name: ${{ github.ref_name }}
+      build-with-rider: false
+      build-with-pycharm: true
     secrets: inherit
 
   plugin-verifier-workflow:

.github/workflows/build-pull-request.yml

@@ -14,6 +14,7 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.event.pull_request.head.sha }}
       build-with-rider: false
+      build-with-pycharm: false
     secrets: inherit
 
   build-workflow-with-rider:
@@ -25,6 +26,19 @@ jobs:
       build-profile: ${{ matrix.profile }}
       ref-name: ${{ github.event.pull_request.head.sha }}
       build-with-rider: true
+      build-with-pycharm: false
+    secrets: inherit
+
+  build-workflow-with-pycharm:
+    strategy:
+      matrix:
+        profile: [ p241, p242, p243, p251, p252 ]
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      build-profile: ${{ matrix.profile }}
+      ref-name: ${{ github.event.pull_request.head.sha }}
+      build-with-rider: false
+      build-with-pycharm: true
     secrets: inherit
 
   plugin-verifier-workflow:

.github/workflows/build-workflow.yml

@@ -12,6 +12,9 @@ on:
       build-with-rider:
         required: true
         type: string
+      build-with-pycharm:
+        required: true
+        type: string
 
 jobs:
   build:
@@ -51,15 +54,22 @@ jobs:
 
 
       - name: Build Plugin
-        if: ${{ inputs.build-with-rider != 'true' }}
+        if: ${{ inputs.build-with-rider != 'true' && inputs.build-with-pycharm != 'true' }}
         run: ./gradlew clean test buildPlugin --no-daemon -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
 
       - name: Build Plugin with Rider
         if: ${{ inputs.build-with-rider == 'true' }}
-        run: ./gradlew clean test buildPlugin --no-daemon -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=true
+        run: ./gradlew clean test buildPlugin --no-daemon -PbuildWithRider=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=false
+
+      - name: Build Plugin with pycharm
+        if: ${{ inputs.build-with-pycharm == 'true' }}
+        run: ./gradlew clean test buildPlugin --no-daemon -PbuildWithPycharm=true -PbuildProfile=${{ inputs.build-profile }} -PbuildSearchableOptions=false
+
+
+
 
       - name: Prepare Plugin Artifact
-        if: ${{ inputs.build-with-rider != 'true' }}
+        if: ${{ inputs.build-with-rider != 'true' && inputs.build-with-pycharm != 'true' }}
         id: artifact
         shell: bash
         run: |
@@ -69,7 +79,7 @@ jobs:
           echo "filename=${FILENAME:0:-4}" >> "$GITHUB_OUTPUT"
 
       - name: Upload Artifact
-        if: ${{ inputs.build-with-rider != 'true' }}
+        if: ${{ inputs.build-with-rider != 'true' && inputs.build-with-pycharm != 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact.outputs.filename }}
@@ -79,7 +89,7 @@ jobs:
       # Collect Tests Result of failed tests
       ##todo: add other modules test reports
       - name: Collect Tests Result
-        if: ${{ inputs.build-with-rider != 'true' || failure() }}
+        if: ${{ inputs.build-with-rider != 'true' && inputs.build-with-pycharm != 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: tests-result-${{ inputs.build-profile }}

.run/Run PyCharm - 2025.2.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run PyCharm - 2025.2" type="GradleRunConfiguration" factoryName="Gradle">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_RD.log" />
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PbuildWithPycharm=true -PbuildProfile=p252 -Pdigma-no-info-logging -x test" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIde" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

build.gradle.kts

@@ -87,6 +87,7 @@ dependencies {
         pluginModule(implementation(project(":maven-support")))
         pluginModule(implementation(project(":rider")))
         pluginModule(implementation(project(":kotlin")))
+        pluginModule(implementation(project(":python")))
 
         pluginVerifier()
         zipSigner()
@@ -130,7 +131,6 @@ changelog {
 //}
 
 
-
 intellijPlatform {
 
     pluginConfiguration {
@@ -206,20 +206,26 @@ intellijPlatform {
                 //there is a feature request: https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1715
                 //ide(platformType, buildProfile.platformVersion)
                 //use recommended() and hope it doesn't fail too much because sometimes it does fail for unknown reasons
-                recommended()
-
-                val channel = if (buildProfile.isEAP) {
-                    ProductRelease.Channel.EAP
-                } else {
-                    ProductRelease.Channel.RELEASE
-                }
-                select {
-                    types =
-                        listOf(IntelliJPlatformType.IntellijIdeaCommunity)
-                    channels = listOf(channel)
-                    sinceBuild = project.currentProfile().pluginSinceBuild
-                    untilBuild = project.currentProfile().pluginUntilBuild
-                }
+//                recommended()
+
+//                val channel = if (buildProfile.isEAP) {
+//                    ProductRelease.Channel.EAP
+//                } else {
+//                    ProductRelease.Channel.RELEASE
+//                }
+//                select {
+//                    types =
+//                        listOf(IntelliJPlatformType.IntellijIdeaCommunity, IntelliJPlatformType.Rider, IntelliJPlatformType.PyCharmCommunity)
+//                    channels = listOf(channel)
+//                    sinceBuild = project.currentProfile().pluginSinceBuild
+//                    untilBuild = project.currentProfile().pluginUntilBuild
+//                }
+
+                val useInstaller = project.useBinaryInstaller()
+
+                ide(IntelliJPlatformType.IntellijIdeaCommunity, buildProfile.platformVersion, useInstaller)
+//                ide(IntelliJPlatformType.PyCharmCommunity, buildProfile.pycharmVersion, useInstaller)
+//                ide(IntelliJPlatformType.Rider, buildProfile.riderVersion, useInstaller)
             }
         }
         subsystemsToCheck = VerifyPluginTask.Subsystems.WITHOUT_ANDROID
@@ -318,9 +324,9 @@ tasks {
             //see https://kotlin.github.io/analysis-api/testing-in-k2-locally.html
             "idea.kotlin.plugin.use.k2" to "true",
 
-           //"jcef.remote.enabled" to true,
-           //"jcef.remote.debug" to true,
-           //"ide.browser.jcef.log.level" to "error",
+            //"jcef.remote.enabled" to true,
+            //"jcef.remote.debug" to true,
+            //"ide.browser.jcef.log.level" to "error",
 
             //"idea.ProcessCanceledException" to "disabled"
 

building-how-to/verify-all-profiles-short.sh

@@ -17,3 +17,7 @@ for i in {1..5}; do echo; done
 
 echo "############ verifyPlugin with 251 ################"
 ./gradlew clean verifyPlugin -PbuildProfile=p251
+for i in {1..5}; do echo; done
+
+echo "############ verifyPlugin with 252 ################"
+./gradlew clean verifyPlugin -PbuildProfile=p252

common-build-logic/src/main/kotlin/common/BuildProfile.kt

@@ -117,7 +117,7 @@ object BuildProfiles {
     )
 
 
-    //todo: check products releases file, can be used to automatically to update the profiles
+    //todo: check products releases file, can be used to automatically update the profiles
     // https://www.jetbrains.com/updates/updates.xml
     // IntelliJPluginConstants.IDEA_PRODUCTS_RELEASES_URL
     // https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#tasks-listproductsreleases
@@ -142,7 +142,7 @@ object BuildProfiles {
             profile = Profile.p241,
             platformVersion = "2024.1.7",
             riderVersion = "2024.1.6",
-            pycharmVersion = "2024.1.5",
+            pycharmVersion = "2024.1.7",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "",
             platformVersionCode = "241",
@@ -157,9 +157,9 @@ object BuildProfiles {
 
         Profile.p242 to BuildProfile(
             profile = Profile.p242,
-            platformVersion = "2024.2.4",
+            platformVersion = "2024.2.6",
             riderVersion = "2024.2.7",
-            pycharmVersion = "2024.2",
+            pycharmVersion = "2024.2.6",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "",
             platformVersionCode = "242",
@@ -174,7 +174,7 @@ object BuildProfiles {
             profile = Profile.p243,
             platformVersion = "2024.3.5",
             riderVersion = "2024.3.6",
-            pycharmVersion = "2024.3",
+            pycharmVersion = "2024.3.5",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "PROFILE_2024_3",
             platformVersionCode = "243",
@@ -189,7 +189,7 @@ object BuildProfiles {
             profile = Profile.p251,
             platformVersion = "2025.1.2",
             riderVersion = "2025.1.2",
-            pycharmVersion = "2025.1.1.1",
+            pycharmVersion = "2025.1.2",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "PROFILE_2024_3",
             platformVersionCode = "251",
@@ -215,7 +215,6 @@ object BuildProfiles {
             kotlinJvmTarget = JvmTarget.JVM_21,
             javaVersion = JavaVersion.VERSION_21.majorVersion,
         )
-
     )
 
 }

ide-common/src/main/kotlin/org/digma/intellij/plugin/codelens/provider/CodeLensBuilder.kt

@@ -32,7 +32,7 @@ internal class CodeLensBuilder(private val project: Project) {
 
         val methodsWithCodeLens = AnalyticsService.getInstance(project).getCodeLensByMethods(methodsWithCodeObjects).methodWithCodeLens
 
-        methodsWithCodeLens.forEach { methodWithCodeLens: MethodWithCodeLens ->
+        distinctForPython(documentInfo, methodsWithCodeLens).forEach { methodWithCodeLens: MethodWithCodeLens ->
 
             val codeObjectId = CodeObjectsUtil.stripMethodPrefix(methodWithCodeLens.methodCodeObjectId)
             val decorators: MutableList<Decorator> = methodWithCodeLens.decorators.toMutableList()
@@ -76,12 +76,43 @@ internal class CodeLensBuilder(private val project: Project) {
                 title,
                 1,
                 liveDecorator.description,
-                "Go to $title")
+                "Go to $title"
+            )
         return codeLens
     }
 
 
     private fun isImportant(importanceLevel: Int): Boolean {
         return importanceLevel <= InsightImportance.HighlyImportant.priority && importanceLevel >= InsightImportance.ShowStopper.priority
     }
+
+
+    /*
+    in python we send multiple ids for a method, we may get multiple MethodWithCodeLens for the same method, for each id or some of the ids.
+    we want to keep only one MethodWithCodeLens for a method with the decorators from all the MethodWithCodeLens belonging to the same method.
+     */
+    private fun distinctForPython(documentInfo: DocumentInfo, methodsWithCodeLens: List<MethodWithCodeLens>): List<MethodWithCodeLens> {
+        //don't need to do it if it's not python
+        if (documentInfo.languageId.lowercase() != "python") {
+            return methodsWithCodeLens
+        }
+
+
+        val methodWithCodeLensByMethodIds = methodsWithCodeLens.associateBy { it.methodCodeObjectId }
+        val newMethodsWithCodeLens = mutableMapOf<String, MutableSet<Decorator>>()
+        documentInfo.methods.forEach { (methodId, methodInfo) ->
+            methodInfo.allIdsWithType().forEach { id: String ->
+                val methodWithCodeLens = methodWithCodeLensByMethodIds[id]
+                if (methodWithCodeLens != null) {
+                    val newDecorators = newMethodsWithCodeLens.computeIfAbsent(methodId) { mutableSetOf() }
+                    //map the decorators to have the same method id
+                    val decorators = methodWithCodeLens.decorators.map { Decorator(it.title,it.description,methodId,it.spanCodeObjectId,it.importance) }.toSet()
+                    //relying on that Decorator is a data class with correct equals and hashCode so this will merge and ignore duplicates.
+                    newDecorators.addAll(decorators)
+                }
+            }
+        }
+
+        return newMethodsWithCodeLens.map { (id, decorators) -> MethodWithCodeLens(id, decorators.toList()) }.toList()
+    }
 }

ide-common/src/main/kotlin/org/digma/intellij/plugin/common/SearchScopeProvider.kt

@@ -1,5 +1,6 @@
 package org.digma.intellij.plugin.common
 
+import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.SearchScope
 import java.util.function.Supplier
 
@@ -8,4 +9,6 @@ import java.util.function.Supplier
  * SearchScope must be created in ReadAccess, but sometimes we send a search scope for a method before
  * opening read access. in these cases send a SearchScopeProvider and call get only in read access.
  */
-fun interface SearchScopeProvider : Supplier<SearchScope>
+fun interface SearchScopeProvider : Supplier<SearchScope>
+
+fun interface GlobalSearchScopeProvider : Supplier<GlobalSearchScope>