normalize file uri from resharper (#173)

Author: shalom938

rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/CodeObjectHost.kt

@@ -26,8 +26,12 @@ class CodeObjectHost(project: Project): LifetimedProjectComponent(project) {
 
     //Note: using the file uri as the document key in rider protocol proved to be unstable because of
     // differences in conversion between linux and windows.
-    // so the document key is just its full path without the URI schema 'file:///'
-    // the Document has a fileUri field which is a uri with schema and is used to find a psi file in rider the frontend.
+    //when running on windows the file:// schema has different number of slashes between resharper and the jvm,
+    // and so it's not possible to use it as a map key in both sides.
+    // so the document key is just its full path without the URI schema 'file:///', in resharper we use just the path
+    // as the map key and in java we take the path from the PsiFile.
+    // the Document has a fileUri field which is an uri with schema and is used to find a psi file in rider frontend.
+    // PsuUtil.uriToPsiFile work ok with both the uri from resharper and the uri in the jvm side.
 
 
     fun getDocument(psiFile: PsiFile): DocumentInfo? {
@@ -121,7 +125,7 @@ class CodeObjectHost(project: Project): LifetimedProjectComponent(project) {
 
 
     private fun Document.toDocumentInfo() = DocumentInfo(
-        fileUri = fileUri,
+        fileUri = normalizeFileUri(fileUri,project),
         methods = toMethodInfoMap(methods)
 
     )
@@ -140,7 +144,7 @@ class CodeObjectHost(project: Project): LifetimedProjectComponent(project) {
         name = name,
         containingClass = containingClass,
         containingNamespace = containingNamespace,
-        containingFileUri = containingFileUri,
+        containingFileUri = normalizeFileUri(containingFileUri,project),
         offsetAtFileUri = offsetAtFileUri,
         spans = toSpansList(spans)
     )
@@ -157,7 +161,7 @@ class CodeObjectHost(project: Project): LifetimedProjectComponent(project) {
         id = id,
         name = name,
         containingMethod = containingMethod,
-        containingFileUri = containingFileUri
+        containingFileUri = normalizeFileUri(containingFileUri,project)
     )
 
 

rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/ElementUnderCaretDetector.kt

@@ -85,9 +85,11 @@ class ElementUnderCaretDetector(project: Project) : LifetimedProjectComponent(pr
         id = fqn,
         name = name,
         className = className,
-        fileUri = fileUri,
+        fileUri = normalizeFileUri(fileUri,project),
         isSupportedFile = isSupportedFile
     )
 
 
+
+
 }

rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/protocol.kt

@@ -1,5 +1,31 @@
 @file:JvmName("Protocol")
 package org.digma.intellij.plugin.rider.protocol
 
+import com.intellij.openapi.project.Project
+import org.digma.intellij.plugin.psi.PsiUtils
+
 
 //extensions to protocol classes can be written here
+
+/*
+There is an issue with file uri when running on windows,
+the uri has a file:// schema,
+when calling in resharper IPsiSourceFile.GetLocation().ToUri().ToString() it will return a file schema with different
+number of slashes then when calling in the java side to PsiFile.getVirtualFile().getUrl().
+it causes issues when using the uri in various maps.
+the solution here is to always normalize the uri that comes from the resharper side to a uri as comes in the jvm side.
+so actually every object that passes from resharper to the jvm and has a uri that was taken from
+IPsiSourceFile.GetLocation().ToUri().ToString() needs to be normalized.
+PsiUtils.uriToPsiFile(fileUri,project) will always work , with 2 or with 3 slashes.
+not all file uri in all objects is used, the main one that causes issues if the MethodUnderCaretEvent.fileUri,
+but we normalize all the objects.
+ */
+fun normalizeFileUri(fileUri: String,project:Project): String {
+
+    if (fileUri.isBlank()){
+        return fileUri
+    }
+
+    val psiFile = PsiUtils.uriToPsiFile(fileUri,project)
+    return PsiUtils.psiFileToUri(psiFile)
+}