Merge branch 'dev' into feature/modernise-setup

* dev:
  Create codeql-analysis.yml
  Increments version
  Do not include debug cmd arguments
  Adds unittest for autocompletion as snippets
  Updates formatting for fr strings
  Create FUNDING.yml
  Fix text completion for procedures

Author: ZedThree

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: gnikit # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '24 7 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELONG
 
+## 2.1.2
+
+### Fixed
+
+- Fixed code autocompletion bug with f-strings
+  ([#39](https://github.com/hansec/fortran-language-server/issues/39))
+
 ## 2.1.1
 
 ### Added

fortls/interface.py

@@ -152,7 +152,10 @@ def commandline_args(name: str = "fortls") -> argparse.ArgumentParser:
     group.add_argument(
         "--use_signature_help",
         action="store_true",
-        help="Use signature help instead of subroutine/function snippets",
+        help=(
+            "Use signature help instead of subroutine/function snippets. This"
+            " effectively sets --autocomplete_no_snippets"
+        ),
     )
 
     # Hover options ------------------------------------------------------------

fortls/langserver.py

@@ -101,6 +101,9 @@ def __init__(self, conn, settings: dict):
         # class variable. This way the command line and the file interfaces
         # are always on sync, with the same default arguments
         for k, v in settings.items():
+            # Do not parse command line debug arguments
+            if k.startswith("debug_") and k != "debug_log":
+                continue
             setattr(self, k, v)
 
         self.sync_type: int = 2 if self.incremental_sync else 1
@@ -882,7 +885,7 @@ def get_all_references(self, def_obj, type_mem, file_obj=None):
         # Search through all files
         def_name = def_obj.name.lower()
         def_fqsn = def_obj.FQSN
-        NAME_REGEX = re.compile(fr"(?:\W|^)({def_name})(?:\W|$)", re.I)
+        NAME_REGEX = re.compile(rf"(?:\W|^)({def_name})(?:\W|$)", re.I)
         if file_obj is None:
             file_set = self.workspace.items()
         else:

fortls/objects.py

@@ -427,9 +427,9 @@ def get_placeholders(arg_list: list[str]):
         for i, arg in enumerate(arg_list):
             opt_split = arg.split("=")
             if len(opt_split) > 1:
-                place_holders.append(f"{opt_split[0]}=${{{i+1}}}:{{{opt_split[1]}}}")
+                place_holders.append(f"{opt_split[0]}=${{{i+1}:{opt_split[1]}}}")
             else:
-                place_holders.append(f"${{{i+1}}}:{{{arg}}}")
+                place_holders.append(f"${{{i+1}:{arg}}}")
         arg_str = f"({', '.join(arg_list)})"
         arg_snip = f"({', '.join(place_holders)})"
         return arg_str, arg_snip

fortls/parse_fortran.py

@@ -1381,7 +1381,7 @@ def replace_vars(line: str):
         for def_tmp, value in defs_tmp.items():
             def_regex = def_regexes.get(def_tmp)
             if def_regex is None:
-                def_regex = re.compile(fr"\b{def_tmp}\b")
+                def_regex = re.compile(rf"\b{def_tmp}\b")
                 def_regexes[def_tmp] = def_regex
             line_new, nsubs = def_regex.subn(value, line)
             if nsubs > 0:

fortls/regex_patterns.py

@@ -157,4 +157,4 @@ def src_file_exts(input_exts: list[str] = []) -> Pattern[str]:
             FORTRAN_FILE_EXTS.append(e.replace(".", ""))
     # Cast into a set to ensure uniqueness of extensions & sort for consistency
     # Create a regular expression from this
-    return re.compile(fr"\.({'|'.join(sorted(set(FORTRAN_FILE_EXTS)))})?$")
+    return re.compile(rf"\.({'|'.join(sorted(set(FORTRAN_FILE_EXTS)))})?$")

test/setup_tests.py

@@ -24,7 +24,6 @@ def run_request(request, fortls_args: list[str] = None):
         sys.executable,
         str(root_dir / "fortls.py"),
         "--incremental_sync",
-        "--use_signature_help",
     ]
     if fortls_args:
         # Input args might not be sanitised, fix that

test/test_server.py

@@ -1,5 +1,3 @@
-from pathlib import Path
-
 # from types import NoneType
 from setup_tests import (
     path_to_uri,
@@ -233,6 +231,10 @@ def check_return(result_array, checks):
         if checks[0] > 0:
             assert result_array[0]["label"] == checks[1]
             assert result_array[0]["detail"] == checks[2]
+            try:
+                assert result_array[0]["insertText"] == checks[3]
+            except KeyError:
+                pass
 
     def comp_request(file_path, line, char):
         return write_rpc_request(
@@ -296,15 +298,23 @@ def comp_request(file_path, line, char):
     file_path = test_dir / "completion" / "test_vis_mod_completion.f90"
     string += comp_request(file_path, 12, 16)
     string += comp_request(file_path, 12, 24)
-    errcode, results = run_request(string)
+    errcode, results = run_request(string, ["--use_signature_help"])
+    assert errcode == 0
+
+    string = write_rpc_request(1, "initialize", {"rootPath": str(test_dir)})
+    file_path = test_dir / "test_prog.f08"
+    string += comp_request(file_path, 12, 6)
+    errcode, res = run_request(string)
     assert errcode == 0
+    results.extend(res[1:])
+
     #
     exp_results = (
         # test_prog.f08
-        [1, "myfun", "DOUBLE PRECISION FUNCTION myfun(n, xval)"],
-        [9, "glob_sub", "SUBROUTINE glob_sub(n, xval, yval)"],
-        [1, "bound_nopass", "SUBROUTINE bound_nopass(a, b)"],
-        [1, "bound_pass", "SUBROUTINE bound_pass(arg1)"],
+        [1, "myfun", "DOUBLE PRECISION FUNCTION myfun(n, xval)", "myfun"],
+        [9, "glob_sub", "SUBROUTINE glob_sub(n, xval, yval)", "glob_sub"],
+        [1, "bound_nopass", "SUBROUTINE bound_nopass(a, b)", "bound_nopass"],
+        [1, "bound_pass", "SUBROUTINE bound_pass(arg1)", "bound_pass"],
         [1, "stretch_vector", "TYPE(scaled_vector)"],
         [6, "scale", "TYPE(scale_type)"],
         [2, "n", "INTEGER(4)"],
@@ -337,7 +347,12 @@ def comp_request(file_path, line, char):
         [10, "READ", "STATEMENT"],
         [11, "READ", "STATEMENT"],
         # subdir/test_generic.f90
-        [4, "my_gen", "SUBROUTINE my_gen(self, a, b)"],
+        [
+            4,
+            "my_gen",
+            "SUBROUTINE my_gen(self, a, b)",
+            "my_gen(${1:self}, ${2:a}, ${3:b})",
+        ],
         # subdir/test_inherit.f90
         [1, "val", "REAL(8)"],
         # subdir/test_rename.F90
@@ -352,6 +367,14 @@ def comp_request(file_path, line, char):
         # completion/test_vis_mod_completion.f90
         [1, "some_var", "INTEGER"],
         [3, "length", "INTEGER"],
+        # test_prog.f08, completion without signature_help
+        # returns the entire completion as a snippet
+        [
+            1,
+            "myfun",
+            "DOUBLE PRECISION FUNCTION myfun(n, xval)",
+            "myfun(${1:n}, ${2:xval})",
+        ],
     )
     assert len(exp_results) + 1 == len(results)
     for i in range(len(exp_results)):