Added support for wrong methodCodeObjectId

Author: MykolaYaremchuk

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.37] - 2023-03-08
+### Changed
+- Added support for wrong methodCodeObjectId
+
+## [2.0.36] - 2023-03-07
+### Changed
+- Add support for test files
+
 ## [2.0.35] - 2023-03-01
 ### Changed
 - Applied new UI theme styles for Jetbrains
@@ -30,4 +38,6 @@ All notable changes to this project will be documented in this file.
 [2.0.33]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.32...v2.0.33
 [2.0.34]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.33...v2.0.34
 [2.0.35]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.34...v2.0.35
-[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.35...HEAD
+[2.0.36]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.35...v2.0.36
+[2.0.37]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.36...v2.0.37
+[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.37...HEAD

build.gradle.kts

@@ -1,4 +1,5 @@
 import common.properties
+import org.jetbrains.changelog.date
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.tasks.ListProductsReleasesTask
 import org.jetbrains.changelog.exceptions.MissingVersionException
@@ -44,6 +45,15 @@ intellij {
     }
 }
 
+// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
+changelog {
+    version.set(project.semanticVersion.version.get().toString())
+    path.set("${project.projectDir}/CHANGELOG.md")
+    groups.set(listOf("Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"))
+//    groups.set(emptyList())
+    header.set(provider { "[${version.get()}] - ${date()}" })
+    keepUnreleasedSection.set(false)
+}
 
 // Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
 qodana {

java/src/main/java/org/digma/intellij/plugin/idea/psi/java/JavaLanguageService.java

@@ -259,24 +259,26 @@ public Map<String, Pair<String, Integer>> findWorkspaceUrisForMethodCodeObjectId
 
         methodCodeObjectIds.forEach(id -> {
 
-            var className = id.substring(0, id.indexOf("$_$"));
-
-            //the code object id for inner classes separates inner classes name with $, but intellij index them with a dot
-            className = className.replace('$', '.');
-
-            //searching in project scope will find only project classes
-            Collection<PsiClass> psiClasses =
-                    JavaFullClassNameIndex.getInstance().get(className, project, GlobalSearchScope.projectScope(project));
-            if (!psiClasses.isEmpty()) {
-                //hopefully there is only one class by that name in the project
-                PsiClass psiClass = psiClasses.stream().findAny().get();
-                PsiFile psiFile = PsiTreeUtil.getParentOfType(psiClass, PsiFile.class);
-                for (PsiMethod method : psiClass.getMethods()) {
-                    String javaMethodCodeObjectId = createJavaMethodCodeObjectId(method);
-                    if (javaMethodCodeObjectId.equals(id)) {
-                        if (psiFile != null) {
-                            String url = PsiUtils.psiFileToUri(psiFile);
-                            workspaceUrls.put(id, new Pair<>(url, method.getTextOffset()));
+            if (id.contains("$_$")) {
+                var className = id.substring(0, id.indexOf("$_$"));
+
+                //the code object id for inner classes separates inner classes name with $, but intellij index them with a dot
+                className = className.replace('$', '.');
+
+                //searching in project scope will find only project classes
+                Collection<PsiClass> psiClasses =
+                        JavaFullClassNameIndex.getInstance().get(className, project, GlobalSearchScope.projectScope(project));
+                if (!psiClasses.isEmpty()) {
+                    //hopefully there is only one class by that name in the project
+                    PsiClass psiClass = psiClasses.stream().findAny().get();
+                    PsiFile psiFile = PsiTreeUtil.getParentOfType(psiClass, PsiFile.class);
+                    for (PsiMethod method : psiClass.getMethods()) {
+                        String javaMethodCodeObjectId = createJavaMethodCodeObjectId(method);
+                        if (javaMethodCodeObjectId.equals(id)) {
+                            if (psiFile != null) {
+                                String url = PsiUtils.psiFileToUri(psiFile);
+                                workspaceUrls.put(id, new Pair<>(url, method.getTextOffset()));
+                            }
                         }
                     }
                 }

src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,20 @@
 <!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
 <idea-plugin require-restart="true">
 
-    <change-notes/>
+    <change-notes>
+        <![CDATA[
+      # Changelog
+
+      ## [2.0.37] - 2023-03-08
+      ### Changed
+      - Added support for wrong methodCodeObjectId
+
+      ## [2.0.36] - 2023-03-07
+      ### Changed
+      - Add support for test files
+
+      ]]>
+    </change-notes>
     <id>org.digma.intellij</id>
     <version>${project.version}</version>
     <name>Digma Continuous Feedback</name>