Improves coverage

- Adds `WHERE` block tests
- Adds max line and max comment line diagnostic tests
- Adds semicolon tests
- Adds `ENUM` tests
- Disables logging for debug calls and Python 2

Author: gnikit

.coveragerc

@@ -1,3 +1,10 @@
 [run]
 dynamic_context = test_function
 omit = fortls/__init__.py
+
+[report]
+exclude_lines =
+    if debug:
+    log.debug
+    except:
+    if not PY3K:

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Added coverage metric for Codecov
+- Added coverage for `WHERE`, `ENUM`, max line/comment diagnostics and multilines
 
 ## 2.0.1
 

test/test_server.py

@@ -49,6 +49,15 @@ def check_return(result_dict):
     check_return(results[0])
 
 
+def test_logger():
+    """Test the logger"""
+    string = write_rpc_request(1, "initialize", {"rootPath": test_dir})
+    errcode, results = run_request(string, " --debug_log")
+    assert errcode == 0
+    assert results[1]["type"] == 3
+    assert results[1]["message"] == "FORTLS debugging enabled"
+
+
 def test_open():
     string = write_rpc_request(1, "initialize", {"rootPath": test_dir})
     file_path = os.path.join(test_dir, "subdir", "test_free.f90")
@@ -178,13 +187,15 @@ def check_return(result_array):
         objs = (
             ["test", 6, 7],
             ["test_abstract", 2, 0],
+            ["test_enum", 2, 0],
             ["test_external", 2, 0],
             ["test_forall", 2, 0],
             ["test_free", 2, 0],
             ["test_gen_type", 5, 1],
             ["test_generic", 2, 0],
             ["test_inherit", 2, 0],
             ["test_int", 2, 0],
+            ["test_lines", 2, 0],
             ["test_mod", 2, 0],
             ["test_nonint_mod", 2, 0],
             ["test_preproc_keywords", 2, 0],
@@ -193,12 +204,14 @@ def check_return(result_array):
             ["test_rename_sub", 6, 9],
             ["test_select", 2, 0],
             ["test_select_sub", 6, 16],
+            ["test_semicolon", 2, 0],
             ["test_sig_Sub", 6, 67],
             ["test_str1", 13, 5],
             ["test_str2", 13, 5],
             ["test_sub", 6, 8],
             ["test_use_ordering", 2, 9],
             ["test_vis_mod", 2, 0],
+            ["test_where", 2, 0],
         )
         assert len(result_array) == len(objs)
         for i, obj in enumerate(objs):
@@ -657,8 +670,37 @@ def check_return(results, ref_results):
     string += write_rpc_notification(
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
+    # Test where blocks
+    file_path = os.path.join(test_dir, "diag", "test_where.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
+    # Test where semicolon (multi-line)
+    file_path = os.path.join(test_dir, "diag", "test_semicolon.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
+    # Test ENUM block
+    file_path = os.path.join(test_dir, "diag", "test_enum.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
     errcode, results = run_request(string)
     assert errcode == 0
+
+    # Load a different config file
+    # Test long lines
+    root = os.path.join(test_dir, "diag")
+    string = write_rpc_request(1, "initialize", {"rootPath": root})
+    file_path = os.path.join(test_dir, "diag", "test_lines.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
+    file_path = os.path.join(test_dir, "diag", "conf_long_lines.json")
+    errcode, res = run_request(string, f" --config {file_path}")
+    assert errcode == 0
+    results.extend(res[1:])
+
     root = Path(test_dir)
     ref_results = [
         [],
@@ -709,12 +751,36 @@ def check_return(results, ref_results):
         ],
         [],
         [],
+        [],
+        [],
+        [],
+        [
+            {
+                "range": {
+                    "start": {"line": 2, "character": 100},
+                    "end": {"line": 2, "character": 155},
+                },
+                "message": 'Line length exceeds "max_line_length" (100)',
+                "severity": 2,
+            },
+            {
+                "range": {
+                    "start": {"line": 3, "character": 100},
+                    "end": {"line": 3, "character": 127},
+                },
+                "message": (
+                    'Comment line length exceeds "max_comment_line_length" (100)'
+                ),
+                "severity": 2,
+            },
+        ],
     ]
     check_return(results[1:], ref_results)
 
 
 if __name__ == "__main__":
     test_init()
+    test_logger()
     test_open()
     test_change()
     test_symbols()

test/test_source/diag/conf_long_lines.json

@@ -0,0 +1,4 @@
+{
+  "max_line_length": 100,
+  "max_comment_line_length": 100
+}

test/test_source/diag/test_enum.f90

@@ -0,0 +1,12 @@
+program test_enum
+   implicit none
+   enum, bind(c)
+
+      enumerator :: red =1, blue, black =5
+      enumerator yellow
+      enumerator gold, silver, bronze
+      enumerator :: purple
+      enumerator :: pink, lavender
+
+   endenum
+end program test_enum

test/test_source/diag/test_lines.f90

@@ -0,0 +1,5 @@
+program test_lines
+    implicit none
+    character(len=123) :: val = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sodales imperdiet dolor, sit amet venenatis magna dictum id."
+    ! Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sodales imperdiet dolor, sit amet venenatis magna dictum id.
+end program test_lines

test/test_source/diag/test_semicolon.f90

@@ -0,0 +1,5 @@
+program test_semicolon
+    implicit none
+    integer :: a = 1; character(len=1) :: v; real, parameter :: p = 0.1E-4
+    print*, a; print*, p
+end program test_semicolon

test/test_source/diag/test_where.f90

@@ -0,0 +1,25 @@
+program test_where
+   implicit none
+   ! Example variables
+   real:: A(5),B(5),C(5)
+   A = 0.0
+   B = 1.0
+   C = [0.0, 4.0, 5.0, 10.0, 0.0]
+
+   ! Oneliner
+   WHERE(B .GT. 0.0)  B = SUM(A, DIM=1)
+
+   ! Simple where construct use
+   where (C/=0)
+      A=B/C
+   elsewhere
+      A=0.0
+   end where
+
+   ! Named where construct
+   named: where (C/=0)
+      A=B/C
+   elsewhere
+      A=0.0
+   end where named
+end program test_where