Merge pull request #448 from tomoto/fix/strip-comment-for-fixed-format

fix: flip the condition in strip_comment for fixed format

Author: gnikit

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Fixed
+
+- Fixed bug with Fixed Format references being incorrectly detected in comments
+  ([#447](https://github.com/fortran-lang/fortls/issues/447))
+
 ## 3.1.2
 
 ### Fixed

fortls/parsers/internal/parser.py

@@ -1137,7 +1137,7 @@ def get_code_line(
     def strip_comment(self, line: str) -> str:
         """Strip comment from line"""
         if self.fixed:
-            if FRegex.FIXED_COMMENT.match(line) and FRegex.FIXED_OPENMP.match(line):
+            if FRegex.FIXED_COMMENT.match(line) and not FRegex.FIXED_OPENMP.match(line):
                 return ""
         else:
             if FRegex.FREE_OPENMP.match(line) is None:

test/test_server_references.py

@@ -51,3 +51,12 @@ def test_references():
             [free_path, 78, 6, 12],
         ),
     )
+
+
+def test_references_ignore_comments_fixed():
+    string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir / "fixed")})
+    file_path = test_dir / "fixed" / "comment_as_reference.f"
+    string += ref_req(file_path, 3, 22)
+    errcode, results = run_request(string)
+    assert errcode == 0
+    assert len(results[1]) == 2

test/test_source/fixed/comment_as_reference.f

@@ -0,0 +1,5 @@
+      program comment_as_reference
+C     Comment with variable name gets picked as a ref: variable_to_reference
+      real variable_to_reference
+      variable_to_reference = 1
+      end program comment_as_reference