Fix INCLUDE files not in scope #13

Author: gnikit

CHANGELOG.md

@@ -24,6 +24,8 @@
   multiline but the function body can.
 - Fixes objects marked `EXTERNAL` across multiple lines
   ([#169](https://github.com/hansec/fortran-language-server/issues/169))
+- Fixes include with external files
+  ([gnikit/fortls#13](https://github.com/gnikit/fortls/issues/13))
 
 ## 1.16.0
 

fortls/objects.py

@@ -188,6 +188,8 @@ def check_scope(
         strip_str = strip_str.replace("'", "")
         for inc in scope.file_ast.include_statements:
             if strip_str == inc.path:
+                if inc.file is None:
+                    return None
                 return fortran_include(inc.file.ast, inc.line_number, inc.path)
 
     # Setup USE search

test/test_server.py

@@ -1,4 +1,5 @@
 import os
+# from types import NoneType
 from setup_tests import (
     run_request,
     write_rpc_request,
@@ -375,6 +376,10 @@ def sig_request(file_path, line, char):
 
 def test_def():
     def check_return(result_array, checks):
+        # If no definition is given result is None
+        if result_array is None:
+            assert not checks[0]
+            return None
         assert result_array["uri"] == path_to_uri(checks[2])
         assert result_array["range"]["start"]["line"] == checks[0]
         assert result_array["range"]["start"]["line"] == checks[1]
@@ -404,6 +409,7 @@ def def_request(file_path, line, char):
     file_path = os.path.join(test_dir, "test_inc.f90")
     string += def_request(file_path, 2, 15)
     string += def_request(file_path, 10, 2)
+    string += def_request(file_path, 12, 13)
     file_path = os.path.join(test_dir, "subdir", "test_inc2.f90")
     string += def_request(file_path, 3, 2)
     file_path = os.path.join(test_dir, "subdir", "test_rename.F90")
@@ -428,6 +434,7 @@ def def_request(file_path, line, char):
         # test_inc.f90
         [2, 2, os.path.join(test_dir, "subdir", "test_inc2.f90")],
         [0, 0, os.path.join(test_dir, "subdir", "test_inc2.f90")],
+        [None],
         # subdir/test_inc2.f90
         [4, 4, os.path.join(test_dir, "test_inc.f90")],
         # subdir/test_rename.F90

test/test_source/test_inc.f90

@@ -10,5 +10,6 @@ SUBROUTINE test_sub
 
 val2
 END SUBROUTINE test_sub
+include 'mpi.f'
 
 END MODULE test_mod