Fixes diagnostic error with use, non_intrinsic

Fixes False positive: Object not found in scope in case of "USE, NON_INTRINSIC" #206

A unittest has also been added

Author: gnikit

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELONG
 
+## 1.14.3
+
+### Fixes
+
+* Fixes parsing of `non_intrinsic` modules
+  ([#206](https://github.com/hansec/fortran-language-server/issues/206))
+
 ## 1.14.2
 
 ### Fixes

fortls/parse_fortran.py

@@ -37,7 +37,8 @@
     import io
 # Fortran statement matching rules
 USE_REGEX = re.compile(
-    r"[ ]*USE([, ]+INTRINSIC)?[ :]+([a-z0-9_]*)([, ]+ONLY[ :]+)?", re.I
+    r"[ ]*USE([, ]+(?:INTRINSIC|NON_INTRINSIC))?[ :]+(\w*)([, ]+ONLY[ :]+)?",
+    re.I,
 )
 IMPORT_REGEX = re.compile(r"[ ]*IMPORT[ :]+([a-z_])", re.I)
 INCLUDE_REGEX = re.compile(r"[ ]*INCLUDE[ :]*[\'\"]([^\'\"]*)", re.I)

test/test_server.py

@@ -225,6 +225,7 @@ def check_return(result_array):
             ["test_inherit", 2, 0],
             ["test_int", 2, 0],
             ["test_mod", 2, 0],
+            ["test_nonint_mod", 2, 0],
             ["test_program", 2, 0],
             ["test_rename_sub", 6, 9],
             ["test_select", 2, 0],
@@ -608,6 +609,11 @@ def test_diagnostic_interfaces():
     string += write_rpc_notification(
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
+    # Test that  use, non_intrinsic does not raise a diagnostic error
+    file_path = os.path.join(test_dir, "test_nonintrinsic.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
     # Example of a diagnostics message
     # string += write_rpc_notification(
     #     "textDocument/publishDiagnostics",

test/test_source/test_nonintrinsic.f90

@@ -0,0 +1,11 @@
+module test_nonint_mod
+   private
+   integer, parameter, public :: DP = kind(0.0D0)
+end module test_nonint_mod
+
+program nonint
+   use, non_intrinsic :: test_nonint_mod, only : DP
+   implicit none
+   real(DP) :: x
+   x = 0.0_DP
+end program nonint