Fixes references for semi-implicit function result

functions that do not use the word `result` but do define a variable
that is the same as the function name previously failed to get refs

A unittest has been added for this case

Author: gnikit

fortls/langserver.py

@@ -907,34 +907,31 @@ def get_all_references(self, def_obj, type_mem, file_obj=None):
                     continue
                 for match in NAME_REGEX.finditer(line):
                     var_def = self.get_definition(file_obj, i, match.start(1) + 1)
-                    if var_def is not None:
-                        ref_match = False
-                        if (def_fqsn == var_def.FQSN) or (
-                            var_def.FQSN in override_cache
+                    if var_def is None:
+                        continue
+                    ref_match = False
+                    if def_fqsn == var_def.FQSN or var_def.FQSN in override_cache:
+                        ref_match = True
+                    elif var_def.parent and var_def.parent.get_type() == CLASS_TYPE_ID:
+                        if type_mem:
+                            for inherit_def in var_def.parent.get_overridden(def_name):
+                                if def_fqsn == inherit_def.FQSN:
+                                    ref_match = True
+                                    override_cache.append(var_def.FQSN)
+                                    break
+                        if (
+                            (var_def.sline - 1 == i)
+                            and (var_def.file_ast.path == filename)
+                            and (line.count("=>") == 0)
                         ):
-                            ref_match = True
-                        elif var_def.parent.get_type() == CLASS_TYPE_ID:
-                            if type_mem:
-                                for inherit_def in var_def.parent.get_overridden(
-                                    def_name
-                                ):
-                                    if def_fqsn == inherit_def.FQSN:
-                                        ref_match = True
-                                        override_cache.append(var_def.FQSN)
-                                        break
-                            if (
-                                (var_def.sline - 1 == i)
-                                and (var_def.file_ast.path == filename)
-                                and (line.count("=>") == 0)
-                            ):
-                                try:
-                                    if var_def.link_obj is def_obj:
-                                        ref_objs.append(var_def)
-                                        ref_match = True
-                                except:
-                                    pass
-                        if ref_match:
-                            file_refs.append([i, match.start(1), match.end(1)])
+                            try:
+                                if var_def.link_obj is def_obj:
+                                    ref_objs.append(var_def)
+                                    ref_match = True
+                            except:
+                                pass
+                    if ref_match:
+                        file_refs.append([i, match.start(1), match.end(1)])
             if len(file_refs) > 0:
                 refs[filename] = file_refs
         return refs, ref_objs

test/test_server.py

@@ -463,6 +463,8 @@ def def_request(file_path, line, char):
     file_path = test_dir / "subdir" / "test_rename.F90"
     string += def_request(file_path, 13, 5)
     string += def_request(file_path, 14, 5)
+    file_path = test_dir / "hover" / "functions.f90"
+    string += def_request(file_path, 3, 17)
     errcode, results = run_request(string)
     assert errcode == 0
     #
@@ -488,6 +490,8 @@ def def_request(file_path, line, char):
         # subdir/test_rename.F90
         [6, 6, str(test_dir / "subdir" / "test_rename.F90")],
         [1, 1, str(test_dir / "subdir" / "test_rename.F90")],
+        # hover/functions.f90
+        [3, 3, str(test_dir / "hover" / "functions.f90")],
     )
     assert len(exp_results) + 1 == len(results)
     for i in range(len(exp_results)):