fix-issues-192-188 (#200)

Author: shalom938

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

@@ -127,6 +127,7 @@ public boolean isSupportedFile(Project project, PsiFile psiFile) {
     @Override
     @NotNull
     public MethodUnderCaret detectMethodUnderCaret(@NotNull Project project, @NotNull PsiFile psiFile, int caretOffset) {
+        //MethodUnderCaret.isSupportedFile is always true here because this method will only be called on supported files
         PsiElement underCaret = findElementUnderCaret(project, psiFile, caretOffset);
         if (underCaret == null) {
             return new MethodUnderCaret("", "", "", PsiUtils.psiFileToUri(psiFile), true);

rider/Digma.Rider.Plugin/Digma.Rider/Protocol/ElementUnderCaretHost.cs

@@ -155,8 +155,9 @@ private void Register()
                     using (WriteLockCookie.Create())
                     {
                         Log(_logger, "Resetting model to empty");
+                        //when clearing to empty values isSupportedFile should be true so the UI will be cleared but not show a non supported file message
                         _model.ElementUnderCaret.Value =
-                            new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, string.Empty);
+                            new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, string.Empty,true);
                     }
 
                     OnChange();
@@ -243,8 +244,9 @@ private void OnChange([NotNull] ITextControl textControl, [NotNull] IPsiSourceFi
                     var methodName = PsiUtils.GetDeclaredName(functionDeclaration);
                     var className = PsiUtils.GetClassName(functionDeclaration);
                     var fileUri = Identities.ComputeFileUri(psiSourceFile);
+                    var isSupportedFile = PsiUtils.IsPsiSourceFileApplicable(psiSourceFile);
                     var newElementUnderCaret =
-                        new MethodUnderCaretEvent(methodFqn, methodName, className, fileUri);
+                        new MethodUnderCaretEvent(methodFqn, methodName, className, fileUri,isSupportedFile);
                     Log(_logger, "Creating MethodUnderCaretEvent {0} for function {1}", newElementUnderCaret,
                         functionDeclaration);
                     UpdateModelAndNotify(newElementUnderCaret);
@@ -293,8 +295,9 @@ private void NotifyWithFileUri([CanBeNull] IPsiSourceFile psiSourceFile)
             {
                 var fileUri = Identities.ComputeFileUri(psiSourceFile);
                 Log(_logger, "Updating model with fileUri {0}", fileUri);
+                var isSupportedFile = PsiUtils.IsPsiSourceFileApplicable(psiSourceFile);
                 var newElementUnderCaret =
-                    new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, fileUri);
+                    new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, fileUri,isSupportedFile);
                 UpdateModelAndNotify(newElementUnderCaret);
             }
         }
@@ -325,7 +328,8 @@ private void UpdateModelAndNotify([NotNull] MethodUnderCaretEvent newMethodUnder
         private void ClearModel()
         {
             Log(_logger, "Clearing model to empty values");
-            UpdateModelAndNotify(new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, string.Empty));
+            //when clearing to empty values isSupportedFile should be true so the UI will be cleared but not show a non supported file message
+            UpdateModelAndNotify(new MethodUnderCaretEvent(string.Empty, string.Empty, string.Empty, string.Empty,true));
         }
 
 

rider/Digma.Rider.Plugin/Digma.Rider/Util/PsiUtils.cs

@@ -61,8 +61,10 @@ public static bool IsPsiSourceFileApplicable([NotNull] IPsiSourceFile psiSourceF
         {
             var properties = psiSourceFile.Properties;
             var primaryPsiLanguage = psiSourceFile.PrimaryPsiLanguage;
-            var isApplicable = !primaryPsiLanguage.IsNullOrUnknown() &&
+            var isApplicable = psiSourceFile.IsValid() &&
+                               !primaryPsiLanguage.IsNullOrUnknown() &&
                                !properties.IsGeneratedFile &&
+                               !properties.IsNonUserFile &&
                                primaryPsiLanguage.Is<CSharpLanguage>() &&
                                properties.ShouldBuildPsi &&
                                properties.ProvidesCodeModel &&

rider/protocol/src/main/kotlin/rider/model/ElementUnderCaretModel.kt

@@ -13,7 +13,7 @@ object ElementUnderCaretModel : Ext(SolutionModel.Solution) {
         field("name", PredefinedType.string)
         field("className", PredefinedType.string)
         field("fileUri", PredefinedType.string)
-        field("isSupportedFile", PredefinedType.bool).default(true).documentation = "Used when a source file is not applicable for code objects, for example classes from external assemblies"
+        field("isSupportedFile", PredefinedType.bool).documentation = "Used when a source file is not applicable for code objects, for example classes from external assemblies"
     }
 
 

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

@@ -53,7 +53,7 @@ class ElementUnderCaretDetector(project: Project) : LifetimedProjectComponent(pr
     fun emptyModel() {
         model.protocol.scheduler.invokeOrQueue {
             WriteAction.run<Exception> {
-                model.elementUnderCaret.set(MethodUnderCaretEvent("", "", "", ""))
+                model.elementUnderCaret.set(MethodUnderCaretEvent("", "", "", "",true))
             }
         }
     }

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

@@ -2,6 +2,7 @@
 package org.digma.intellij.plugin.rider.protocol
 
 import com.intellij.openapi.project.Project
+import org.digma.intellij.plugin.psi.PsiFileNotFountException
 import org.digma.intellij.plugin.psi.PsiUtils
 
 
@@ -40,6 +41,13 @@ fun normalizeFileUri(fileUri: String,project:Project): String {
         return fileUri
     }
 
-    val psiFile = PsiUtils.uriToPsiFile(fileUri,project)
-    return PsiUtils.psiFileToUri(psiFile)
+    //when this method is called from ElementUnderCaretDetector.toModel the file uri may be a non supported file
+    //like json or a non-user file where there is no psi file. so in that case catch the exception and just return
+    //the original file uri
+    return try {
+        val psiFile = PsiUtils.uriToPsiFile(fileUri, project)
+        PsiUtils.psiFileToUri(psiFile)
+    }catch (e:PsiFileNotFountException){
+        fileUri
+    }
 }