Improves code quality

Author: gnikit

test/test_server_completion.py

@@ -1,7 +1,7 @@
 from setup_tests import run_request, test_dir, write_rpc_request
 
 
-def check_return(result_array, checks):
+def validate_comp(result_array, checks):
     assert len(result_array) == checks[0]
     if checks[0] > 0:
         assert result_array[0]["label"] == checks[1]
@@ -48,9 +48,9 @@ def test_comp1():
         [2, "n", "INTEGER(4)"],
         [1, "val", "REAL(8)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp2():
@@ -72,9 +72,9 @@ def test_comp2():
         [1, "point", "TYPE"],
         [2, "x", "REAL"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp3():
@@ -92,9 +92,9 @@ def test_comp3():
         # subdir/test_inc2.f90
         [2, "val1", "REAL(8)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp4():
@@ -108,9 +108,9 @@ def test_comp4():
         # subdir/test_abstract.f90
         [1, "abs_interface", "SUBROUTINE"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp5():
@@ -128,9 +128,9 @@ def test_comp5():
         [2, "vector_create", "SUBROUTINE"],
         [3, "INTENT(IN)", "KEYWORD"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp6():
@@ -150,9 +150,9 @@ def test_comp6():
         [1, "n", "INTEGER(4)"],
         [2, "a", "REAL(8)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp7():
@@ -170,9 +170,9 @@ def test_comp7():
         [10, "READ", "STATEMENT"],
         [11, "READ", "STATEMENT"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp8():
@@ -186,9 +186,9 @@ def test_comp8():
         # subdir/test_inherit.f90
         [1, "val", "REAL(8)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp9():
@@ -204,9 +204,9 @@ def test_comp9():
         [1, "localname", "INTEGER"],
         [2, "renamed_var2", "REAL(8)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp10():
@@ -220,9 +220,9 @@ def test_comp10():
         # subdir/test_vis.f90
         [3, "some_type", "TYPE"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp_import_host_association():
@@ -237,9 +237,9 @@ def test_comp_import_host_association():
         # see #5 and #8 on GitHub
         [2, "mytype", "TYPE"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp_visibility_scopes():
@@ -256,9 +256,9 @@ def test_comp_visibility_scopes():
         [1, "some_var", "INTEGER"],
         [3, "length", "INTEGER"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp_interface():
@@ -278,9 +278,9 @@ def test_comp_interface():
             "my_gen(${1:self}, ${2:a}, ${3:b})",
         ],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp_no_signature_help():
@@ -300,9 +300,9 @@ def test_comp_no_signature_help():
             "myfun(${1:n}, ${2:xval})",
         ],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)
 
 
 def test_comp_fixed():
@@ -318,6 +318,6 @@ def test_comp_fixed():
         [1, "bob", "CHARACTER*(LEN=200)"],
         [1, "dave", "CHARACTER*(20)"],
     )
-    assert len(exp_results) + 1 == len(results)
-    for i in range(len(exp_results)):
-        check_return(results[i + 1], exp_results[i])
+    assert len(exp_results) == len(results) - 1
+    for i, ref in enumerate(exp_results):
+        validate_comp(results[i + 1], ref)

test/test_server_definitions.py

@@ -35,8 +35,8 @@ def test_def_fun_sub_fixed():
     fixed_path = str(test_dir / "subdir" / "test_fixed.f")
     ref_res = [[0, 0, fixed_path], [22, 22, fixed_path]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_variable():
@@ -48,8 +48,8 @@ def test_def_variable():
     assert errcode == 0
     ref_res = [[10, 10, str(test_dir / "test_prog.f08")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_type_bound_procedure1():
@@ -61,8 +61,8 @@ def test_def_type_bound_procedure1():
     assert errcode == 0
     ref_res = [[21, 21, str(test_dir / "subdir" / "test_free.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_type_bound_procedure2():
@@ -74,8 +74,8 @@ def test_def_type_bound_procedure2():
     assert errcode == 0
     ref_res = [[14, 14, str(test_dir / "subdir" / "test_free.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_type_nested_variable():
@@ -87,8 +87,8 @@ def test_def_type_nested_variable():
     assert errcode == 0
     ref_res = [[5, 5, str(test_dir / "subdir" / "test_free.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_type_in_submod_function():
@@ -100,8 +100,8 @@ def test_def_type_in_submod_function():
     assert errcode == 0
     ref_res = [[1, 1, str(test_dir / "subdir" / "test_submod.F90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_type_in_submod_procedure():
@@ -113,8 +113,8 @@ def test_def_type_in_submod_procedure():
     assert errcode == 0
     ref_res = [[1, 1, str(test_dir / "subdir" / "test_submod.F90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_include_file():
@@ -126,8 +126,8 @@ def test_def_include_file():
     assert errcode == 0
     ref_res = [[2, 2, str(test_dir / "subdir" / "test_inc2.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_include_variable1():
@@ -139,8 +139,8 @@ def test_def_include_variable1():
     assert errcode == 0
     ref_res = [[0, 0, str(test_dir / "subdir" / "test_inc2.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_include_variable2():
@@ -152,8 +152,8 @@ def test_def_include_variable2():
     assert errcode == 0
     ref_res = [[4, 4, str(test_dir / "test_inc.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_include_file_missing():
@@ -165,8 +165,8 @@ def test_def_include_file_missing():
     assert errcode == 0
     ref_res = [[None]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_rename_only_variable():
@@ -180,8 +180,8 @@ def test_def_rename_only_variable():
     assert errcode == 0
     ref_res = [[6, 6, str(test_dir / "subdir" / "test_rename.F90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_rename_only_variable_nested():
@@ -195,8 +195,8 @@ def test_def_rename_only_variable_nested():
     assert errcode == 0
     ref_res = [[1, 1, str(test_dir / "subdir" / "test_rename.F90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)
 
 
 def test_def_function_implicit_result_variable():
@@ -210,5 +210,5 @@ def test_def_function_implicit_result_variable():
     assert errcode == 0
     ref_res = [[3, 3, str(test_dir / "hover" / "functions.f90")]]
     assert len(ref_res) == len(results) - 1
-    for i in range(len(ref_res)):
-        validate_def(results[i + 1], ref_res[i])
+    for i, res in enumerate(ref_res):
+        validate_def(results[i + 1], res)

test/test_server_signature_help.py

@@ -44,5 +44,5 @@ def test_subroutine_signature_help():
         [4, 5, sub_sig],
     )
     assert len(ref) == len(results) - 1
-    for i in range(len(ref)):
-        validate_sigh(results[i + 1], ref[i])
+    for i, r in enumerate(ref):
+        validate_sigh(results[i + 1], r)